Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1381) +++ branches/2.8.x/CHANGELOG (revision 1382) @@ -11,6 +11,8 @@ ! = Update/Change ------------------------------------- 2.8.2 ------------------------------------- +14 Jan-2011 Build 1382 Dietmar Woellbrink (Luisehahne) +# fix known error in drag and drop 14 Jan-2011 Build 1381 Dietmar Woellbrink (Luisehahne) ! update admin/modules unpack handling, overwrite newer files 13 Jan-2011 Build 1380 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1381) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1382) @@ -52,6 +52,6 @@ // 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.2.RC4'); -if(!defined('REVISION')) define('REVISION', '1381'); +if(!defined('REVISION')) define('REVISION', '1382'); ?> Index: branches/2.8.x/wb/modules/admin.php =================================================================== --- branches/2.8.x/wb/modules/admin.php (revision 1381) +++ branches/2.8.x/wb/modules/admin.php (revision 1382) @@ -1,202 +1,195 @@ -is_error -$admin = new admin('Pages', 'pages_modify'); - -// Get perms -// $database = new database(); -$sql = 'SELECT `admin_groups`,`admin_users` FROM `'.TABLE_PREFIX.'pages` '; -$sql .= 'WHERE `page_id` = '.intval($page_id); - -$res_pages = $database->query($sql); -$rec_pages = $res_pages->fetchRow(); - -$old_admin_groups = explode(',', str_replace('_', '', $rec_pages['admin_groups'])); -$old_admin_users = explode(',', str_replace('_', '', $rec_pages['admin_users'])); - -$in_group = FALSE; -foreach($admin->get_groups_id() as $cur_gid) -{ - if (in_array($cur_gid, $old_admin_groups)) - { - $in_group = TRUE; - } -} -if((!$in_group) && !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) -{ - $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); -} - -// Check whether the section_id belongs to the page_id at all -if ($section_id != 0) { - $sql = "SELECT `position` FROM `".TABLE_PREFIX."sections` WHERE `page_id` = '$page_id' AND `section_id` = '$section_id'"; - $res_sec = $database->query($sql); - if ($database->is_error()) - { - $admin->print_error($database->get_error()); - } - if ($res_sec->numRows() == 0) - { - $admin->print_error($MESSAGE['PAGES']['NOT_FOUND']); - } -} - -// Workout if the developer wants to show the info banner -if(isset($print_info_banner) && $print_info_banner == true) -{ - // Get page details - // $database = new database(); not needed - $sql = 'SELECT `page_id`,`page_title`,`modified_by`,`modified_when` FROM `'.TABLE_PREFIX.'pages` '; - $sql .= 'WHERE `page_id` = '.intval($page_id); - $res_pages = $database->query($sql); - if($database->is_error()) - { - // $admin->print_header(); don't know why - $admin->print_error($database->get_error()); - } - if($res_pages->numRows() == 0) - { - // $admin->print_header(); don't know why - $admin->print_error($MESSAGE['PAGES']['NOT_FOUND']); - } else { - $rec_pages = $res_pages->fetchRow(); - } - - // Get display name of person who last modified the page - $user = $admin->get_user_details($rec_pages['modified_by']); - - // Convert the unix ts for modified_when to human a readable form - if($rec_pages['modified_when'] != 0) - { - $modified_ts = gmdate(TIME_FORMAT.', '.DATE_FORMAT, $rec_pages['modified_when']+TIMEZONE); - } else { - $modified_ts = 'Unknown'; - } - - // Include page info script - $template = new Template(THEME_PATH.'/templates'); - $template->set_file('page', 'pages_modify.htt'); - $template->set_block('page', 'main_block', 'main'); - $template->set_var(array( - 'PAGE_ID' => $rec_pages['page_id'], - 'PAGE_TITLE' => ($rec_pages['page_title']), - 'MODIFIED_BY' => $user['display_name'], - 'MODIFIED_BY_USERNAME' => $user['username'], - 'MODIFIED_WHEN' => $modified_ts, - 'ADMIN_URL' => ADMIN_URL - )); - - $template->set_block('main_block', 'show_modify_block', 'show_modify'); - if($modified_ts == 'Unknown') - { - $template->set_block('show_modify', ''); - $template->set_var('CLASS_DISPLAY_MODIFIED', 'hide'); - } else { - $template->set_var('CLASS_DISPLAY_MODIFIED', ''); - $template->parse('show_modify', 'show_modify_block', true); - } - - $template->set_block('main_block', 'show_section_block', 'show_section'); - // Work-out if we should show the "manage sections" link - $sql = 'SELECT `section_id` FROM `'.TABLE_PREFIX.'sections` '; - $sql .= 'WHERE `page_id` = '.intval($page_id).' AND `module` = "menu_link"'; - if( ( $res_sections = $database->query($sql) ) && ($database->is_error() == false ) ) - { - if($res_sections->numRows() > 0) - { - $template->set_block('show_section', ''); - $template->set_var('DISPLAY_MANAGE_SECTIONS', 'none'); - }elseif(MANAGE_SECTIONS == 'enabled') - { - $template->set_var('TEXT_MANAGE_SECTIONS', $HEADING['MANAGE_SECTIONS']); - $template->parse('show_section', 'show_section_block', true); - }else { - $template->set_block('show_section', ''); - $template->set_var('DISPLAY_MANAGE_SECTIONS', 'none'); - } - } else { - $admin->print_error($database->get_error()); - } - - // Insert language TEXT - $template->set_var(array( - 'TEXT_CURRENT_PAGE' => $TEXT['CURRENT_PAGE'], - 'TEXT_CHANGE' => $TEXT['CHANGE'], - 'LAST_MODIFIED' => $MESSAGE['PAGES']['LAST_MODIFIED'], - 'TEXT_CHANGE_SETTINGS' => $TEXT['CHANGE_SETTINGS'], - 'HEADING_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'] - )); - - // Parse and print header template - $template->parse('main', 'main_block', false); - $template->pparse('output', 'page'); -} - -// Work-out if the developer wants us to update the timestamp for when the page was last modified -if(isset($update_when_modified) && $update_when_modified == true) -{ - $sql = 'UPDATE `'.TABLE_PREFIX.'pages` '; - $sql .= 'SET `modified_when` = '.time().', '; - $sql .= '`modified_by` = '.intval($admin->get_user_id()).' '; - $sql .= 'WHERE page_id = '.intval($page_id); - $database->query($sql); -} - -?> \ No newline at end of file +is_error +$admin = new admin('Pages', 'pages_modify'); + +// Get perms +$sql = 'SELECT `admin_groups`,`admin_users` FROM `'.TABLE_PREFIX.'pages` '; +$sql .= 'WHERE `page_id` = '.intval($page_id); +$ok = false; +if( ($res_pages = $database->query($sql)) ) +{ + if( ($rec_pages = $res_pages->fetchRow()) ) + { + if( $admin->ami_group_member($rec_pages['admin_groups']) || $admin->ami_group_member($rec_pages['admin_users']) ) + { + $ok = true; + } + } +} +if( !$ok ) { $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); } + +//$old_admin_groups = explode(',', str_replace('_', '', $rec_pages['admin_groups'])); +//$old_admin_users = explode(',', str_replace('_', '', $rec_pages['admin_users'])); +// +//$in_group = FALSE; +//foreach($admin->get_groups_id() as $cur_gid) +//{ +// if (in_array($cur_gid, $old_admin_groups)) +// { +// $in_group = TRUE; +// } +//} +//if((!$in_group) && !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) +//{ +// $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); +//} + +// Workout if the developer wants to show the info banner +if(isset($print_info_banner) && $print_info_banner == true) +{ + // Get page details + $sql = 'SELECT `page_id`,`page_title`,`modified_by`,`modified_when` FROM `'.TABLE_PREFIX.'pages` '; + $sql .= 'WHERE `page_id` = '.intval($page_id); + $res_pages = $database->query($sql); + if($database->is_error()) + { + // $admin->print_header(); don't know why + $admin->print_error($database->get_error()); + } + if($res_pages->numRows() == 0) + { + // $admin->print_header(); don't know why + $admin->print_error($MESSAGE['PAGES']['NOT_FOUND']); + } else { + $rec_pages = $res_pages->fetchRow(); + } + + // Get display name of person who last modified the page + $user = $admin->get_user_details($rec_pages['modified_by']); + + // Convert the unix ts for modified_when to human a readable form + if($rec_pages['modified_when'] != 0) + { + $modified_ts = gmdate(TIME_FORMAT.', '.DATE_FORMAT, $rec_pages['modified_when']+TIMEZONE); + } else { + $modified_ts = 'Unknown'; + } + + // Include page info script + $template = new Template(THEME_PATH.'/templates'); + $template->set_file('page', 'pages_modify.htt'); + $template->set_block('page', 'main_block', 'main'); + $template->set_var(array( + 'PAGE_ID' => $rec_pages['page_id'], + 'PAGE_TITLE' => ($rec_pages['page_title']), + 'MODIFIED_BY' => $user['display_name'], + 'MODIFIED_BY_USERNAME' => $user['username'], + 'MODIFIED_WHEN' => $modified_ts, + 'ADMIN_URL' => ADMIN_URL + )); + + $template->set_block('main_block', 'show_modify_block', 'show_modify'); + if($modified_ts == 'Unknown') + { + $template->set_block('show_modify', ''); + $template->set_var('CLASS_DISPLAY_MODIFIED', 'hide'); + } else { + $template->set_var('CLASS_DISPLAY_MODIFIED', ''); + $template->parse('show_modify', 'show_modify_block', true); + } + + $template->set_block('main_block', 'show_section_block', 'show_section'); + // Work-out if we should show the "manage sections" link + $sql = 'SELECT `section_id` FROM `'.TABLE_PREFIX.'sections` '; + $sql .= 'WHERE `page_id` = '.intval($page_id).' AND `module` = "menu_link"'; + if( ( $res_sections = $database->query($sql) ) && ($database->is_error() == false ) ) + { + if($res_sections->numRows() > 0) + { + $template->set_block('show_section', ''); + $template->set_var('DISPLAY_MANAGE_SECTIONS', 'none'); + }elseif(MANAGE_SECTIONS == 'enabled') + { + $template->set_var('TEXT_MANAGE_SECTIONS', $HEADING['MANAGE_SECTIONS']); + $template->parse('show_section', 'show_section_block', true); + }else { + $template->set_block('show_section', ''); + $template->set_var('DISPLAY_MANAGE_SECTIONS', 'none'); + } + } else { + $admin->print_error($database->get_error()); + } + + // Insert language TEXT + $template->set_var(array( + 'TEXT_CURRENT_PAGE' => $TEXT['CURRENT_PAGE'], + 'TEXT_CHANGE' => $TEXT['CHANGE'], + 'LAST_MODIFIED' => $MESSAGE['PAGES']['LAST_MODIFIED'], + 'TEXT_CHANGE_SETTINGS' => $TEXT['CHANGE_SETTINGS'], + 'HEADING_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'] + )); + + // Parse and print header template + $template->parse('main', 'main_block', false); + $template->pparse('output', 'page'); +} + +// Work-out if the developer wants us to update the timestamp for when the page was last modified +if(isset($update_when_modified) && $update_when_modified == true) +{ + $sql = 'UPDATE `'.TABLE_PREFIX.'pages` '; + $sql .= 'SET `modified_when` = '.time().', '; + $sql .= '`modified_by` = '.intval($admin->get_user_id()).' '; + $sql .= 'WHERE page_id = '.intval($page_id); + $database->query($sql); +} + +?>