Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1401) +++ branches/2.8.x/CHANGELOG (revision 1402) @@ -11,7 +11,11 @@ ! = Update/Change ------------------------------------- 2.8.2 ------------------------------------- -21 Jan-2011 Build 1400 Frank Heyne (FrankH) +22 Jan-2011 Build 1402 Dietmar Woellbrink (Luisehahne) +! secure peparing and beginning fix admin/pages +21 Jan-2011 Build 1401 Frank Heyne (FrankH) +! fixed changelog +#21 Jan-2011 Build 1400 Frank Heyne (FrankH) # Security fix in account # Security fix in admin/media, thanks to hal 9000 21 Jan-2011 Build 1399 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/pages/save.php =================================================================== --- branches/2.8.x/wb/admin/pages/save.php (revision 1401) +++ branches/2.8.x/wb/admin/pages/save.php (revision 1402) @@ -15,7 +15,19 @@ * @lastmodified $Date$ * */ +/* +*/ +// Create new admin object +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_modify'); +if (!$admin->checkFTAN()) +{ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],'index.php'); + exit(); +} + // Get page & section id if(!isset($_POST['page_id']) || !is_numeric($_POST['page_id'])) { header("Location: index.php"); @@ -23,6 +35,7 @@ } else { $page_id = intval($_POST['page_id']); } + if(!isset($_POST['section_id']) || !is_numeric($_POST['section_id'])) { header("Location: index.php"); exit(0); @@ -30,16 +43,20 @@ $section_id = intval($_POST['section_id']); } -// Create new admin object -require('../../config.php'); -require_once(WB_PATH.'/framework/class.admin.php'); -$admin = new admin('Pages', 'pages_modify'); +/* +if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) ) +{ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); + exit(); +} -if (!$admin->checkFTAN()) +if( (!($section_id= $admin->checkIDKEY('section_id', 0, $_SERVER['REQUEST_METHOD']))) ) { - $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],'index.php'); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); exit(); } +*/ + $js_back = "javascript: history.go(-1);"; // Get perms @@ -96,7 +113,7 @@ { $admin->print_error($database->get_error(), $js_back); } else { - $admin->print_success($MESSAGE['PAGES']['SAVED'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); + $admin->print_success($MESSAGE['PAGES']['SAVED'], ADMIN_URL.'/pages/modify.php?page_id='.$results_array['page_id'] ); } // Print admin footer Index: branches/2.8.x/wb/admin/pages/settings.php =================================================================== --- branches/2.8.x/wb/admin/pages/settings.php (revision 1401) +++ branches/2.8.x/wb/admin/pages/settings.php (revision 1402) @@ -16,6 +16,15 @@ * */ +/* +*/ +// Create new admin object +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_settings'); +// Include the WB functions file +require_once(WB_PATH.'/framework/functions-utf8.php'); + // Get page id if(!isset($_GET['page_id']) || !is_numeric($_GET['page_id'])) { @@ -25,17 +34,14 @@ $page_id = $_GET['page_id']; } -// Create new admin object -require('../../config.php'); -require_once(WB_PATH.'/framework/class.admin.php'); -$admin = new admin('Pages', 'pages_settings'); +/* +if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) ) +{ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); + exit(); +} +*/ -// Include the WB functions file -require_once(WB_PATH.'/framework/functions-utf8.php'); - -// Get perms -/*$database = new database(); */ - $sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `page_id` = '.$page_id; $results = $database->query($sql); $results_array = $results->fetchRow(); @@ -94,6 +100,8 @@ $template->set_var(array( 'PAGE_ID' => $results_array['page_id'], + // 'PAGE_IDKEY' => $admin->getIDKEY($results_array['page_id']), + 'PAGE_IDKEY' => $results_array['page_id'], 'PAGE_TITLE' => ($results_array['page_title']), 'MENU_TITLE' => ($results_array['menu_title']), 'DESCRIPTION' => ($results_array['description']), Index: branches/2.8.x/wb/admin/pages/delete.php =================================================================== --- branches/2.8.x/wb/admin/pages/delete.php (revision 1401) +++ branches/2.8.x/wb/admin/pages/delete.php (revision 1402) @@ -16,13 +16,6 @@ * */ -// Get page id -if(!isset($_GET['page_id']) || !is_numeric($_GET['page_id'])) { - header("Location: index.php"); - exit(0); -} else { - $page_id = $_GET['page_id']; -} // Create new admin object and print admin header require('../../config.php'); @@ -31,13 +24,23 @@ // Include the WB functions file require_once(WB_PATH.'/framework/functions.php'); + /* -if (!$admin->checkIDKEY('page_id', 0, 'GET')) +if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) ) { $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); exit(); } */ + +// Get page id +if(!isset($_GET['page_id']) || !is_numeric($_GET['page_id'])) { + header("Location: index.php"); + exit(0); +} else { + $page_id = $_GET['page_id']; +} + // Get perms if (!$admin->get_page_permission($page_id,'admin')) { $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); Index: branches/2.8.x/wb/admin/pages/sections_save.php =================================================================== --- branches/2.8.x/wb/admin/pages/sections_save.php (revision 1401) +++ branches/2.8.x/wb/admin/pages/sections_save.php (revision 1402) @@ -26,7 +26,17 @@ } require_once(WB_PATH."/include/jscalendar/jscalendar-functions.php"); +/**/ +// Create new admin object +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_modify'); +if (!$admin->checkFTAN()) +{ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],'index.php'); + exit(); +} + // Get page id if(!isset($_GET['page_id']) || !is_numeric($_GET['page_id'])) { header("Location: index.php"); @@ -34,17 +44,13 @@ } else { $page_id = $_GET['page_id']; } - -// Create new admin object -require_once(WB_PATH.'/framework/class.admin.php'); -$admin = new admin('Pages', 'pages_modify'); - -if (!$admin->checkFTAN()) +/* +if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) ) { - $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],'index.php'); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); exit(); } - +*/ // Get perms // $database = new database(); $results = $database->query("SELECT admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"); @@ -117,9 +123,9 @@ } // Check for error or print success message if($database->is_error()) { - $admin->print_error($database->get_error(), ADMIN_URL.'/pages/sections.php?page_id='.$page_id); + $admin->print_error($database->get_error(), ADMIN_URL.'/pages/sections.php?page_id='.$page_id ); } else { - $admin->print_success($MESSAGE['PAGES']['SECTIONS_PROPERTIES_SAVED'], ADMIN_URL.'/pages/sections.php?page_id='.$page_id); + $admin->print_success($MESSAGE['PAGES']['SECTIONS_PROPERTIES_SAVED'], ADMIN_URL.'/pages/sections.php?page_id='.$page_id ); } // Print admin footer Index: branches/2.8.x/wb/admin/pages/index.php =================================================================== --- branches/2.8.x/wb/admin/pages/index.php (revision 1401) +++ branches/2.8.x/wb/admin/pages/index.php (revision 1402) @@ -19,6 +19,9 @@ 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 @@ -66,8 +69,6 @@ print set_node ($parent,$par); - // $database = new database(); - // Get page list from database $sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `parent` = '.$parent.' '; $sql .= (PAGE_TRASH != 'inline') ? 'AND `visibility` != \'deleted\' ' : ' '; @@ -156,7 +157,7 @@ get_permission('pages_modify') == true && $can_modify == true) { ?> - + <?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['PUBLIC']; ?> @@ -208,12 +209,12 @@ get_permission('pages_settings') == true && $can_modify == true) { ?> - + <?php echo $TEXT['SETTINGS']; ?> - + <?php echo $TEXT['RESTORE']; ?> @@ -224,7 +225,6 @@ // Work-out if we should show the "manage dates" link if(MANAGE_SECTIONS == 'enabled' && $admin->get_permission('pages_modify')==true && $can_modify==true) { - $sql = 'SELECT `publ_start`, `publ_end` FROM `'.TABLE_PREFIX.'sections` '; $sql .= 'WHERE `page_id` = '.$page['page_id'].' AND `module` != \'menu_link\' '; $query_sections = $database->query($sql); @@ -246,11 +246,11 @@ { $file=$admin->page_is_active($page)?"clock_16.png":"clock_red_16.png"; ?> - + " alt="" /> - + <?php echo $HEADING['MANAGE_SECTIONS']; ?> @@ -279,8 +279,8 @@ - get_permission('pages_delete') == true && $can_modify == true) { ?> - + get_permission('pages_delete') == true && $can_modify == true) { // add IdKey ?> + <?php echo $TEXT['DELETE']; ?> @@ -350,7 +350,6 @@ // Work-out if we should check for existing page_code $field_sql = $database->query("DESCRIBE ".TABLE_PREFIX."pages page_code"); $field_set = $field_sql->numRows(); - $par = array(); $par['num_subs'] = 1; $editable_pages = make_list(0, 0); @@ -358,6 +357,7 @@ $editable_pages = 0; } ?>
Index: branches/2.8.x/wb/admin/pages/settings2.php =================================================================== --- branches/2.8.x/wb/admin/pages/settings2.php (revision 1401) +++ branches/2.8.x/wb/admin/pages/settings2.php (revision 1402) @@ -15,7 +15,19 @@ * @lastmodified $Date$ * */ +/* */ +// Create new admin object and print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_settings'); + +if (!$admin->checkFTAN()) +{ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],'index.php'); + exit(); +} + // Get page id if(!isset($_POST['page_id']) || !is_numeric($_POST['page_id'])) { @@ -25,16 +37,13 @@ $page_id = $_POST['page_id']; } -// Create new admin object and print admin header -require('../../config.php'); -require_once(WB_PATH.'/framework/class.admin.php'); -$admin = new admin('Pages', 'pages_settings'); - -if (!$admin->checkFTAN()) +/* +if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) ) { - $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],'index.php'); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); exit(); } +*/ // Include the WB functions file require_once(WB_PATH.'/framework/functions.php'); Index: branches/2.8.x/wb/admin/pages/modify.php =================================================================== --- branches/2.8.x/wb/admin/pages/modify.php (revision 1401) +++ branches/2.8.x/wb/admin/pages/modify.php (revision 1402) @@ -15,7 +15,14 @@ * @lastmodified $Date$ * */ +/* +*/ +// Create new admin object +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_modify'); + // Get page id if(!isset($_GET['page_id']) || !is_numeric($_GET['page_id'])) { header("Location: index.php"); @@ -24,12 +31,14 @@ $page_id = $_GET['page_id']; } -// Create new admin object -require('../../config.php'); -require_once(WB_PATH.'/framework/class.admin.php'); +/* +if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) ) +{ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); + exit(); +} +*/ -$admin = new admin('Pages', 'pages_modify'); - // Get perms if(!$admin->get_page_permission($page_id,'admin')) { $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); @@ -57,9 +66,10 @@ $template->set_var(array( 'PAGE_ID' => $results_array['page_id'], + // 'PAGE_IDKEY' => $admin->getIDKEY($results_array['page_id']), + 'PAGE_IDKEY' => $results_array['page_id'], 'PAGE_TITLE' => ($results_array['page_title']), 'MENU_TITLE' => ($results_array['menu_title']), - 'FTAN' => 'FTAN', 'ADMIN_URL' => ADMIN_URL, 'WB_URL' => WB_URL, 'WB_PATH' => WB_PATH, Index: branches/2.8.x/wb/admin/pages/sections.php =================================================================== --- branches/2.8.x/wb/admin/pages/sections.php (revision 1401) +++ branches/2.8.x/wb/admin/pages/sections.php (revision 1402) @@ -25,6 +25,12 @@ header('Location: '.ADMIN_URL.'/pages/index.php'); exit(0); } +/* */ +$debug = false; // to show position and section_id +If(!defined('DEBUG')) { define('DEBUG',$debug);} +// Create new admin object +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_modify'); // Get page id if(!isset($_GET['page_id']) || !is_numeric($_GET['page_id'])) @@ -35,11 +41,13 @@ $page_id = $_GET['page_id']; } -$debug = false; // to show position and section_id -If(!defined('DEBUG')) { define('DEBUG',$debug);} -// Create new admin object -require_once(WB_PATH.'/framework/class.admin.php'); -$admin = new admin('Pages', 'pages_modify'); +/* +if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) ) +{ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); + exit(); +} +*/ // Check if we are supposed to add or delete a section if(isset($_GET['section_id']) && is_numeric($_GET['section_id'])) @@ -71,7 +79,7 @@ require(WB_PATH.'/framework/class.order.php'); $order = new order(TABLE_PREFIX.'sections', 'position', 'section_id', 'page_id'); $order->clean($page_id); - $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/sections.php?page_id='.$page_id); + $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/sections.php?page_id='.$admin->getIDKEY($page_id)); $admin->print_footer(); exit(); } @@ -181,6 +189,8 @@ // set first defaults and messages $template->set_var(array( 'PAGE_ID' => $results_array['page_id'], + // 'PAGE_IDKEY' => $admin->getIDKEY($results_array['page_id']), + 'PAGE_IDKEY' => $results_array['page_id'], 'TEXT_PAGE' => $TEXT['PAGE'], 'PAGE_TITLE' => ($results_array['page_title']), 'MENU_TITLE' => ($results_array['menu_title']), @@ -203,11 +213,13 @@ // Insert variables $template->set_var(array( - 'VAR_PAGE_ID' => $results_array['page_id'], + 'PAGE_ID' => $results_array['page_id'], + // 'PAGE_IDKEY' => $admin->getIDKEY($results_array['page_id']), + 'PAGE_IDKEY' => $results_array['page_id'], 'VAR_PAGE_TITLE' => $results_array['page_title'], - 'SETTINGS_LINK' => ADMIN_URL.'/pages/settings.php?page_id='.$results_array['page_id'], - 'MODIFY_LINK' => ADMIN_URL.'/pages/modify.php?page_id='.$results_array['page_id'] - ) + 'SETTINGS_LINK' => ADMIN_URL.'/pages/settings.php?page_id='./*$admin->getIDKEY()*/$results_array['page_id'], + 'MODIFY_LINK' => ADMIN_URL.'/pages/modify.php?page_id='./*$admin->getIDKEY()*/$results_array['page_id'] + ) ); $sql = 'SELECT `section_id`,`module`,`position`,`block`,`publ_start`,`publ_end` '; @@ -233,7 +245,7 @@ { $edit_page = ''; } - $edit_page_0 = ''.$section['module'].''; if(SECTION_BLOCKS) { @@ -252,6 +264,8 @@ 'NAME_SIZE' => 300, 'INPUT_ATTRIBUTE' => $input_attribute, 'VAR_SECTION_ID' => $section['section_id'], + // 'VAR_SECTION_IDKEY' => $admin->getIDKEY($section['section_id']), + 'VAR_SECTION_IDKEY' => $section['section_id'], 'VAR_POSITION' => $section['position'], 'LINK_MODIFY_URL_VAR_MODUL_NAME' => $edit_page, 'SELECT' => '', @@ -284,6 +298,8 @@ 'NAME_SIZE' => 300, 'INPUT_ATTRIBUTE' => $input_attribute, 'VAR_SECTION_ID' => $section['section_id'], + // 'VAR_SECTION_IDKEY' => $admin->getIDKEY($section['section_id']), + 'VAR_SECTION_IDKEY' => $section['section_id'], 'VAR_POSITION' => $section['position'], 'LINK_MODIFY_URL_VAR_MODUL_NAME' => $edit_page, 'NAME' => htmlentities(strip_tags($block[1])), Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1401) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1402) @@ -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.RC5'); -if(!defined('REVISION')) define('REVISION', '1400'); +if(!defined('REVISION')) define('REVISION', '1402'); ?> Index: branches/2.8.x/wb/framework/class.admin.php =================================================================== --- branches/2.8.x/wb/framework/class.admin.php (revision 1401) +++ branches/2.8.x/wb/framework/class.admin.php (revision 1402) @@ -116,29 +116,29 @@ } $header_template->set_var( array( - 'SECTION_NAME' => $MENU[strtoupper($this->section_name)], - 'BODY_TAGS' => $body_tags, - 'WEBSITE_TITLE' => ($title['value']), - 'TEXT_ADMINISTRATION' => $TEXT['ADMINISTRATION'], - 'CURRENT_USER' => $MESSAGE['START']['CURRENT_USER'], - 'DISPLAY_NAME' => $this->get_display_name(), - 'CHARSET' => $charset, - 'LANGUAGE' => strtolower(LANGUAGE), - 'VERSION' => VERSION, - 'REVISION' => REVISION, - 'WB_URL' => WB_URL, - 'ADMIN_URL' => ADMIN_URL, - 'THEME_URL' => THEME_URL, - 'TITLE_START' => $MENU['START'], - 'TITLE_VIEW' => $MENU['VIEW'], - 'TITLE_HELP' => $MENU['HELP'], - 'TITLE_LOGOUT' => $MENU['LOGOUT'], - 'URL_VIEW' => $view_url, - 'URL_HELP' => 'http://www.websitebaker2.org/', - 'BACKEND_MODULE_CSS' => $this->register_backend_modfiles('css'), // adds backend.css - 'BACKEND_MODULE_JS' => $this->register_backend_modfiles('js') // adds backend.js - ) - ); + 'SECTION_NAME' => $MENU[strtoupper($this->section_name)], + 'BODY_TAGS' => $body_tags, + 'WEBSITE_TITLE' => ($title['value']), + 'TEXT_ADMINISTRATION' => $TEXT['ADMINISTRATION'], + 'CURRENT_USER' => $MESSAGE['START']['CURRENT_USER'], + 'DISPLAY_NAME' => $this->get_display_name(), + 'CHARSET' => $charset, + 'LANGUAGE' => strtolower(LANGUAGE), + 'VERSION' => VERSION, + 'REVISION' => REVISION, + 'WB_URL' => WB_URL, + 'ADMIN_URL' => ADMIN_URL, + 'THEME_URL' => THEME_URL, + 'TITLE_START' => $MENU['START'], + 'TITLE_VIEW' => $MENU['VIEW'], + 'TITLE_HELP' => $MENU['HELP'], + 'TITLE_LOGOUT' => $MENU['LOGOUT'], + 'URL_VIEW' => $view_url, + 'URL_HELP' => 'http://www.websitebaker2.org/', + 'BACKEND_MODULE_CSS' => $this->register_backend_modfiles('css'), // adds backend.css + 'BACKEND_MODULE_JS' => $this->register_backend_modfiles('js') // adds backend.js + ) + ); // Create the menu $menu = array( @@ -188,7 +188,6 @@ $footer_template->set_var(array( 'BACKEND_BODY_MODULE_JS' => $this->register_backend_modfiles_body('js'), 'WB_URL' => WB_URL, - 'WB_PATH' => WB_PATH, 'ADMIN_URL' => ADMIN_URL, 'THEME_URL' => THEME_URL, ) ); Index: branches/2.8.x/wb/templates/wb_theme/templates/pages_modify.htt =================================================================== --- branches/2.8.x/wb/templates/wb_theme/templates/pages_modify.htt (revision 1401) +++ branches/2.8.x/wb/templates/wb_theme/templates/pages_modify.htt (revision 1402) @@ -1,24 +1,24 @@ - - - - - - -
-

{HEADING_MODIFY_PAGE}

- 		- {TEXT_CURRENT_PAGE}: - {PAGE_TITLE} - - - {TEXT_CHANGE_SETTINGS} - - - - {TEXT_MANAGE_SECTIONS} - -
- - {LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN} - - -
+ + + + + + +
+

{HEADING_MODIFY_PAGE}

+ 		+ {TEXT_CURRENT_PAGE}: + {PAGE_TITLE} + - + {TEXT_CHANGE_SETTINGS} + + - + {TEXT_MANAGE_SECTIONS} + +
+ + {LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN} + + +
\ No newline at end of file Index: branches/2.8.x/wb/templates/wb_theme/templates/pages_sections.htt =================================================================== --- branches/2.8.x/wb/templates/wb_theme/templates/pages_sections.htt (revision 1401) +++ branches/2.8.x/wb/templates/wb_theme/templates/pages_sections.htt (revision 1402) @@ -1,121 +1,121 @@ - -
- - - - - - -
-

{HEADING_MANAGE_SECTIONS}

- 		ID: {PAGE_ID}{TEXT_CURRENT_PAGE}: {PAGE_TITLE} - - - {HEADING_MODIFY_PAGE} - - - {TEXT_CHANGE_SETTINGS} -
- -
- {FTAN} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{TEXT_TYPE}:{TEXT_BLOCK}:{TEXT_PUBL_START_DATE}:{TEXT_PUBL_END_DATE}:{TEXT_ACTIONS}:{TEXT_SID}{TEXT_PID}
- - - {VAR_SECTION_ID} - {LINK_MODIFY_URL_VAR_MODUL_NAME} - - - start - del - - end - del - - {VAR_MOVE_UP_URL} - - {VAR_MOVE_DOWN_URL} - - - X - - - {VAR_SECTION_ID} - - {POSITION} -
-
- -

{TEXT_ADD_SECTION}

-
- - {FTAN} - - - - - -
- - - -
-
- - - - + +
+ + + + + + +
+

{HEADING_MANAGE_SECTIONS}

+ 		ID: {PAGE_ID}{TEXT_CURRENT_PAGE}: {PAGE_TITLE} + - + {HEADING_MODIFY_PAGE} + - + {TEXT_CHANGE_SETTINGS} +
+ +
+ {FTAN} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{TEXT_TYPE}:{TEXT_BLOCK}:{TEXT_PUBL_START_DATE}:{TEXT_PUBL_END_DATE}:{TEXT_ACTIONS}:{TEXT_SID}{TEXT_PID}
+ + + {VAR_SECTION_ID} + {LINK_MODIFY_URL_VAR_MODUL_NAME} + + + start + del + + end + del + + {VAR_MOVE_UP_URL} + + {VAR_MOVE_DOWN_URL} + + + X + + + {VAR_SECTION_ID} + + {POSITION} +
+
+ +

{TEXT_ADD_SECTION}

+
+ + {FTAN} + + + + + +
+ + + +
+
+ + + + \ No newline at end of file Index: branches/2.8.x/wb/templates/wb_theme/templates/pages_settings.htt =================================================================== --- branches/2.8.x/wb/templates/wb_theme/templates/pages_settings.htt (revision 1401) +++ branches/2.8.x/wb/templates/wb_theme/templates/pages_settings.htt (revision 1402) @@ -1,6 +1,6 @@ - + @@ -12,9 +12,9 @@ {TEXT_CURRENT_PAGE}: {PAGE_TITLE} - - {TEXT_MODIFY_PAGE} + {TEXT_MODIFY_PAGE}- - {TEXT_MANAGE_SECTIONS} + {TEXT_MANAGE_SECTIONS}
{LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN} Index: branches/2.8.x/wb/templates/argos_theme/templates/pages_modify.htt =================================================================== --- branches/2.8.x/wb/templates/argos_theme/templates/pages_modify.htt (revision 1401) +++ branches/2.8.x/wb/templates/argos_theme/templates/pages_modify.htt (revision 1402) @@ -1,25 +1,25 @@ - - -
- - - - - -

{HEADING_MODIFY_PAGE}

ID: {PAGE_ID} - {TEXT_CURRENT_PAGE}: - {PAGE_TITLE} - - - {TEXT_CHANGE_SETTINGS} - - - - {TEXT_MANAGE_SECTIONS} - -
- - {LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN} - - -
- + + + + + + + + +

{HEADING_MODIFY_PAGE}

ID: {PAGE_ID} + {TEXT_CURRENT_PAGE}: + {PAGE_TITLE} + - + {TEXT_CHANGE_SETTINGS} + + - + {TEXT_MANAGE_SECTIONS} + +
+ + {LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN} + + +
+ \ No newline at end of file Index: branches/2.8.x/wb/templates/argos_theme/templates/pages_sections.htt =================================================================== --- branches/2.8.x/wb/templates/argos_theme/templates/pages_sections.htt (revision 1401) +++ branches/2.8.x/wb/templates/argos_theme/templates/pages_sections.htt (revision 1402) @@ -1,115 +1,115 @@ - -
- - - - - - -

{HEADING_MANAGE_SECTIONS}

ID: {PAGE_ID}{TEXT_CURRENT_PAGE}: {PAGE_TITLE} - - - {HEADING_MODIFY_PAGE} - - - {TEXT_CHANGE_SETTINGS} -
- -
- {FTAN} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{TEXT_TYPE}{TEXT_BLOCK} {TEXT_PUBL_START_DATE}{TEXT_PUBL_END_DATE}{TEXT_ACTIONS}ID{TEXT_PID}
- - - {VAR_SECTION_ID} - {LINK_MODIFY_URL_VAR_MODUL_NAME} -   - - {TEXT_CALENDAR} - {TEXT_DELETE_DATE} - - {TEXT_CALENDAR} - {TEXT_DELETE_DATE} - {VAR_MOVE_UP_URL}{VAR_MOVE_DOWN_URL} - - {TEXT_DELETE} - - {VAR_SECTION_ID}{POSITION}
-
- -
-
-
-

{TEXT_ADD_SECTION}

-
- - {FTAN} - - - - -
- -    - -
-
- - - - + +
+ + + + + + +

{HEADING_MANAGE_SECTIONS}

ID: {PAGE_ID}{TEXT_CURRENT_PAGE}: {PAGE_TITLE} + - + {HEADING_MODIFY_PAGE} + - + {TEXT_CHANGE_SETTINGS} +
+ +
+ {FTAN} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{TEXT_TYPE}{TEXT_BLOCK} {TEXT_PUBL_START_DATE}{TEXT_PUBL_END_DATE}{TEXT_ACTIONS}ID{TEXT_PID}
+ + + {VAR_SECTION_ID} + {LINK_MODIFY_URL_VAR_MODUL_NAME} +   + + {TEXT_CALENDAR} + {TEXT_DELETE_DATE} + + {TEXT_CALENDAR} + {TEXT_DELETE_DATE} + {VAR_MOVE_UP_URL}{VAR_MOVE_DOWN_URL} + + {TEXT_DELETE} + + {VAR_SECTION_ID}{POSITION}
+
+ +
+
+
+

{TEXT_ADD_SECTION}

+
+ + {FTAN} + + + + +
+ +    + +
+
+ + + + \ No newline at end of file Index: branches/2.8.x/wb/templates/argos_theme/templates/pages_settings.htt =================================================================== --- branches/2.8.x/wb/templates/argos_theme/templates/pages_settings.htt (revision 1401) +++ branches/2.8.x/wb/templates/argos_theme/templates/pages_settings.htt (revision 1402) @@ -10,9 +10,9 @@ {TEXT_CURRENT_PAGE}: {PAGE_TITLE} - - {TEXT_MODIFY_PAGE} + {TEXT_MODIFY_PAGE} - - {TEXT_MANAGE_SECTIONS} + {TEXT_MANAGE_SECTIONS}
{LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN}