Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1917) +++ branches/2.8.x/CHANGELOG (revision 1918) @@ -12,6 +12,9 @@ =============================================================================== +07 Jun-2013 Build 1918 Dietmar Woellbrink (Luisehahne) +! /modules/news/ beginning beginning recoding + replacing absolute MediaUrl with place holder 07 Jun-2013 Build 1917 Dietmar Woellbrink (Luisehahne) ! /modules/show_menu2/ set to version 4.9.7 DEBUG == true show query counts Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1917) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1918) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.3'); -if(!defined('REVISION')) define('REVISION', '1917'); +if(!defined('REVISION')) define('REVISION', '1918'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/modules/news/add_post.php =================================================================== --- branches/2.8.x/wb/modules/news/add_post.php (revision 1917) +++ branches/2.8.x/wb/modules/news/add_post.php (revision 1918) @@ -4,13 +4,13 @@ * @category modules * @package news * @author WebsiteBaker Project - * @copyright 2009-2011, Website Baker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * */ @@ -25,24 +25,31 @@ // Get new order $order = new order(TABLE_PREFIX.'mod_news_posts', 'position', 'post_id', 'section_id'); $position = $order->get_new($section_id); +$post_id = 0; +try { // Get default commenting -$query_settings = $database->query("SELECT commenting FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'"); -$fetch_settings = $query_settings->fetchRow(); -$commenting = $fetch_settings['commenting']; - + $sql = 'SELECT `commenting` FROM `'.TABLE_PREFIX.'mod_news_settings` ' + . 'WHERE `section_id`='.(int)$section_id; + $query_settings = $database->query($sql); + $fetch_settings = $query_settings->fetchRow(MYSQL_ASSOC); + $commenting = $fetch_settings['commenting']; // Insert new row into database -$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_posts (section_id,page_id,position,commenting,active) VALUES ('$section_id','$page_id','$position','$commenting','1')"); - -// Get the id -$post_id = $admin->getIDKEY($database->get_one("SELECT LAST_INSERT_ID()")); - -// Say that a new record has been added, then redirect to modify page -if($database->is_error()) { - $admin->print_error($database->get_error(), WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'§ion_id='.$section_id.'&post_id='.$post_id); -} else { - $admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'§ion_id='.$section_id.'&post_id='.$post_id); + $sql = 'INSERT INTO `'.TABLE_PREFIX.'mod_news_posts` ' + . 'SET `section_id`='.$section_id.', ' + . '`page_id`='.$page_id.', ' + . '`position`='.$position.', ' + . '`commenting`=\''.$commenting.'\', ' + . '`created_when`='.time().', ' + . '`created_by`='.(int)$admin->get_user_id().', ' + . '`posted_when`='.time().', ' + . '`posted_by`='.(int)$admin->get_user_id().', ' + . '`active`=1'; + $database->query($sql); + $post_id = $admin->getIDKEY($database->LastInsertId); +} catch(WbDatabaseException $e) { + $sSectionIdPrefix = ( defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? SEC_ANCHOR : 'Sec' ); + $admin->print_error($database->get_error(), WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'#'.$sSectionIdPrefix.$section_id ); } - -// Print admin footer +$admin->print_success($TEXT['SUCCESS'], WB_URL.'/modules/news/modify_post.php?page_id='.$page_id.'§ion_id='.$section_id.'&post_id='.$post_id ); $admin->print_footer(); Index: branches/2.8.x/wb/modules/news/view.php =================================================================== --- branches/2.8.x/wb/modules/news/view.php (revision 1917) +++ branches/2.8.x/wb/modules/news/view.php (revision 1918) @@ -23,6 +23,7 @@ } /* -------------------------------------------------------- */ global $post_id, $post_section,$TEXT,$MESSAGE; +$sMediaUrl = WB_URL.MEDIA_DIRECTORY; // load module language file $lang = (dirname(__FILE__)) . '/languages/' . LANGUAGE . '.php'; @@ -54,8 +55,7 @@ $groups[0]['image'] = ''; $query_users = $database->query("SELECT group_id,title,active FROM ".TABLE_PREFIX."mod_news_groups WHERE section_id = '$section_id' ORDER BY position ASC"); -if($query_users->numRows() > 0) -{ +if($query_users->numRows() > 0){ while( false != ($group = $query_users->fetchRow()) ) { @@ -73,8 +73,7 @@ // Check if we should show the main page or a post itself // if(!defined('POST_ID') OR !is_numeric(POST_ID)) -if(!isset($post_id) || !is_numeric($post_id)) -{ +if(!isset($post_id) || !is_numeric($post_id)){ // Check if we should only list posts from a certain group if(isset($_GET['g']) AND is_numeric($_GET['g'])) { @@ -192,7 +191,7 @@ fetchRow()) ) + while( false != ($post = $query_posts->fetchRow(MYSQL_ASSOC)) ) { if(isset($groups[$post['group_id']]['active']) AND $groups[$post['group_id']]['active'] != false) { // Make sure parent group is active @@ -224,7 +223,6 @@ $post_link .= 'g='.$_GET['g']; } } - // Get group id, title, and image $group_id = $post['group_id']; $group_title = $groups[$group_id]['title']; @@ -266,12 +264,10 @@ } //elseif(defined('POST_ID') AND is_numeric(POST_ID)) -elseif(isset($post_id) && is_numeric($post_id)) -{ +elseif(isset($post_id) && is_numeric($post_id)){ // print '

'.POST_ID.'/'.PAGE_ID.'/'.POST_SECTION.'

'; // if(defined('POST_SECTION') AND POST_SECTION == $section_id) - if(isset($post_section) && ($post_section == $section_id)) - { + if(isset($post_section) && ($post_section == $section_id)){ // Get settings $setting_post_header = $setting_post_footer = $setting_comments_header = $setting_comments_loop = $setting_comments_footer = ''; @@ -301,7 +297,7 @@ exit($MESSAGE['PAGES_NOT_FOUND']); } - // Get post info +// Get post info $t = time(); $query_post = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE post_id = '".$post_id."' AND active = '1' @@ -332,7 +328,7 @@ $post_link_path = str_replace(WB_URL, WB_PATH,$post_link); $create_date = date(DATE_FORMAT, $post['created_when']+TIMEZONE); $create_time = date(TIME_FORMAT, $post['created_when']+TIMEZONE); - // Get group id, title, and image +// Get group id, title, and image $group_id = $post['group_id']; $group_title = $groups[$group_id]['title']; $group_image = $groups[$group_id]['image']; @@ -372,7 +368,7 @@ $values = array(WB_URL.'/modules/news/comment.php?post_id='.$post_id.'&section_id='.$section_id, $MOD_NEWS['TEXT_COMMENTS']); print str_replace($vars, $values, $setting_comments_header); - // Query for comments +// Query for comments $query_comments = $database->query("SELECT title,comment,commented_when,commented_by FROM ".TABLE_PREFIX."mod_news_comments WHERE post_id = '".$post_id."' ORDER BY commented_when ASC"); if($query_comments->numRows() > 0) { Index: branches/2.8.x/wb/modules/news/upgrade.php =================================================================== --- branches/2.8.x/wb/modules/news/upgrade.php (revision 1917) +++ branches/2.8.x/wb/modules/news/upgrade.php (revision 1918) @@ -20,7 +20,7 @@ * upgrade.php * * @category Module - * @package Module_news + * @package news * @subpackage upgrade * @author Dietmar Wöllbrink * @author Werner v.d.Decken @@ -92,7 +92,7 @@ $sPagesPath = WB_PATH.PAGES_DIRECTORY; $sPostsPath = $sPagesPath.'/posts'; - // create /posts/ - directory if not exists +// create /posts/ - directory if not exists if(is_writable($sPagesPath)) { if(!($bRetval = is_dir($sPostsPath))) { $iOldUmask = umask(0) ; @@ -133,13 +133,13 @@ $msg[] = 'TABLE `'.$database->TablePrefix.'mod_news_posts` Datafield `created_by` already exists.'." $OK"; $doImportDate = false; } - // preset new fields `created_by` and `created_by` from existing values +// preset new fields `created_by` and `created_by` from existing values if($doImportDate) { $sql = 'UPDATE `'.$database->TablePrefix.'mod_news_posts` '; $sql .= 'SET `created_by`=`posted_by`, `created_when`=`posted_when`'; $database->query($sql); } - + if($doImportDate) { /** * rebuild news post folder */ @@ -176,8 +176,9 @@ if($count > 0) { $msg[] = 'Save date of creation from '.$count.' old accessfiles and delete these files.'." $OK"; } + } // ************************************************ - // Check the validity of 'create-file-timestamp' and balance against 'posted-timestamp' +// Check the validity of 'create-file-timestamp' and balance against 'posted-timestamp' $sql = 'UPDATE `'.$database->TablePrefix.'mod_news_posts` '; $sql .= 'SET `created_when`=`published_when` '; $sql .= 'WHERE `published_when`<`created_when`'; Index: branches/2.8.x/wb/modules/news/add.php =================================================================== --- branches/2.8.x/wb/modules/news/add.php (revision 1917) +++ branches/2.8.x/wb/modules/news/add.php (revision 1918) @@ -4,75 +4,101 @@ * @category modules * @package news * @author WebsiteBaker Project - * @copyright 2009-2011, Website Baker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * */ -// Must include code to stop this file being access directly -/* -------------------------------------------------------- */ -if(defined('WB_PATH') == false) -{ - // Stop this file being access directly - die('Access denied

Cannot access this file directly

'); +if(!defined('WB_PATH')) { + require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php'); + throw new IllegalFileException(); } -/* -------------------------------------------------------- */ -$header = ''."\n"; -$post_loop = ' - - - - - -'; -$footer = '
[TITLE][PUBLISHED_DATE], [PUBLISHED_TIME]
-[SHORT] -[TEXT_READ_MORE] -
- - - - - - -
[PREVIOUS_PAGE_LINK][OF][NEXT_PAGE_LINK]
'; -$post_header = addslashes(' - - - - - - - - - - -

[TITLE]

[GROUP_IMAGE]
[TEXT_POSTED_BY] [DISPLAY_NAME] ([USERNAME]) [TEXT_ON] [PUBLISHED_DATE]
[PAGE_TITLE] >> [GROUP_TITLE]
'); -$post_footer = '

[TEXT_LAST_CHANGED]: [MODI_DATE] [TEXT_AT] [MODI_TIME]

-[TEXT_BACK]'; -$comments_header = addslashes('

-

[TEXT_COMMENTS]

-'); -$comments_loop = addslashes(' - - - - - -'); -$comments_footer = '
[TITLE][TEXT_BY] [DISPLAY_NAME] [TEXT_ON] [DATE] [TEXT_AT] [TIME]
[COMMENT]
-
[TEXT_ADD_COMMENT]'; -$comments_page = '

[TEXT_COMMENT]

-

[POST_TITLE]

-
'; + $header = ''.PHP_EOL; + $post_loop = ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '; + $footer = ' '.PHP_EOL + . '
[TITLE][CREATED_DATE], [CREATED_TIME]
'.PHP_EOL + . ' '.PHP_EOL + . ' [TEXT_READ_MORE]'.PHP_EOL + . ' '.PHP_EOL + . '
'.PHP_EOL + . '[PREVIOUS_PAGE_LINK]'.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . '
[OF][NEXT_PAGE_LINK]
'.PHP_EOL; + $post_header = ''.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . '

[TITLE]

[GROUP_IMAGE]
[TEXT_POSTED_BY] [DISPLAY_NAME] ([USERNAME]) [TEXT_ON] [PUBLISHED_DATE]
[PAGE_TITLE] >> [GROUP_TITLE]
'.PHP_EOL; + $post_footer = '

[TEXT_LAST_CHANGED]: [MODI_DATE] [TEXT_AT] [MODI_TIME]

'.PHP_EOL + . '[TEXT_BACK]'.PHP_EOL; + + $comments_header = ''.PHP_EOL + . '

[TEXT_COMMENTS]

'.PHP_EOL + . ''.PHP_EOL + . ' '.PHP_EOL; + $comments_loop = ''.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ' '.PHP_EOL + . ''.PHP_EOL; + $comments_footer = ''.PHP_EOL + . ' '.PHP_EOL + . '
[TITLE][TEXT_BY] [DISPLAY_NAME] [TEXT_ON] [DATE] [TEXT_AT] [TIME]
[COMMENT]
'.PHP_EOL + . '
[TEXT_ADD_COMMENT]'.PHP_EOL + . ''.PHP_EOL; + $comments_page = ''.PHP_EOL + . '

[TEXT_COMMENT]

'.PHP_EOL + . '

[POST_TITLE]


'.PHP_EOL + . ''.PHP_EOL; + $commenting = 'none'; $use_captcha = true; -$database->query("INSERT INTO ".TABLE_PREFIX."mod_news_settings (section_id,page_id,header,post_loop,footer,post_header,post_footer,comments_header,comments_loop,comments_footer,comments_page,commenting,use_captcha) VALUES ('$section_id','$page_id','$header','$post_loop','$footer','$post_header','$post_footer','$comments_header','$comments_loop','$comments_footer','$comments_page','$commenting','$use_captcha')"); +$sql = 'INSERT INTO `'.TABLE_PREFIX.'mod_news_settings` ' + . 'SET `section_id`='.$section_id.', ' + . '`page_id`='.$page_id.', ' + . '`header`=\''.$header.'\', ' + . '`post_loop`=\''.$post_loop.'\', ' + . '`footer`=\''.$footer.'\', ' + . '`post_header`=\''.$post_header.'\', ' + . '`post_footer`=\''.$post_footer.'\', ' + . '`comments_header`=\''.$comments_header.'\', ' + . '`comments_loop`=\''.$comments_loop.'\', ' + . '`comments_footer`=\''.$comments_footer.'\', ' + . '`comments_page`=\''.$comments_page.'\', ' + . '`commenting`=\'none\', ' + . '`use_captcha`=1 '; +$database->query($sql); Index: branches/2.8.x/wb/modules/news/modify_post.php =================================================================== --- branches/2.8.x/wb/modules/news/modify_post.php (revision 1917) +++ branches/2.8.x/wb/modules/news/modify_post.php (revision 1918) @@ -4,13 +4,13 @@ * @category modules * @package news * @author WebsiteBaker Project - * @copyright 2009-2011, Website Baker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * */ @@ -30,11 +30,37 @@ if (!$post_id) { $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $backlink); } - +$aPostRec = array( +'post_id' => 0, +'section_id' => 0, +'page_id' => 0, +'group_id' => 0, +'active' => 0, +'position' => 0, +'title' => '', +'link' => '', +'content_short' => '', +'content_long' => '', +'commenting' => '', +'created_when' => 0, +'created_by' => 0, +'published_when' => 0, +'published_until' => 0, +'posted_when' => 0, +'posted_by' => 0 +); +$sMediaUrl = WB_URL.MEDIA_DIRECTORY; // Get header and footer -$query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE post_id = '$post_id'"); -$fetch_content = $query_content->fetchRow(); +$sql = 'SELECT * FROM `'.TABLE_PREFIX.'mod_news_posts` WHERE `post_id`='.(int)$post_id; +if($oPostRes = $database->query($sql)){ + $aPostRec = $oPostRes->fetchRow(MYSQL_ASSOC); + $aPostRec['content_short'] = str_replace('{SYSVAR:MEDIA_REL}', $sMediaUrl,$aPostRec['content_short']); + $aPostRec['content_long'] = str_replace('{SYSVAR:MEDIA_REL}', $sMediaUrl,$aPostRec['content_long']); +} +//$query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE post_id = '$post_id'"); +//print '
function '.__FUNCTION__.'( '.$post_id.' );  basename: '.basename(__FILE__).'  line: '.__LINE__.' -> 
'; 
+//print_r( $fetch_content['content_short'] ); print '
'; // flush ();sleep(10); die(); if(!isset($wysiwyg_editor_loaded)) { $wysiwyg_editor_loaded=true; if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="none" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php')) { @@ -58,7 +84,7 @@ - + getFTAN(); ?> @@ -65,7 +91,7 @@ @@ -77,9 +103,9 @@ $query = $database->query("SELECT group_id,title FROM ".TABLE_PREFIX."mod_news_groups WHERE section_id = '$section_id' ORDER BY position ASC"); if($query->numRows() > 0) { // Loop through groups - while($group = $query->fetchRow()) { + while($group = $query->fetchRow(MYSQL_ASSOC)) { ?> - + @@ -100,12 +126,12 @@ @@ -122,7 +148,7 @@ @@ -136,7 +162,7 @@ @@ -146,7 +172,7 @@ @@ -215,7 +241,7 @@ ?>
: - +
: - /> + />   - /> + /> @@ -114,7 +140,7 @@
: - + <?php echo $TEXT['CALENDAR']; ?> <?php echo $TEXT['DELETE_DATE']; ?>
: - " style="width: 120px;" /> + " style="width: 120px;" /> <?php echo $TEXT['CALENDAR']; ?> <?php echo $TEXT['DELETE_DATE']; ?>
fetchRow()) { + while($comment = $query_comments->fetchRow(MYSQL_ASSOC)) { $cid = $admin->getIDKEY($comment['comment_id']); ?> Index: branches/2.8.x/wb/modules/news/save_post.php =================================================================== --- branches/2.8.x/wb/modules/news/save_post.php (revision 1917) +++ branches/2.8.x/wb/modules/news/save_post.php (revision 1918) @@ -4,13 +4,13 @@ * @category modules * @package news * @author WebsiteBaker Project - * @copyright 2009-2011, Website Baker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * */ @@ -65,20 +65,33 @@ } $admin->print_header(); +// $sMediaUrl = WB_URL.MEDIA_DIRECTORY; +// $searchfor = '@(<[^>]*=\s*")('.preg_quote($sMediaUrl).')([^">]*".*>)@siU'; // Validate all fields + $title = $admin->StripCodeFromText($admin->get_post('title')); + $commenting = $admin->StripCodeFromText($admin->get_post('commenting')); + $active = intval($admin->get_post('active')); + $old_link = $admin->StripCodeFromText($admin->get_post('link')); + $group_id = intval($admin->get_post('group')); + if($admin->get_post('title') == '' AND $admin->get_post('url') == '') { - $recallUrl = WB_URL.'/modules/news/modify_post.php?page_id='.$page_id. + $recallUrl = WB_URL.'/modules/news/modify_post.php?page_id='.$page_id. '§ion_id='.$section_id.'&post_id='.$admin->getIDKEY($post_id); $admin->print_error($MESSAGE['GENERIC_FILL_IN_ALL'], $recallUrl); - }else { - $title = $admin->get_post_escaped('title'); - $short = $admin->get_post_escaped('short'); - $long = $admin->get_post_escaped('long'); - $commenting = $admin->get_post_escaped('commenting'); - $active = $admin->get_post_escaped('active'); - $old_link = $admin->get_post_escaped('link'); - $group_id = $admin->get_post_escaped('group'); + } else { + $short = $admin->get_post('short'); + $long = $admin->get_post('long'); +// if(ini_get('magic_quotes_gpc')==true) +// { +// $short = $admin->strip_slashes($short); +// $long = $admin->strip_slashes($long); +// } +// $short = preg_replace($searchfor, '$1{SYSVAR:MEDIA_REL}$3', $short ); +// $long = preg_replace($searchfor, '$1{SYSVAR:MEDIA_REL}$3', $long ); + $short = $admin->ReplaceAbsoluteMediaUrl($short); + $long = $admin->ReplaceAbsoluteMediaUrl($long); } + // Get page link URL $sql = 'SELECT `link` FROM `'.TABLE_PREFIX.'pages` WHERE `page_id`='.(int)$page_id; $oldLink = $database->get_one($sql);