Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1836) +++ branches/2.8.x/CHANGELOG (revision 1837) @@ -13,6 +13,8 @@ +13 Dez-2012 Build 1837 Dietmar Woellbrink (Luisehahne) +! runtime optimized in /admin/pages/index.php 12 Dez-2012 Build 1836 Dietmar Woellbrink (Luisehahne) # fixed WB admin wrapper script, could never run at end if section_id == 0 10 Dez-2012 Build 1835 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/pages/index.php =================================================================== --- branches/2.8.x/wb/admin/pages/index.php (revision 1836) +++ branches/2.8.x/wb/admin/pages/index.php (revision 1837) @@ -18,17 +18,13 @@ require('../../config.php'); require_once(WB_PATH.'/framework/class.admin.php'); $admin = new admin('Pages', 'pages'); - $admin->clearIDKEY(); - // Include the WB functions file require_once(WB_PATH.'/framework/functions.php'); // eggsurplus: add child pages for a specific page /**/ - ?> - -'.PHP_EOL; // fixes A URI contains impermissible characters or quotes around the URI are not closed. $MESSAGE['PAGES_DELETE_CONFIRM'] = url_encode( $MESSAGE['PAGES_DELETE_CONFIRM'] ); @@ -35,344 +31,278 @@ function set_node ($parent,& $par) { $retval = ''; - - if($par['num_subs'] ) - { - $retval .= "\n".''."\n" : ''; + $output = ($par['num_subs'] )? ''.PHP_EOL : ''; $par['num_subs'] = (empty($output) ) ? 1 : $par['num_subs']; - print $output; + echo $output; return $editable_pages; } - // Generate pages list -if($admin->get_permission('pages_view') == true) { - ?> +if($admin->get_permission('pages_view') == true) +{ + $sListHeader = << - - - - - - - -
-

-
-
- - - - - - - - - - -
- : - - : - - PID - - : - - -
- + + +

{$HEADING['MODIFY_DELETE_PAGE']}

+ + + + +
+ + + + + + + + + + +
{$TEXT['VISIBILITY']} / {$TEXT['MENU_TITLE']}:{$TEXT['PAGE_TITLE']}:PID{$TEXT['ACTIONS']}: 
+LHEAD; + echo $sListHeader; // Work-out if we should check for existing page_code $field_set = $database->field_exists(TABLE_PREFIX.'pages', 'page_code'); - $par = array(); $par['num_subs'] = 1; $editable_pages = make_list(0, 0); -} else { +}else { $editable_pages = 0; } - ?>
-
- -
- '.PHP_EOL; +if(!intval($editable_pages)) { + echo "\t\t".'
'.$TEXT['NONE_FOUND'].'
'.PHP_EOL; } // Setup template object, parse vars to it, then parse it // Create new template object @@ -382,134 +312,116 @@ $template->set_block('page', 'main_block', 'main'); // Insert values into the add page form $template->set_var('FTAN', $admin->getFTAN()); - // Group list 1 +$query = "SELECT * FROM ".TABLE_PREFIX."groups"; +$get_groups = $database->query($query); - $query = "SELECT * FROM ".TABLE_PREFIX."groups"; - $get_groups = $database->query($query); - $template->set_block('main_block', 'group_list_block', 'group_list'); - // Insert admin group and current group first - $admin_group_name = $get_groups->fetchRow(); - $template->set_var(array( - 'ID' => 1, - 'TOGGLE' => '1', - 'DISABLED' => ' disabled="disabled"', - 'LINK_COLOR' => '000000', - 'CURSOR' => 'default', - 'NAME' => $admin_group_name['name'], - 'CHECKED' => ' checked="checked"' - ) +$template->set_block('main_block', 'group_list_block', 'group_list'); +// Insert admin group and current group first +$admin_group_name = $get_groups->fetchRow(MYSQL_ASSOC); +$template->set_var(array( + 'ID' => 1, + 'TOGGLE' => '1', + 'DISABLED' => ' disabled="disabled"', + 'LINK_COLOR' => '000000', + 'CURSOR' => 'default', + 'NAME' => $admin_group_name['name'], + 'CHECKED' => ' checked="checked"' + ) + ); +$template->parse('group_list', 'group_list_block', true); +while($group = $get_groups->fetchRow(MYSQL_ASSOC)) { + // check if the user is a member of this group + $flag_disabled = ''; + $flag_checked = ''; + $flag_cursor = 'pointer'; + $flag_color = ''; + if (in_array($group["group_id"], $admin->get_groups_id())) { + $flag_disabled = ''; //' disabled'; + $flag_checked = ' checked="checked"'; + $flag_cursor = 'default'; + $flag_color = '000000'; + } + // Check if the group is allowed to edit pages + $system_permissions = explode(',', $group['system_permissions']); + if(is_numeric(array_search('pages_modify', $system_permissions))) { + $template->set_var(array( + 'ID' => $group['group_id'], + 'TOGGLE' => $group['group_id'], + 'CHECKED' => $flag_checked, + 'DISABLED' => $flag_disabled, + 'LINK_COLOR' => $flag_color, + 'CURSOR' => $flag_checked, + 'NAME' => $group['name'], + ) ); - $template->parse('group_list', 'group_list_block', true); - - while($group = $get_groups->fetchRow()) { - // check if the user is a member of this group - $flag_disabled = ''; - $flag_checked = ''; - $flag_cursor = 'pointer'; - $flag_color = ''; - if (in_array($group["group_id"], $admin->get_groups_id())) { - $flag_disabled = ''; //' disabled'; - $flag_checked = ' checked="checked"'; - $flag_cursor = 'default'; - $flag_color = '000000'; - } - - // Check if the group is allowed to edit pages - $system_permissions = explode(',', $group['system_permissions']); - if(is_numeric(array_search('pages_modify', $system_permissions))) { - $template->set_var(array( - 'ID' => $group['group_id'], - 'TOGGLE' => $group['group_id'], - 'CHECKED' => $flag_checked, - 'DISABLED' => $flag_disabled, - 'LINK_COLOR' => $flag_color, - 'CURSOR' => $flag_checked, - 'NAME' => $group['name'], - ) - ); - $template->parse('group_list', 'group_list_block', true); - } + $template->parse('group_list', 'group_list_block', true); } +} // Group list 2 - - $query = "SELECT * FROM ".TABLE_PREFIX."groups"; - - $get_groups = $database->query($query); - $template->set_block('main_block', 'group_list_block2', 'group_list2'); - // Insert admin group and current group first - $admin_group_name = $get_groups->fetchRow(); +$sql = 'SELECT * FROM `'.TABLE_PREFIX.'groups`'; +$get_groups = $database->query($sql); +$template->set_block('main_block', 'group_list_block2', 'group_list2'); +// Insert admin group and current group first +$admin_group_name = $get_groups->fetchRow(MYSQL_ASSOC); +$template->set_var(array( + 'ID' => 1, + 'TOGGLE' => '1', + 'DISABLED' => ' disabled="disabled"', + 'LINK_COLOR' => '000000', + 'CURSOR' => 'default', + 'NAME' => $admin_group_name['name'], + 'CHECKED' => ' checked="checked"' + ) + ); +$template->parse('group_list2', 'group_list_block2', true); +while($group = $get_groups->fetchRow(MYSQL_ASSOC)) { + // check if the user is a member of this group + $flag_disabled = ''; + $flag_checked = ''; + $flag_cursor = 'pointer'; + $flag_color = ''; + if (in_array($group["group_id"], $admin->get_groups_id())) { + $flag_disabled = ''; //' disabled'; + $flag_checked = ' checked="checked"'; + $flag_cursor = 'default'; + $flag_color = '000000'; + } $template->set_var(array( - 'ID' => 1, - 'TOGGLE' => '1', - 'DISABLED' => ' disabled="disabled"', - 'LINK_COLOR' => '000000', - 'CURSOR' => 'default', - 'NAME' => $admin_group_name['name'], - 'CHECKED' => ' checked="checked"' - ) - ); + 'ID' => $group['group_id'], + 'TOGGLE' => $group['group_id'], + 'CHECKED' => $flag_checked, + 'DISABLED' => $flag_disabled, + 'LINK_COLOR' => $flag_color, + 'CURSOR' => $flag_cursor, + 'NAME' => $group['name'], + ) + ); $template->parse('group_list2', 'group_list_block2', true); - - while($group = $get_groups->fetchRow()) { - // check if the user is a member of this group - $flag_disabled = ''; - $flag_checked = ''; - $flag_cursor = 'pointer'; - $flag_color = ''; - if (in_array($group["group_id"], $admin->get_groups_id())) { - $flag_disabled = ''; //' disabled'; - $flag_checked = ' checked="checked"'; - $flag_cursor = 'default'; - $flag_color = '000000'; - } - - $template->set_var(array( - 'ID' => $group['group_id'], - 'TOGGLE' => $group['group_id'], - 'CHECKED' => $flag_checked, - 'DISABLED' => $flag_disabled, - 'LINK_COLOR' => $flag_color, - 'CURSOR' => $flag_cursor, - 'NAME' => $group['name'], - ) - ); - $template->parse('group_list2', 'group_list_block2', true); - } - - +} // Parent page list // $database = new database(); function parent_list($parent) { - global $admin, $database, $template, $field_set; - $query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE parent = '$parent' AND visibility!='deleted' ORDER BY position ASC"; - $get_pages = $database->query($query); - while($page = $get_pages->fetchRow()) { - if($admin->page_is_visible($page)==false) - continue; + global $admin, $template, $field_set; + $database = WbDatabase::getInstance(); + $sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` '. + 'WHERE `parent`='.$parent.' AND `visibility`!=\'deleted\' '. + 'ORDER BY `position` ASC'; + $get_pages = $database->query($sql); + + while($page = $get_pages->fetchRow(MYSQL_ASSOC)) { + if(!$admin->page_is_visible($page)) { continue; } // if parent = 0 set flag_icon - $template->set_var('FLAG_ROOT_ICON',' none '); + $template->set_var('FLAG_ROOT_ICON', ' none '); if( $page['parent'] == 0 && $field_set) { $template->set_var('FLAG_ROOT_ICON','url('.THEME_URL.'/images/flags/'.strtolower($page['language']).'.png)'); } // Stop users from adding pages with a level of more than the set page level limit if($page['level']+1 < PAGE_LEVEL_LIMIT) { - // Get user perms - $admin_groups = explode(',', str_replace('_', '', $page['admin_groups'])); - $admin_users = explode(',', str_replace('_', '', $page['admin_users'])); - - $in_group = FALSE; - foreach($admin->get_groups_id() as $cur_gid) { - if (in_array($cur_gid, $admin_groups)) { - $in_group = TRUE; - } - } - if(($in_group) || is_numeric(array_search($admin->get_user_id(), $admin_users))) { - $can_modify = true; - } else { - $can_modify = false; - } + // Get user permissions + $can_modify = ($admin->ami_group_member($page['admin_groups']) || + $admin->is_group_match($admin->get_groups_id(), $page['admin_users'])); // Title -'s prefix $title_prefix = ''; for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - -  '; } @@ -541,7 +453,6 @@ $template->parse('page_list2', 'page_list_block2', true); } parent_list(0); - // Explode module permissions $module_permissions = $_SESSION['MODULE_PERMISSIONS']; // Modules list @@ -548,7 +459,7 @@ $template->set_block('main_block', 'module_list_block', 'module_list'); $result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'page' order by name"); if($result->numRows() > 0) { - while ($module = $result->fetchRow()) { + while ($module = $result->fetchRow(MYSQL_ASSOC)) { // Check if user is allowed to use this module if(!is_numeric(array_search($module['directory'], $module_permissions))) { $template->set_var('VALUE', $module['directory']); @@ -562,7 +473,6 @@ } } } - // Insert urls $template->set_var(array( 'THEME_URL' => THEME_URL, @@ -570,7 +480,6 @@ 'ADMIN_URL' => ADMIN_URL, ) ); - // Insert language headings $template->set_var(array( 'HEADING_ADD_PAGE' => $HEADING['ADD_PAGE'], @@ -597,7 +506,6 @@ 'INTRO_LINK' => $MESSAGE['PAGES_INTRO_LINK'], ) ); - // Insert permissions values if($admin->get_permission('pages_add') != true) { $template->set_var('DISPLAY_ADD', 'hide'); @@ -607,17 +515,12 @@ if($admin->get_permission('pages_intro') != true || INTRO_PAGE != 'enabled') { $template->set_var('DISPLAY_INTRO', 'hide'); } - - // Parse template object $template->parse('main', 'main_block', false); $template->pparse('output', 'page'); - // include the required file for Javascript admin -if(file_exists(WB_PATH.'/modules/jsadmin/jsadmin_backend_include.php')) -{ +if(file_exists(WB_PATH.'/modules/jsadmin/jsadmin_backend_include.php')) { include(WB_PATH.'/modules/jsadmin/jsadmin_backend_include.php'); } - // Print admin $admin->print_footer(); Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1836) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1837) @@ -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', '1836'); +if(!defined('REVISION')) define('REVISION', '1837'); if(!defined('SP')) define('SP', '');