Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1985) +++ branches/2.8.x/CHANGELOG (revision 1986) @@ -11,6 +11,9 @@ ! = Update/Change =============================================================================== +19 Oct-2013 Build 1986 Dietmar Woellbrink (Luisehahne) +! If the advanced option languages ​​Page was disabled or pages exist with one language only, + then all available languages ​​are shown to be selected in the User-Settings implemented in backend 19 Oct-2013 Build 1985 Dietmar Woellbrink (Luisehahne) ! /modules/news/Reorg.php completely recoded using class AccessFile() ! /modules/news/upgrade.php add accessfile report to output details in upgrade-script.php Index: branches/2.8.x/wb/admin/pages/settings.php =================================================================== --- branches/2.8.x/wb/admin/pages/settings.php (revision 1985) +++ branches/2.8.x/wb/admin/pages/settings.php (revision 1986) @@ -605,17 +605,8 @@ } /*-- show language select box ----------------------------------------------------------*/ - $sql = 'SELECT `directory`, `name` FROM `'.TABLE_PREFIX.'addons` ' - . 'WHERE `type`=\'language\' '; - if( !defined('PAGE_LANGUAGES') || !PAGE_LANGUAGES) { - // display only default and current language if site is single language only - $sql .= 'AND `directory`=\''.DEFAULT_LANGUAGE.'\' '; - if($aCurrentPage['language'] != DEFAULT_LANGUAGE) { - $sql .= 'AND `directory`=\''.$aCurrentPage['language'].'\' '; - } - } - $sql .= 'ORDER BY `name`'; - if( ($oLanguages = $database->query($sql)) ) + + if( ($oLanguages = $admin->getAvailableLanguagesObjectInstance()) ) { $aAvailLanguages = array(); while($aLanguage = $oLanguages->fetchRow(MYSQL_ASSOC)) { Index: branches/2.8.x/wb/admin/pages/settings_save.php =================================================================== --- branches/2.8.x/wb/admin/pages/settings_save.php (revision 1985) +++ branches/2.8.x/wb/admin/pages/settings_save.php (revision 1986) @@ -135,7 +135,7 @@ // Validate data if($page_title == '' || substr($page_title,0,1)=='.') { - $admin->print_error($MESSAGE['PAGES_BLANK_PAGE_TITLE'],$target_url); + $admin->print_error($mLang->PAGES_BLANK_PAGE_TITLE,$target_url); } if($menu_title == '' || substr($menu_title,0,1)=='.') { Index: branches/2.8.x/wb/admin/pages/languages/EN.php =================================================================== --- branches/2.8.x/wb/admin/pages/languages/EN.php (revision 1985) +++ branches/2.8.x/wb/admin/pages/languages/EN.php (revision 1986) @@ -61,10 +61,12 @@ $MESSAGE['PAGES_LAST_MODIFIED'] = 'Last modification by'; $MESSAGE['PAGES_BLANK_SEO_TITLE'] = 'Please enter a Filename'; +$MESSAGE['PAGES_ADDED'] = 'Page added successfully'; +$MESSAGE['PAGES_SAVED'] = 'Page saved successfully'; +$MESSAGE['PAGES_SAVED_SETTINGS'] = 'Page settings saved successfully'; $MESSAGE['PAGES_CANNOT_CREATE_PROTECTED_FILE'] = 'Protected File, Page cannot be add!'; -$MESSAGE['PAGES_CANNOT_MODIFY_PROTECTED_FILE'] = 'Geschützter Name, Page cannot be modified!'; +$MESSAGE['PAGES_CANNOT_MODIFY_PROTECTED_FILE'] = 'Protected File, Page cannot be modified!'; - $HELP['PAGE_IMAGE_DIR'] = '

The topical side picture path is
{{icon_dir}}.

'; $HELP['PAGE_IMAGE_DIR'] .='

As a system administrator you can change the folder for side pictures and menu pictures under options extendet options in server setting.

'; $HELP['PAGE_IMAGE_DIR'] .='

Example::
/media/banner

'; Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1985) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1986) @@ -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', '1985'); +if(!defined('REVISION')) define('REVISION', '1986'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/admin/settings/index.php =================================================================== --- branches/2.8.x/wb/admin/settings/index.php (revision 1985) +++ branches/2.8.x/wb/admin/settings/index.php (revision 1986) @@ -44,8 +44,6 @@ require_once(WB_PATH.'/framework/functions.php'); require_once(WB_PATH.'/framework/functions-utf8.php'); -if(!class_exists('Template', false)){ include(WB_PATH.'/include/phplib/ttemplate.inc'); } - // Setup template object, parse vars to it, then parse it // Create new template object $oTpl = new Template(dirname($admin->correct_theme_source('settings.htt')),'comment'); Index: branches/2.8.x/wb/admin/preferences/index.php =================================================================== --- branches/2.8.x/wb/admin/preferences/index.php (revision 1985) +++ branches/2.8.x/wb/admin/preferences/index.php (revision 1986) @@ -23,6 +23,8 @@ function build_page( &$admin, &$database ) { // global $HEADING, $TEXT; + $mLang = Translate::getinstance(); + $oReg = WbAdaptor::getInstance(); include_once(WB_PATH.'/framework/functions-utf8.php'); // Setup template object, parse vars to it, then parse it // Setup template object, parse vars to it, then parse it @@ -67,22 +69,17 @@ $aLangAddons = array(); $aLangBrowser = array(); -// read available languages from table addons -$sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` '; -$sql .= 'WHERE `type` = \'language\' ORDER BY `directory`'; -if( $oLang = $database->query($sql) ) -{ - while( $aLang = $oLang->fetchRow(MYSQL_ASSOC) ) - { - $aLangAddons[$aLang['directory']] = $aLang['name']; - } -} // default, if no information from client available $sAutoLanguage = DEFAULT_LANGUAGE; +// read available languages from table addons +$aLangAddons = $admin->getAvailableLanguages(); -$aLangUsed = array_flip(explode(',',$admin->GetLanguagesInUsed())); +$aLangUsed = array_flip(explode(',',$admin->getLanguagesInUsed())); $aLangUsed = array_intersect_key($aLangAddons, $aLangUsed); +if( (sizeof($aLangUsed)<2) || !($oReg->PageLanguages) ){ + $aLangUsed = $aLangAddons; +} $template->set_block('main_block', 'language_list_block', 'language_list'); foreach( $aLangUsed as $sDirectory => $sName ) { Index: branches/2.8.x/wb/templates/wb_theme/css/screen.css =================================================================== --- branches/2.8.x/wb/templates/wb_theme/css/screen.css (revision 1985) +++ branches/2.8.x/wb/templates/wb_theme/css/screen.css (revision 1986) @@ -135,7 +135,7 @@ div.settings_table { margin :0 auto; width :90%; } form.settings_table { border :1px none #eeee; font-family :verdana,arial,helvetica,sans-serif; margin :5px auto; padding :5px; } form.settings_table fieldset { border :2px none #eeeeee; display :block; line-height :1.0em; margin :1px auto; padding :3px 0px 3px 0px; } - input[type="file"] { width :100%; border :1px solid #000000; background-color :#ccccff; } + input[type="file"] { max-width :75%; border :1px solid #000000; background-color :#ccccff; } legend.settings_table , form.settings_table legend { border :none; color :#006699; font-size :140%; margin :5px; padding :0; } form.settings_table div.sub-row { background-color :transparent !important; background-color :#eeeeee; } @@ -145,10 +145,10 @@ form.settings_table fieldset div.input input.radio { margin :0.8em auto; border :none; padding-left :6px; } form.settings_table fieldset div.input label { margin :6px auto; padding-left :6px; min-height :1em; width :35%; float :none; display :inline; vertical-align :top; } form.settings_table input[type="text"], - form.settings_table input[type="password"] { border :1px solid #666666; margin :0px auto; padding-left :5px; width :59%; } + form.settings_table input[type="password"] { border :1px solid #666666; margin :2px auto; padding :2px 0px 2px 6px; width :59.5%; } form.settings_table input.radio { border :1px none #666666; margin :0px auto; padding-left :0.5em; height :1em; } form.settings_table input[type="button"].button { border :1px solid #666666; color :#000000; text-align :left; font-weight :bold; background-color :#dddddd; margin :2px auto; padding :2px 0px 2px 6px; width :60%; } - form.settings_table textarea { border :1px solid #666666; margin :3px auto; padding-left :0.5em; min-height :1em; width :59%; } + form.settings_table textarea { border :1px solid #666666; margin :3px auto; padding-left :0.5em; min-height :1em; width :59.5%; } form.settings_table select { border :1px solid #666666; margin :3px auto; padding-left :0.5em; min-height :1em; width :60%; } /* */ div.content_box form { } Index: branches/2.8.x/wb/modules/MultiLingual/include.php =================================================================== --- branches/2.8.x/wb/modules/MultiLingual/include.php (revision 1985) +++ branches/2.8.x/wb/modules/MultiLingual/include.php (revision 1986) @@ -38,6 +38,8 @@ function language_menu($sExtension = "auto") { global $wb; + $oReg = WbAdaptor::getInstance(); + if(!$oReg->PageLanguages) {return false;} $sExtension = strtolower($sExtension); switch($sExtension) { @@ -48,7 +50,7 @@ $sExtension = 'auto'; } - if ( $wb->page_id < 1){ return false; } + if ( ($wb->page_id < 1) ){ return false; } $oPageLang = new m_MultiLingual_Lib(); $oPageLang->setExtension($sExtension); $sRetVal = $oPageLang->getLangMenu();