Revision 1576
Added by darkviper over 12 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 11 | 11 |
! = Update/Change |
| 12 | 12 |
|
| 13 | 13 |
=========================== add small Features 2.8.2 ========================== |
| 14 |
16 Jan-2012 Build 1576 Werner v.d.Decken(DarkViper) |
|
| 15 |
# wysiwyg module changed to domain independend image links |
|
| 14 | 16 |
16 Jan-2012 Build 1575 Dietmar Woellbrink (Luisehahne) |
| 15 | 17 |
# fixed captcha error message in form module |
| 16 | 18 |
! set form module to version 2.8.4 |
| branches/2.8.x/wb/admin/interface/version.php | ||
|---|---|---|
| 52 | 52 |
|
| 53 | 53 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
| 54 | 54 |
if(!defined('VERSION')) define('VERSION', '2.8.2');
|
| 55 |
if(!defined('REVISION')) define('REVISION', '1575');
|
|
| 55 |
if(!defined('REVISION')) define('REVISION', '1576');
|
|
| 56 | 56 |
if(!defined('SP')) define('SP', 'SP2');
|
| branches/2.8.x/wb/modules/wysiwyg/view.php | ||
|---|---|---|
| 4 | 4 |
* @category modules |
| 5 | 5 |
* @package wysiwyg |
| 6 | 6 |
* @author WebsiteBaker Project |
| 7 |
* @copyright 2009-2011, Website Baker Org. e.V.
|
|
| 7 |
* @copyright 2009-2012, Website Baker Org. e.V.
|
|
| 8 | 8 |
* @link http://www.websitebaker2.org/ |
| 9 | 9 |
* @license http://www.gnu.org/licenses/gpl.html |
| 10 | 10 |
* @platform WebsiteBaker 2.8.x |
| ... | ... | |
| 14 | 14 |
* @lastmodified $Date$ |
| 15 | 15 |
* |
| 16 | 16 |
*/ |
| 17 |
// Must include code to stop this file being access directly |
|
| 18 | 17 |
/* -------------------------------------------------------- */ |
| 19 |
if(defined('WB_PATH') == false)
|
|
| 20 |
{
|
|
| 21 |
// Stop this file being access directly
|
|
| 22 |
die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');
|
|
| 18 |
// Must include code to stop this file being accessed directly
|
|
| 19 |
if(!defined('WB_PATH')) {
|
|
| 20 |
require_once(dirname(dirname(__FILE__)).'/framework/globalExceptionHandler.php');
|
|
| 21 |
throw new IllegalFileException();
|
|
| 23 | 22 |
} |
| 24 | 23 |
/* -------------------------------------------------------- */ |
| 24 |
$MEDIA_URL = WB_URL.MEDIA_DIRECTORY; |
|
| 25 | 25 |
// Get content |
| 26 |
$get_content = $database->query("SELECT content FROM ".TABLE_PREFIX."mod_wysiwyg WHERE section_id = '$section_id'");
|
|
| 27 |
$fetch_content = $get_content->fetchRow(); |
|
| 28 |
$content = ($fetch_content['content']); |
|
| 29 |
|
|
| 26 |
$content = ''; |
|
| 27 |
$sql = 'SELECT `content` FROM `'.TABLE_PREFIX.'mod_wysiwyg` WHERE `section_id`='.(int)$section_id; |
|
| 28 |
if( ($content = $database->get_one($sql)) ) {
|
|
| 29 |
$content = str_replace('{SYSVAR:MEDIA_REL}',$MEDIA_REL, $content );
|
|
| 30 |
} |
|
| 30 | 31 |
echo $content; |
| branches/2.8.x/wb/modules/wysiwyg/info.php | ||
|---|---|---|
| 4 | 4 |
* @category modules |
| 5 | 5 |
* @package wysiwyg |
| 6 | 6 |
* @author WebsiteBaker Project |
| 7 |
* @copyright 2009-2011, Website Baker Org. e.V.
|
|
| 7 |
* @copyright 2009-2012, Website Baker Org. e.V.
|
|
| 8 | 8 |
* @link http://www.websitebaker2.org/ |
| 9 | 9 |
* @license http://www.gnu.org/licenses/gpl.html |
| 10 | 10 |
* @platform WebsiteBaker 2.8.x |
| ... | ... | |
| 15 | 15 |
* |
| 16 | 16 |
*/ |
| 17 | 17 |
/* -------------------------------------------------------- */ |
| 18 |
if(defined('WB_PATH') == false)
|
|
| 19 |
{
|
|
| 20 |
// Stop this file being access directly
|
|
| 21 |
die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');
|
|
| 18 |
// Must include code to stop this file being accessed directly
|
|
| 19 |
if(!defined('WB_PATH')) {
|
|
| 20 |
require_once(dirname(dirname(__FILE__)).'/framework/globalExceptionHandler.php');
|
|
| 21 |
throw new IllegalFileException();
|
|
| 22 | 22 |
} |
| 23 | 23 |
/* -------------------------------------------------------- */ |
| 24 |
|
|
| 25 | 24 |
$module_directory = 'wysiwyg'; |
| 26 | 25 |
$module_name = 'WYSIWYG'; |
| 27 | 26 |
$module_function = 'page'; |
| 28 |
$module_version = '2.8.3';
|
|
| 27 |
$module_version = '2.9.0';
|
|
| 29 | 28 |
$module_platform = '2.8.2'; |
| 30 | 29 |
$module_author = 'Ryan Djurovich'; |
| 31 | 30 |
$module_license = 'GNU General Public License'; |
| branches/2.8.x/wb/modules/wysiwyg/save.php | ||
|---|---|---|
| 4 | 4 |
* @category backend |
| 5 | 5 |
* @package wysiwyg |
| 6 | 6 |
* @author WebsiteBaker Project |
| 7 |
* @copyright 2009-2011, Website Baker Org. e.V.
|
|
| 7 |
* @copyright 2009-2012, Website Baker Org. e.V.
|
|
| 8 | 8 |
* @link http://www.websitebaker2.org/ |
| 9 | 9 |
* @license http://www.gnu.org/licenses/gpl.html |
| 10 | 10 |
* @platform WebsiteBaker 2.8.x |
| ... | ... | |
| 35 | 35 |
// Include the WB functions file |
| 36 | 36 |
require_once(WB_PATH.'/framework/functions.php'); |
| 37 | 37 |
|
| 38 |
$MEDIA_URL = WB_URL.MEDIA_DIRECTORY; |
|
| 38 | 39 |
// Update the mod_wysiwygs table with the contents |
| 39 | 40 |
if(isset($_POST['content'.$section_id])) {
|
| 40 |
$content = $admin->add_slashes($_POST['content'.$section_id]); |
|
| 41 |
$content = $_POST['content'.$section_id]; |
|
| 42 |
$searchfor = '#(<.*= *\")('.quotemeta($MEDIA_URL).')(.*\".*>)#iU';
|
|
| 43 |
$content = preg_replace($searchfor, '$1{SYSVAR:MEDIA_REL}$3', $content);
|
|
| 44 |
$content = $admin->add_slashes($content); |
|
| 41 | 45 |
// searching in $text will be much easier this way |
| 42 | 46 |
$text = umlauts_to_entities(strip_tags($content), strtoupper(DEFAULT_CHARSET), 0); |
| 43 | 47 |
$query = "UPDATE ".TABLE_PREFIX."mod_wysiwyg SET content = '$content', text = '$text' WHERE section_id = '$section_id'"; |
| branches/2.8.x/wb/modules/wysiwyg/install.php | ||
|---|---|---|
| 4 | 4 |
* @category modules |
| 5 | 5 |
* @package wysiwyg |
| 6 | 6 |
* @author WebsiteBaker Project |
| 7 |
* @copyright 2009-2011, Website Baker Org. e.V.
|
|
| 7 |
* @copyright 2009-2012, Website Baker Org. e.V.
|
|
| 8 | 8 |
* @link http://www.websitebaker2.org/ |
| 9 | 9 |
* @license http://www.gnu.org/licenses/gpl.html |
| 10 | 10 |
* @platform WebsiteBaker 2.8.x |
| ... | ... | |
| 14 | 14 |
* @lastmodified $Date$ |
| 15 | 15 |
* |
| 16 | 16 |
*/ |
| 17 |
// Must include code to stop this file being access directly |
|
| 18 | 17 |
/* -------------------------------------------------------- */ |
| 19 |
if(defined('WB_PATH') == false)
|
|
| 20 |
{
|
|
| 21 |
// Stop this file being access directly
|
|
| 22 |
die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');
|
|
| 18 |
// Must include code to stop this file being accessed directly
|
|
| 19 |
if(!defined('WB_PATH')) {
|
|
| 20 |
require_once(dirname(dirname(__FILE__)).'/framework/globalExceptionHandler.php');
|
|
| 21 |
throw new IllegalFileException();
|
|
| 23 | 22 |
} |
| 24 | 23 |
/* -------------------------------------------------------- */ |
| 25 | 24 |
|
| 26 | 25 |
if(defined('WB_URL'))
|
| 27 | 26 |
{
|
| 28 |
|
|
| 29 | 27 |
// Create table |
| 30 | 28 |
//$database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_wysiwyg`");
|
| 31 | 29 |
$mod_wysiwyg = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_wysiwyg` ( ' |
| ... | ... | |
| 37 | 35 |
. ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'; |
| 38 | 36 |
$database->query($mod_wysiwyg); |
| 39 | 37 |
|
| 40 |
|
|
| 41 |
$mod_search = "SELECT * FROM ".TABLE_PREFIX."search WHERE value = 'wysiwyg'"; |
|
| 42 |
$insert_search = $database->query($mod_search); |
|
| 43 |
if( $insert_search->numRows() == 0 ) |
|
| 44 |
{
|
|
| 45 |
// Insert info into the search table |
|
| 46 |
// Module query info |
|
| 47 |
$field_info = array(); |
|
| 48 |
$field_info['page_id'] = 'page_id'; |
|
| 49 |
$field_info['title'] = 'page_title'; |
|
| 50 |
$field_info['link'] = 'link'; |
|
| 51 |
$field_info['description'] = 'description'; |
|
| 52 |
$field_info['modified_when'] = 'modified_when'; |
|
| 53 |
$field_info['modified_by'] = 'modified_by'; |
|
| 54 |
$field_info = serialize($field_info); |
|
| 55 |
$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('module', 'wysiwyg', '$field_info')");
|
|
| 56 |
// Query start |
|
| 57 |
$query_start_code = "SELECT [TP]pages.page_id, [TP]pages.page_title, [TP]pages.link, [TP]pages.description, [TP]pages.modified_when, [TP]pages.modified_by FROM [TP]mod_wysiwyg, [TP]pages WHERE "; |
|
| 58 |
$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_start', '$query_start_code', 'wysiwyg')");
|
|
| 59 |
// Query body |
|
| 60 |
$query_body_code = " [TP]pages.page_id = [TP]mod_wysiwyg.page_id AND [TP]mod_wysiwyg.text [O] \'[W][STRING][W]\' AND [TP]pages.searching = \'1\'"; |
|
| 61 |
$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_body', '$query_body_code', 'wysiwyg')");
|
|
| 62 |
// Query end |
|
| 63 |
$query_end_code = ""; |
|
| 64 |
$database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_end', '$query_end_code', 'wysiwyg')");
|
|
| 65 |
|
|
| 66 |
// Insert blank row (there needs to be at least on row for the search to work) |
|
| 67 |
$database->query("INSERT INTO ".TABLE_PREFIX."mod_wysiwyg (page_id,section_id) VALUES ('0','0')");
|
|
| 68 |
|
|
| 69 |
|
|
| 70 |
} |
|
| 38 |
// remove old version of search (deprecated) |
|
| 39 |
// $mod_search = "SELECT * FROM ".TABLE_PREFIX."search WHERE value = 'wysiwyg'"; |
|
| 40 |
// $insert_search = $database->query($mod_search); |
|
| 41 |
// if( $insert_search->numRows() == 0 ) |
|
| 42 |
// {
|
|
| 43 |
// // Insert info into the search table |
|
| 44 |
// // Module query info |
|
| 45 |
// $field_info = array(); |
|
| 46 |
// $field_info['page_id'] = 'page_id'; |
|
| 47 |
// $field_info['title'] = 'page_title'; |
|
| 48 |
// $field_info['link'] = 'link'; |
|
| 49 |
// $field_info['description'] = 'description'; |
|
| 50 |
// $field_info['modified_when'] = 'modified_when'; |
|
| 51 |
// $field_info['modified_by'] = 'modified_by'; |
|
| 52 |
// $field_info = serialize($field_info); |
|
| 53 |
// $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('module', 'wysiwyg', '$field_info')");
|
|
| 54 |
// // Query start |
|
| 55 |
// $query_start_code = "SELECT [TP]pages.page_id, [TP]pages.page_title, [TP]pages.link, [TP]pages.description, [TP]pages.modified_when, [TP]pages.modified_by FROM [TP]mod_wysiwyg, [TP]pages WHERE "; |
|
| 56 |
// $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_start', '$query_start_code', 'wysiwyg')");
|
|
| 57 |
// // Query body |
|
| 58 |
// $query_body_code = " [TP]pages.page_id = [TP]mod_wysiwyg.page_id AND [TP]mod_wysiwyg.text [O] \'[W][STRING][W]\' AND [TP]pages.searching = \'1\'"; |
|
| 59 |
// $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_body', '$query_body_code', 'wysiwyg')");
|
|
| 60 |
// // Query end |
|
| 61 |
// $query_end_code = ""; |
|
| 62 |
// $database->query("INSERT INTO ".TABLE_PREFIX."search (name,value,extra) VALUES ('query_end', '$query_end_code', 'wysiwyg')");
|
|
| 63 |
// |
|
| 64 |
// // Insert blank row (there needs to be at least on row for the search to work) |
|
| 65 |
// $database->query("INSERT INTO ".TABLE_PREFIX."mod_wysiwyg (page_id,section_id) VALUES ('0','0')");
|
|
| 66 |
// } |
|
| 71 | 67 |
} |
| branches/2.8.x/wb/modules/wysiwyg/modify.php | ||
|---|---|---|
| 4 | 4 |
* @category modules |
| 5 | 5 |
* @package wysiwyg |
| 6 | 6 |
* @author WebsiteBaker Project |
| 7 |
* @copyright 2009-2011, Website Baker Org. e.V.
|
|
| 7 |
* @copyright 2009-2012, Website Baker Org. e.V.
|
|
| 8 | 8 |
* @link http://www.websitebaker2.org/ |
| 9 | 9 |
* @license http://www.gnu.org/licenses/gpl.html |
| 10 | 10 |
* @platform WebsiteBaker 2.8.x |
| ... | ... | |
| 16 | 16 |
*/ |
| 17 | 17 |
|
| 18 | 18 |
/* -------------------------------------------------------- */ |
| 19 |
if(defined('WB_PATH') == false)
|
|
| 20 |
{
|
|
| 21 |
// Stop this file being access directly
|
|
| 22 |
die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');
|
|
| 19 |
// Must include code to stop this file being accessed directly
|
|
| 20 |
if(!defined('WB_PATH')) {
|
|
| 21 |
require_once(dirname(dirname(__FILE__)).'/framework/globalExceptionHandler.php');
|
|
| 22 |
throw new IllegalFileException();
|
|
| 23 | 23 |
} |
| 24 | 24 |
/* -------------------------------------------------------- */ |
| 25 | 25 |
|
| 26 |
$MEDIA_URL = WB_URL.MEDIA_DIRECTORY; |
|
| 26 | 27 |
// Get page content |
| 27 |
$query = "SELECT content FROM ".TABLE_PREFIX."mod_wysiwyg WHERE section_id = '$section_id'"; |
|
| 28 |
$get_content = $database->query($query); |
|
| 29 |
$content = $get_content->fetchRow(); |
|
| 30 |
$content = (htmlspecialchars($content['content'])); |
|
| 31 |
|
|
| 28 |
$query = 'SELECT `content` FROM `'.TABLE_PREFIX.'mod_wysiwyg` WHERE `section_id`='.(int)$section_id; |
|
| 29 |
if ( ($content = $database->get_one($sql)) ) {
|
|
| 30 |
$content = htmlspecialchars(str_replace('{SYSVAR:MEDIA_REL}',$MEDIA_URL, $content));
|
|
| 31 |
}else {
|
|
| 32 |
$content = ''; |
|
| 33 |
} |
|
| 32 | 34 |
if(!isset($wysiwyg_editor_loaded)) {
|
| 33 | 35 |
$wysiwyg_editor_loaded=true; |
| 34 | 36 |
|
| ... | ... | |
| 37 | 39 |
echo '<textarea name="'.$name.'" id="'.$id.'" style="width: '.$width.'; height: '.$height.';">'.$content.'</textarea>'; |
| 38 | 40 |
} |
| 39 | 41 |
} else {
|
| 40 |
$id_list=array(); |
|
| 41 |
$query_wysiwyg = $database->query("SELECT section_id FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id' AND module = 'wysiwyg'");
|
|
| 42 |
if($query_wysiwyg->numRows() > 0) {
|
|
| 42 |
$id_list = array(); |
|
| 43 |
$sql = 'SELECT `section_id` FROM `'.TABLE_PREFIX.'sections` '; |
|
| 44 |
$sql .= 'WHERE `page_id`='.(int)$page_id.' AND `module`=\'wysiwyg\''; |
|
| 45 |
if (($query_wysiwyg = $database->query($sql))) {
|
|
| 43 | 46 |
while($wysiwyg_section = $query_wysiwyg->fetchRow()) {
|
| 44 | 47 |
$entry='content'.$wysiwyg_section['section_id']; |
| 45 |
array_push($id_list,$entry);
|
|
| 48 |
$id_list[] = $entry;
|
|
| 46 | 49 |
} |
| 47 | 50 |
require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php'); |
| 48 | 51 |
} |
| ... | ... | |
| 50 | 53 |
} |
| 51 | 54 |
|
| 52 | 55 |
?> |
| 53 |
|
|
| 54 | 56 |
<form name="wysiwyg<?php echo $section_id; ?>" action="<?php echo WB_URL; ?>/modules/wysiwyg/save.php" method="post"> |
| 55 |
|
|
| 56 |
<input type="hidden" name="page_id" value="<?php echo $page_id; ?>" /> |
|
| 57 |
<input type="hidden" name="section_id" value="<?php echo $section_id; ?>" /> |
|
| 58 |
|
|
| 57 |
<input type="hidden" name="page_id" value="<?php echo $page_id; ?>" /> |
|
| 58 |
<input type="hidden" name="section_id" value="<?php echo $section_id; ?>" /> |
|
| 59 | 59 |
<?php |
| 60 | 60 |
echo $admin->getFTAN()."\n"; |
| 61 | 61 |
show_wysiwyg_editor('content'.$section_id,'content'.$section_id,$content,'100%','350');
|
| 62 | 62 |
?> |
| 63 |
|
|
| 64 |
<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" style="padding-bottom: 10px;"> |
|
| 65 |
<tr> |
|
| 66 |
<td align="left"> |
|
| 67 |
<input type="submit" value="<?php echo $TEXT['SAVE']; ?>" style="width: 100px; margin-top: 5px;" /> |
|
| 68 |
</td> |
|
| 69 |
<td align="right"> |
|
| 70 |
<input type="button" value="<?php echo $TEXT['CANCEL']; ?>" onclick="javascript: window.location = 'index.php';" style="width: 100px; margin-top: 5px;" /> |
|
| 71 |
</td> |
|
| 72 |
</tr> |
|
| 73 |
</table> |
|
| 74 |
|
|
| 63 |
<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" style="padding-bottom: 10px;"> |
|
| 64 |
<tr> |
|
| 65 |
<td align="left"> |
|
| 66 |
<input type="submit" value="<?php echo $TEXT['SAVE']; ?>" style="width: 100px; margin-top: 5px;" /> |
|
| 67 |
</td> |
|
| 68 |
<td align="right"> |
|
| 69 |
<input type="button" value="<?php echo $TEXT['CANCEL']; ?>" onclick="javascript: window.location = 'index.php';" style="width: 100px; margin-top: 5px;" /> |
|
| 70 |
</td> |
|
| 71 |
</tr> |
|
| 72 |
</table> |
|
| 75 | 73 |
</form> |
| 76 |
|
|
| 77 | 74 |
<br /> |
| branches/2.8.x/wb/modules/wysiwyg/upgrade.php | ||
|---|---|---|
| 4 | 4 |
* @category modules |
| 5 | 5 |
* @package wysiwyg |
| 6 | 6 |
* @author WebsiteBaker Project |
| 7 |
* @copyright 2009-2011, Website Baker Org. e.V.
|
|
| 7 |
* @copyright 2009-2012, Website Baker Org. e.V.
|
|
| 8 | 8 |
* @link http://www.websitebaker2.org/ |
| 9 | 9 |
* @license http://www.gnu.org/licenses/gpl.html |
| 10 | 10 |
* @platform WebsiteBaker 2.8.x |
| ... | ... | |
| 14 | 14 |
* @lastmodified $Date$ |
| 15 | 15 |
* |
| 16 | 16 |
*/ |
| 17 |
// Must include code to stop this file being access directly |
|
| 18 | 17 |
/* -------------------------------------------------------- */ |
| 19 |
if(defined('WB_PATH') == false)
|
|
| 20 |
{
|
|
| 21 |
// Stop this file being access directly
|
|
| 22 |
die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');
|
|
| 18 |
// Must include code to stop this file being accessed directly
|
|
| 19 |
if(!defined('WB_PATH')) {
|
|
| 20 |
require_once(dirname(dirname(__FILE__)).'/framework/globalExceptionHandler.php');
|
|
| 21 |
throw new IllegalFileException();
|
|
| 23 | 22 |
} |
| 24 | 23 |
/* -------------------------------------------------------- */ |
| 25 | 24 |
|
| ... | ... | |
| 32 | 31 |
} |
| 33 | 32 |
} |
| 34 | 33 |
} else {
|
| 35 |
$msg = $database->get_error();
|
|
| 34 |
$msg .= $database->get_error().'<br />';
|
|
| 36 | 35 |
} |
| 36 |
// change internal absolute links into relative links |
|
| 37 |
$sTable = TABLE_PREFIX.'mod_wysiwyg'; |
|
| 38 |
$sql = 'UPDATE `'.$sTable.'` '; |
|
| 39 |
$sql .= 'SET `content` = REPLACE(`content`, \'"'.WB_URL.MEDIA_DIRECTORY.'\', \'"{SYSVAR:MEDIA_REL}\')';
|
|
| 40 |
if (!$database->query($sql)) {
|
|
| 41 |
$msg .= $database->get_error().'<br />'; |
|
| 42 |
} |
|
| 43 |
|
|
| 37 | 44 |
// ------------------------------------ |
Also available in: Unified diff
wysiwyg module changed to domain independend image links