Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1680) +++ branches/2.8.x/CHANGELOG (revision 1681) @@ -11,6 +11,12 @@ ! = Update/Change =============================================================================== +03 May-2012 Build 1681 Werner v.d.Decken(DarkViper) +! reorganisation of default theme of oage-settings ++ added menu_icon_0 and menu_icon_1 +! update show_menu2 to handle the new icon fields (see README.de|en.txt) ++ add new droplet 'iParentIcon' for use with the new icons ++ added new module-depending language files (not complete yet) in admin/pages 03 May-2012 Build 1680 Werner v.d.Decken(DarkViper) ! renamed file class.database.php to Database.php ! renamed class database into Database Index: branches/2.8.x/wb/admin/skel/themes/htt/pages_settings.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/pages_settings.htt (revision 1680) +++ branches/2.8.x/wb/admin/skel/themes/htt/pages_settings.htt (revision 1681) @@ -1,6 +1,5 @@ - @@ -15,7 +14,7 @@
- {LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN} + {TEXT_LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN} @@ -26,31 +25,46 @@
+
{TEXT_SECTION_GENERAL}
+ +
+
- + + + +
- + + + +
+
@@ -59,7 +73,25 @@
+
{TEXT_SECTION_ORGANISATION}
+ +
+ +
+ +
+ +
- +
{TEXT_SECTION_CONTENT}
- -
- -
+
+
{TEXT_SECTION_SECURITY}
+
+ +
+
+ +
- {TEXT_ADMINISTRATORS}
- {TEXT_GROUP}
+ {TEXT_ADMINISTRATORS}
+ {TEXT_GROUP}
- {TEXT_USER}
+ {TEXT_USER}
@@ -158,6 +196,7 @@
+
Index: branches/2.8.x/wb/admin/skel/themes/htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt (revision 1680) +++ branches/2.8.x/wb/admin/skel/themes/htt (revision 1681) Property changes on: branches/2.8.x/wb/admin/skel/themes/htt ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +pages_settings.html Index: branches/2.8.x/wb/admin/pages/settings.php =================================================================== --- branches/2.8.x/wb/admin/pages/settings.php (revision 1680) +++ branches/2.8.x/wb/admin/pages/settings.php (revision 1681) @@ -15,15 +15,10 @@ * @lastmodified $Date$ * */ - -/* -*/ // 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'); /*-- Parent page list ------------------------------------------------------------------*/ function parent_list($parent) @@ -84,6 +79,8 @@ } } // end of function parent_list /* -------------------------------------------------------------------------------------*/ + $mLang = ModLanguage::getInstance(); + $mLang->setLanguage(dirname(__FILE__).'/languages/', LANGUAGE, DEFAULT_LANGUAGE); $sDisabled = ' disabled="disabled"'; $sSelected = ' selected="selected"'; $sChecked = ' checked="checked"'; @@ -94,13 +91,6 @@ header("Location: index.php"); exit(0); } -/* -if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) ) -{ - $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); - exit(); -} -*/ /*-- get all details of current page ---------------------------------------------------*/ $sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `page_id` = '.$page_id; if( ($oPages = $database->query($sql)) ) { @@ -154,15 +144,57 @@ /*-- workout if we should show the "manage sections" link ------------------------------*/ $sql = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'sections` ' . 'WHERE `page_id`='.$page_id.' AND `module`=\'menu_link\''; - $sections_available = (intval($database->get_one($sql)) != 0); - if ($sections_available) { - $oTpl->set_var('DISPLAY_MANAGE_SECTIONS', 'display:none;'); - } elseif(MANAGE_SECTIONS == 'enabled') { - $oTpl->set_var('TEXT_MANAGE_SECTIONS', $HEADING['MANAGE_SECTIONS']); - } else { - $oTpl->set_var('DISPLAY_MANAGE_SECTIONS', 'display:none;'); + $bIsMenuLink = (intval($database->get_one($sql)) != 0); + $oTpl->set_block('main_block', 'show_manage_sections_block', 'show_manage_sections'); + if(!$bIsMenuLink && (MANAGE_SECTIONS == true)) { + $oTpl->parse('show_manage_sections', 'show_manage_sections_block', true); + }else { + $oTpl->set_block('show_manage_sections', ''); } +/*-- collect page-icons for select boxes -----------------------------------------------*/ + $sAllowedImageTypes = '\.jpg|\.jpeg|\.png|\.gif'; + $aPageIcons = array(); + $aIcon = array(); + $sTemplate = ($aCurrentPage['template'] == '' ? DEFAULT_TEMPLATE : $aCurrentPage['template']); + $sIconDir = str_replace('\\', '/', ((defined('PAGE_ICON_DIR') && PAGE_ICON_DIR != '') ? PAGE_ICON_DIR : MEDIA_DIRECTORY)); + $sIconDir = str_replace('/*', '/'.$sTemplate, $sIconDir); + $oTpl->set_var('ICON_DIR', WB_REL.$sIconDir); + if(is_readable(WB_PATH.$sIconDir)) { + $oIterator = new DirectoryIterator(WB_PATH.$sIconDir); + foreach ($oIterator as $fileinfo) { + if(preg_match('/'.$sAllowedImageTypes.'$/i', $fileinfo->getFilename())) { + $sItem = str_replace(WB_PATH, '', str_replace('\\', '/', $fileinfo->getPathname())); +// $sItem = WB_REL.$sItem; + $aPageIcons[] = array('VALUE'=>$sItem, 'NAME'=>$fileinfo->getFilename()); + } + } + } +/*-- show page-icon select box ---------------------------------------------------------*/ + $oTpl->set_block('main_block', 'page_icon_list_block', 'page_icon_list'); + foreach($aPageIcons as $value) { + $aIcon = $value; + $aIcon['SELECTED'] = ($aCurrentPage['page_icon'] == $aIcon['VALUE'] ? $sSelected : ''); + $oTpl->set_var($aIcon); + $oTpl->parse('page_icon_list', 'page_icon_list_block', true); + } +/*-- show menu-icon-0 select box -------------------------------------------------------*/ + $oTpl->set_block('main_block', 'menu_icon0_list_block', 'menu_icon0_list'); + foreach($aPageIcons as $value) { + $aIcon = $value; + $aIcon['SELECTED'] = ($aCurrentPage['menu_icon_0'] == $aIcon['VALUE'] ? $sSelected : ''); + $oTpl->set_var($aIcon); + $oTpl->parse('menu_icon0_list', 'menu_icon0_list_block', true); + } +/*-- show menu-icon-1 select box -------------------------------------------------------*/ + $oTpl->set_block('main_block', 'menu_icon1_list_block', 'menu_icon1_list'); + foreach($aPageIcons as $value) { + $aIcon = $value; + $aIcon['SELECTED'] = ($aCurrentPage['menu_icon_1'] == $aIcon['VALUE'] ? $sSelected : ''); + $oTpl->set_var($aIcon); + $oTpl->parse('menu_icon1_list', 'menu_icon1_list_block', true); + } + /*-- show visibility select box --------------------------------------------------------*/ $aVisibility = array(); $aVisibility['PUBLIC_SELECTED'] = ($aCurrentPage['visibility'] == 'public' ? $sSelected : ''); @@ -305,10 +337,9 @@ file_exists(WB_PATH.'/modules/mod_multilingual/update_keys.php') ) { // workout field is set but module missing - $TEXT['PAGE_CODE'] = empty($TEXT['PAGE_CODE']) ? 'Pagecode' : $TEXT['PAGE_CODE']; $oTpl->set_var('TEXT_PAGE_CODE', ''.$TEXT['PAGE_CODE'].'' + $page_id.'">'.$mLang->TEXT_PAGE_CODE.'' ); /*-- begin recursive function page_code list ---------------------------------------*/ function page_code_list($parent) @@ -373,7 +404,7 @@ $selected = ($aCurrentPage['parent'] == 0 ? $sSelected : ''); $oTpl->set_var(array( 'VALUE' => 0, - 'PAGE_CODE' => $TEXT['NONE'], + 'PAGE_CODE' => $mLang->TEXT_NONE, 'PAGE_VALUE' => '', 'SELECTED' => $selected ) @@ -393,7 +424,7 @@ if($admin->get_permission('pages_add_l0') == true OR $aCurrentPage['level'] == 0) { $oTpl->set_var(array( 'ID' => '0', - 'TITLE' => $TEXT['NONE'], + 'TITLE' => $mLang->TEXT_NONE, 'SELECTED' => ($aCurrentPage['parent'] == 0 ? $sSelected : ''), ) ); $oTpl->parse('parent_page_list', 'parent_page_list_block', true); @@ -493,51 +524,9 @@ $oTpl->set_var('BLANK_SELECTED', ($aCurrentPage['target'] == '_blank' ? $sSelected : '')); /*-- insert all needed vars from language files ----------------------------------------*/ - $oTpl->set_var(array( - 'HEADING_MODIFY_PAGE_SETTINGS' => $HEADING['MODIFY_PAGE_SETTINGS'], - 'TEXT_CURRENT_PAGE' => $TEXT['CURRENT_PAGE'], - 'TEXT_MODIFY' => $TEXT['MODIFY'], - 'TEXT_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'], - 'LAST_MODIFIED' => $MESSAGE['PAGES_LAST_MODIFIED'], - 'TEXT_PAGE_TITLE' => $TEXT['PAGE_TITLE'], - 'TEXT_MENU_TITLE' => $TEXT['MENU_TITLE'], - 'TEXT_TYPE' => $TEXT['TYPE'], - 'TEXT_MENU' => $TEXT['MENU'], - 'TEXT_PARENT' => $TEXT['PARENT'], - 'TEXT_VISIBILITY' => $TEXT['VISIBILITY'], - 'TEXT_PUBLIC' => $TEXT['PUBLIC'], - 'TEXT_PRIVATE' => $TEXT['PRIVATE'], - 'TEXT_REGISTERED' => $TEXT['REGISTERED'], - 'TEXT_NONE' => $TEXT['NONE'], - 'TEXT_HIDDEN' => $TEXT['HIDDEN'], - 'TEXT_TEMPLATE' => $TEXT['TEMPLATE'], - 'TEXT_TARGET' => $TEXT['TARGET'], - 'TEXT_SYSTEM_DEFAULT' => $TEXT['SYSTEM_DEFAULT'], - 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], - 'TEXT_NEW_WINDOW' => $TEXT['NEW_WINDOW'], - 'TEXT_SAME_WINDOW' => $TEXT['SAME_WINDOW'], - 'TEXT_TOP_FRAME' => $TEXT['TOP_FRAME'], - 'TEXT_ADMINISTRATORS' => $TEXT['ADMINISTRATORS'], - 'TEXT_ALLOWED_VIEWERS' => $TEXT['ALLOWED_VIEWERS'], - 'TEXT_USER' => $TEXT['USER'], - 'TEXT_GROUP' => $TEXT['GROUP'], - 'TEXT_DESCRIPTION' => $TEXT['DESCRIPTION'], - 'TEXT_KEYWORDS' => $TEXT['KEYWORDS'], - 'TEXT_SEARCHING' => $TEXT['SEARCHING'], - 'TEXT_LANGUAGE' => $TEXT['LANGUAGE'], - 'TEXT_ENABLED' => $TEXT['ENABLED'], - 'TEXT_DISABLED' => $TEXT['DISABLED'], - 'TEXT_SAVE' => $TEXT['SAVE'], - 'TEXT_RESET' => $TEXT['RESET'], - 'LAST_MODIFIED' => $MESSAGE['PAGES_LAST_MODIFIED'], - 'HEADING_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'], - 'TEXT_NO_SELECTION' => $TEXT['NO_SELECTION'], - ) ); - + $oTpl->set_var($mLang->getLangArray()); +/*-- finalize the page -----------------------------------------------------------------*/ $oTpl->parse('main', 'main_block', false); $oTpl->pparse('output', 'page'); - // Print admin footer $admin->print_footer(); - -?> \ No newline at end of file Index: branches/2.8.x/wb/admin/pages/settings_save.php =================================================================== --- branches/2.8.x/wb/admin/pages/settings_save.php (revision 1680) +++ branches/2.8.x/wb/admin/pages/settings_save.php (revision 1681) @@ -78,6 +78,11 @@ $language = (preg_match('/^[A-Z]{2}$/', $language) ? $language : DEFAULT_LANGUAGE); $menu = intval($admin->get_post('menu')); // fix secunia 2010-91-3 $page_code = (isset($_POST['page_code']) ? intval($_POST['page_code']) : 0); +$sPageIcon = (isset($_POST['page_icon']) ? $_POST['page_icon'] : 0); +$sMenuIcon0 = (isset($_POST['menu_icon_0']) ? $_POST['menu_icon_0'] : 0); +$sMenuIcon1 = (isset($_POST['menu_icon_1']) ? $_POST['menu_icon_1'] : 0); + + // Validate data if($page_title == '' || substr($page_title,0,1)=='.') { @@ -122,6 +127,13 @@ $sViewingUsers = implode(',', array_diff($aViewingUsers, array(0))); $sViewingUsers = (preg_match('/^,|[^0-9,]|,,|,$/', $sViewingUsers) ? array() : $sViewingUsers); +$sPageIcon = (($sPageIcon == '0') ? '' : $sPageIcon); +if(!is_readable(WB_PATH.$sPageIcon)) { $sPageIcon = ''; } +$sMenuIcon0 = (($sMenuIcon0 == '0') ? '' : $sMenuIcon0); +if(!is_readable(WB_PATH.$sMenuIcon0)) { $sMenuIcon0 = ''; } +$sMenuIcon1 = (($sMenuIcon1 == '0') ? '' : $sMenuIcon1); +if(!is_readable(WB_PATH.$sMenuIcon1)) { $sMenuIcon1 = ''; } + // If needed, get new order if($parent != $old_parent) { @@ -196,7 +208,11 @@ $sql = 'UPDATE `'.TABLE_PREFIX.'pages` ' . 'SET `parent`='.$parent.', ' . '`page_title`=\''.$page_title.'\', ' + . '`tooltip`=\''.$page_title.'\', ' + . '`page_icon` =\''.mysql_real_escape_string($sPageIcon).'\', ' . '`menu_title`=\''.$menu_title.'\', ' + . '`menu_icon_0` =\''.mysql_real_escape_string($sMenuIcon0).'\', ' + . '`menu_icon_1` =\''.mysql_real_escape_string($sMenuIcon1).'\', ' . '`menu`='.$menu.', ' . '`level`='.$level.', ' . '`page_trail`=\''.$page_trail.'\', ' Index: branches/2.8.x/wb/admin/pages/languages/EN.php =================================================================== --- branches/2.8.x/wb/admin/pages/languages/EN.php (nonexistent) +++ branches/2.8.x/wb/admin/pages/languages/EN.php (revision 1681) @@ -0,0 +1,55 @@ + tag [target] das Seitenziel für den tag [page_id] die Page ID des aktuellen Menüpunktes. Index: branches/2.8.x/wb/modules/show_menu2/include.php =================================================================== --- branches/2.8.x/wb/modules/show_menu2/include.php (revision 1680) +++ branches/2.8.x/wb/modules/show_menu2/include.php (revision 1681) @@ -539,7 +539,7 @@ if (version_compare(WB_VERSION, '2.7', '>=')) { // WB 2.7+ $fields .= ',`viewing_users`'; } - if(version_compare(WB_VERSION, '2.9.0', '>=')) { + if(version_compare(WB_VERSION, '2.8.4', '>=')) { $fields .= ',`menu_icon_0`,`menu_icon_1`,`page_icon`,`tooltip`'; } if ($flags & SM2_ALLINFO) { @@ -576,6 +576,16 @@ continue; } } + if(isset($page['page_icon']) && $page['page_icon'] != '') { + $page['page_icon'] = WB_URL.$page['page_icon']; + } + if(isset($page['menu_icon_0']) && $page['menu_icon_0'] != '') { + $page['menu_icon_0'] = WB_URL.$page['menu_icon_0']; + } + if(isset($page['menu_icon_1']) && $page['menu_icon_1'] != '') { + $page['menu_icon_1'] = WB_URL.$page['menu_icon_1']; + } + if(!isset($page['tooltip'])) { $page['tooltip'] = $page['page_title']; } // ensure that we have an array entry in the table to add this to $idx = $page['parent']; Index: branches/2.8.x/wb/modules/show_menu2/README.en.txt =================================================================== --- branches/2.8.x/wb/modules/show_menu2/README.en.txt (revision 1680) +++ branches/2.8.x/wb/modules/show_menu2/README.en.txt (revision 1681) @@ -449,10 +449,11 @@ [ul]

{HEADING_MODIFY_PAGE_SETTINGS}