Index: branches/2.8.x/wb/admin/skel/themes/htt/settings.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/settings.htt (revision 1715) +++ branches/2.8.x/wb/admin/skel/themes/htt/settings.htt (revision 1716) @@ -1,183 +1,222 @@ - -
+ - {FTAN} - - - - - - - - - - - - - - - - - - - - - - - - -

{HEADING_GENERAL_SETTINGS}

{TEXT_WEBSITE_TITLE}: - -
{TEXT_WEBSITE_DESCRIPTION}: - -
{TEXT_WEBSITE_KEYWORDS}: - -
{TEXT_WEBSITE_HEADER}: - -
{TEXT_WEBSITE_FOOTER}: - -
- +
+
+ +
+ +
+
+
+
+
+ {HEADING_GENERAL_SETTINGS} +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+ + +
+
+
- -
- - + + - - - - - - - - - - - - + + + - - - - + + - - - - - - - - + + + - - - - + + - - - - - - - - + + + - - - - + + + + + + + +
+ + + + + + + + + +
+ +
+ + +
+ - - - - +
+ + + +   ( -1 = {TEXT_DISABLED}, 0 -10000 ) + +
- - - - + - - - - + + - - - - - - - - + + - - - - - -
{TEXT_PAGE_LEVEL_LIMIT}: +
+ -
{TEXT_PAGE_TRASH}: - +
+ + + - + + + -
- - +
-
{TEXT_PAGE_LANGUAGES}: - + +
+ + + - + + + -
{TEXT_MULTIPLE_MENUS}: - + + + +
+ + + - + + + -
{TEXT_HOME_FOLDERS}: - +
+ + + - + + + -
{TEXT_MANAGE_SECTIONS}: - + +
+ + + - + + + -
{TEXT_SECTION_BLOCKS}: - + + + +
+ + + - + + + -
{TEXT_INTRO_PAGE}: - +
+ + + - + + + -
{TEXT_HOMEPAGE_REDIRECTION}: - + +
+ + + - + + + -
{TEXT_SMART_LOGIN}: - + + + +
+ + + - + + + -
{TEXT_LOGIN}: - +
+ + + - - -
{TEXT_REDIRECT_AFTER}: - -
-
{TEXT_SIGNUP}: - -
{TEXT_PHP_ERROR_LEVEL}: +
+ -
{TEXT_WYSIWYG_STYLE}: +
+ -
{TEXT_WYSIWYG_EDITOR}: + + +
+ +
-
  - - - - -
- - - - - - - - + + + - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - -

{HEADING_DEFAULT_SETTINGS}

{TEXT_LANGUAGE}: +
+ +
+ + + +
+
+
+ + +
+ {HEADING_DEFAULT_SETTINGS} +
+ +
-
{TEXT_CHARSET}: +
+ +
-
{TEXT_TIMEZONE}: +
+ +
-
{TEXT_DATE_FORMAT}: + + + +
+ +
-
{TEXT_TIME_FORMAT}: + + + +
+ +
-
{TEXT_TEMPLATE}: + + + +
+ +
-
{TEXT_THEME}: + + + +
+ +
-
  - - - - -
- - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - -

{HEADING_SEARCH_SETTINGS}

{TEXT_VISIBILITY}: + + +
+ +
+ + + +
+
+
+ + +
+ {HEADING_SEARCH_SETTINGS} +
+ +
-
{TEXT_TEMPLATE}: + + + +
+ +
-
{TEXT_HEADER}: + +
+ +
-
{TEXT_RESULTS_HEADER}: + + + +
+ +
-
{TEXT_RESULTS_LOOP}: + + + +
+ +
-
{TEXT_RESULTS_FOOTER}: + + + +
+ +
-
{TEXT_NO_RESULTS}: + + + +
+ +
-
{TEXT_FOOTER}: + + +
+ +
-
{TEXT_MODULE_ORDER}: + + + +
+ +
-
{TEXT_MAX_EXCERPT}: + + + +
+ +
-
{TEXT_TIME_LIMIT}: + + + +
+ +
-
  - - - - -
+
+ +
+ + + +
+
+
+ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

{HEADING_SERVER_SETTINGS}

{TEXT_SERVER_OPERATING_SYSTEM}: - +
+ {HEADING_SERVER_SETTINGS} +
+ + + - + + + -
 
 + + + +
+ +
- + @@ -424,12 +474,14 @@ ({WORLD_WRITEABLE_WARNING})
-
{TEXT_FILESYSTEM_PERMISSIONS}:
 - + + +
+
+ +
+
+
@@ -471,9 +523,11 @@
{TEXT_FILES}: {STRING_FILE_MODE}
- 		- + + +
+
+
@@ -515,124 +569,174 @@
{TEXT_DIRECTORIES}: {STRING_DIR_MODE}
-
{TEXT_DEV_INFOS}: - + +
+ + +
+
+ + + - + + + -
{TEXT_PAGES_DIRECTORY}:
{TEXT_PAGE_ICON_DIR}: - -
{TEXT_MEDIA_DIRECTORY}:
{TEXT_PAGE_EXTENSION}:
{TEXT_PAGE_SPACER}:
{TEXT_RENAME_FILES_ON_UPLOAD}:
{TEXT_SESSION_IDENTIFIER}:
{TEXT_SEC_ANCHOR}:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - -
-

{HEADING_WBMAILER_SETTINGS}

+ + + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+
+ +
+ + + +
+
+
+ + + +
+ {HEADING_WBMAILER_SETTINGS}

{TEXT_WBMAILER_DEFAULT_SETTINGS_NOTICE}

-
{TEXT_WBMAILER_DEFAULT_SENDER_MAIL}:
{TEXT_WBMAILER_DEFAULT_SENDER_NAME}:
{TEXT_WBMAILER_FUNCTION}: - +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ + + - + + + -

{TEXT_WBMAILER_NOTICE}

{TEXT_WBMAILER_SMTP_HOST}:
{TEXT_WBMAILER_SMTP_AUTH}: - + + + +
+
+

{TEXT_WBMAILER_NOTICE}

+
+
+
+
+ +
+ +
+
+ +
+ + + -
{TEXT_WBMAILER_SMTP_USERNAME}:
{TEXT_WBMAILER_SMTP_PASSWORD}:
  - - - - -
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+
+ +
+ + + +
+
+ +
+
+
+

{MODE_SWITCH_WARNING}

+ +
+
-
- - -
-

{MODE_SWITCH_WARNING}

- + \ No newline at end of file Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1715) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1716) @@ -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', '1715'); +if(!defined('REVISION')) define('REVISION', '1716'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/admin/settings/save.php =================================================================== --- branches/2.8.x/wb/admin/settings/save.php (revision 1715) +++ branches/2.8.x/wb/admin/settings/save.php (revision 1716) @@ -4,7 +4,7 @@ * @category admin * @package settings * @author WebsiteBaker Project - * @copyright 2009-2012, Website Baker Org. e.V. + * @copyright 2009-2012, WebsiteBaker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x @@ -47,9 +47,10 @@ if(isset($_POST['server_email'])) { $_POST['server_email'] = strip_tags($_POST['server_email']); - // $pattern = '/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9]([-a-z0-9_]?[a-z0-9])*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z]{2})|([1]?\d{1,2}|2[0-4]{1}\d{1}|25[0-5]{1})(\.([1]?\d{1,2}|2[0-4]{1}\d{1}|25[0-5]{1})){3})(:[0-9]{1,5})?\r/im'; - $pattern = '/^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.(([0-9]{1,3})|([a-zA-Z]{2,6}))$/'; - if(false == preg_match($pattern, $_POST['server_email'])) +// // $pattern = '/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9]([-a-z0-9_]?[a-z0-9])*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z]{2})|([1]?\d{1,2}|2[0-4]{1}\d{1}|25[0-5]{1})(\.([1]?\d{1,2}|2[0-4]{1}\d{1}|25[0-5]{1})){3})(:[0-9]{1,5})?\r/im'; +// $pattern = '/^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.(([0-9]{1,3})|([a-zA-Z]{2,6}))$/'; +// if(false == preg_match($pattern, $_POST['server_email'])) + if(!$admin->validate_email($_POST['server_email'])) { $admin->print_error($MESSAGE['USERS_INVALID_EMAIL']. '
Email: '.htmlentities($_POST['server_email']).'', $js_back); @@ -152,8 +153,8 @@ } } -$allow_tags_in_fields = array('website_header', 'website_footer'); -$allow_empty_values = array('website_header','website_footer','sec_anchor','pages_directory','page_spacer'); +$allow_tags_in_fields = array('website_header', 'website_footer','website_signature'); +$allow_empty_values = array('website_header','website_footer','sec_anchor','pages_directory','page_spacer','website_signature'); $disallow_in_fields = array('pages_directory', 'media_directory','wb_version'); // Query current settings in the db, then loop through them and update the db with the new value Index: branches/2.8.x/wb/admin/settings/languages/EN.php =================================================================== --- branches/2.8.x/wb/admin/settings/languages/EN.php (nonexistent) +++ branches/2.8.x/wb/admin/settings/languages/EN.php (revision 1716) @@ -0,0 +1,8 @@ + defined('WEBSITE_SIGNATURE') ? WEBSITE_SIGNATURE : '', + 'confirmed_registration' => (defined('CONFIRMED_REGISTRATION') ? CONFIRMED_REGISTRATION : '0'), + ); +db_update_key_value( 'settings', $cfg ); + // Include the WB functions file require_once(WB_PATH.'/framework/functions.php'); require_once(WB_PATH.'/framework/functions-utf8.php'); +$mLang = ModLanguage::getInstance(); +$mLang->setLanguage(dirname(__FILE__).'/languages/', LANGUAGE, DEFAULT_LANGUAGE); + // Setup template object, parse vars to it, then parse it // Create new template object -$template = new Template(dirname($admin->correct_theme_source('settings.htt'))); +$template = new Template(dirname($admin->correct_theme_source('settings.htt')),'keep'); // $template->debug = true; $template->set_file('page', 'settings.htt'); $template->set_block('page', 'main_block', 'main'); @@ -145,6 +155,11 @@ } } + $sSelected = ' selected="selected"'; + $checked = ' checked="checked"'; +/*-- insert all needed vars from language files ----------------------------------------*/ + $template->set_var($mLang->getLangArray()); + $template->set_var(array( 'WB_URL' => WB_URL, 'THEME_URL' => THEME_URL, @@ -152,8 +167,14 @@ )); // Insert language values - $result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'language' ORDER BY directory"); - if($result->numRows() > 0) + $sql = 'SELECT `name`, `directory` FROM `'.TABLE_PREFIX.'addons` '; + $sql .= 'WHERE `type` = \'language\' '; + $sql .= 'AND `function` != \'theme\' '; + $sql .= 'ORDER BY `directory`'; + + if( ($result = $database->query($sql)) && ($result->numRows() > 0) ) +// $result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'language' ORDER BY directory"); +// if($result->numRows() > 0) { while($addon = $result->fetchRow()) { $langIcons = (empty($addon['directory'])) ? 'none' : strtolower($addon['directory']); @@ -161,7 +182,7 @@ $template->set_var('CODE', $addon['directory']); $template->set_var('NAME', $addon['name']); $template->set_var('FLAG', THEME_URL.'/images/flags/'.$langIcons); - $template->set_var('SELECTED', (DEFAULT_LANGUAGE == $addon['directory'] ? ' selected="selected"' : '') ); + $template->set_var('SELECTED', (DEFAULT_LANGUAGE == $addon['directory'] ? $sSelected : '') ); $template->parse('language_list', 'language_list_block', true); } } @@ -175,7 +196,7 @@ $template->set_var('VALUE', $hour_offset); $template->set_var('NAME', $title); if(DEFAULT_TIMEZONE == $hour_offset*60*60) { - $template->set_var('SELECTED', ' selected="selected"'); + $template->set_var('SELECTED', $sSelected); } else { $template->set_var('SELECTED', ''); } @@ -189,7 +210,7 @@ $template->set_var('VALUE', $code); $template->set_var('NAME', $title); if(DEFAULT_CHARSET == $code) { - $template->set_var('SELECTED', ' selected="selected"'); + $template->set_var('SELECTED', $sSelected); } else { $template->set_var('SELECTED', ''); } @@ -208,7 +229,7 @@ } $template->set_var('NAME', $title); if(DEFAULT_DATE_FORMAT == $format) { - $template->set_var('SELECTED', ' selected="selected"'); + $template->set_var('SELECTED', $sSelected); } else { $template->set_var('SELECTED', ''); } @@ -226,7 +247,7 @@ } $template->set_var('NAME', $title); if(DEFAULT_TIME_FORMAT == $format) { - $template->set_var('SELECTED', ' selected="selected"'); + $template->set_var('SELECTED', $sSelected); } else { $template->set_var('SELECTED', ''); } @@ -233,27 +254,49 @@ $template->parse('time_format_list', 'time_format_list_block', true); } - // Insert templates - $result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' AND function != 'theme' ORDER BY name"); - if($result->numRows() > 0) { - while($addon = $result->fetchRow()) { - $template->set_var('FILE', $addon['directory']); - $template->set_var('NAME', $addon['name']); - if(($addon['directory'] == DEFAULT_TEMPLATE) ? $selected = ' selected="selected"' : $selected = ''); - $template->set_var('SELECTED', $selected); - $template->parse('template_list', 'template_list_block', true); +// Insert templates + $sql = 'SELECT `name`, `directory` FROM `'.TABLE_PREFIX.'addons` '; + $sql .= 'WHERE `type` = \'template\' '; + $sql .= 'AND `function` != \'theme\' '; + $sql .= 'ORDER BY `name`'; + if( ($result = $database->query($sql)) && ($result->numRows() > 0) ) + { +// $result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' AND function != 'theme' ORDER BY name"); +// if($result->numRows() > 0) { + while($addon = $result->fetchRow()) + { + if( $admin->get_permission($addon['directory'],'template' ) ) + { + $template->set_var('FILE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + $selected = (($addon['directory'] == DEFAULT_TEMPLATE) ? $sSelected : ''); + $template->set_var('SELECTED', $selected); + $template->parse('template_list', 'template_list_block', true); + } } } - // Insert backend theme - $result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' AND function = 'theme' ORDER BY name"); - if($result->numRows() > 0) { - while($addon = $result->fetchRow()) { - $template->set_var('FILE', $addon['directory']); - $template->set_var('NAME', $addon['name']); - if(($addon['directory'] == DEFAULT_THEME) ? $selected = ' selected="selected"' : $selected = ''); - $template->set_var('SELECTED', $selected); - $template->parse('theme_list', 'theme_list_block', true); +// Insert backend theme + $sql = 'SELECT `name`, `directory` FROM `'.TABLE_PREFIX.'addons` '; + $sql .= 'WHERE `type` = \'template\' '; + $sql .= 'AND `function` = \'theme\' '; + $sql .= 'ORDER BY `name`'; + + + if( ($result = $database->query($sql)) && ($result->numRows() > 0) ) + { +// $result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' AND function = 'theme' ORDER BY name"); +// if($result->numRows() > 0) { + while($addon = $result->fetchRow()) + { + if( $admin->get_permission($addon['directory'],'template' ) ) + { + $template->set_var('FILE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + $selected = (($addon['directory'] == DEFAULT_THEME) ? $sSelected : ''); + $template->set_var('SELECTED', $selected); + $template->parse('theme_list', 'theme_list_block', true); + } } } @@ -262,25 +305,34 @@ $module_name=$TEXT['NONE']; $template->set_var('FILE', $file); $template->set_var('NAME', $module_name); - $selected = (!defined('WYSIWYG_EDITOR') || $file == WYSIWYG_EDITOR) ? ' selected="selected"' : ''; + $selected = (!defined('WYSIWYG_EDITOR') || $file == WYSIWYG_EDITOR) ? $sSelected : ''; $template->set_var('SELECTED', $selected); $template->parse('editor_list', 'editor_list_block', true); - $result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'wysiwyg' ORDER BY name"); - if($result->numRows() > 0) + $sql = 'SELECT `name`, `directory` FROM `'.TABLE_PREFIX.'addons` '; + $sql .= 'WHERE `type` = \'module\' '; + $sql .= 'AND `function` = \'wysiwyg\' '; + $sql .= 'ORDER BY `name`'; + if( ($result = $database->query($sql)) && ($result->numRows() > 0) ) { +// $result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'wysiwyg' ORDER BY name"); +// if($result->numRows() > 0) +// { while($addon = $result->fetchRow()) { - $template->set_var('FILE', $addon['directory']); - $template->set_var('NAME', $addon['name']); - $selected = (!defined('WYSIWYG_EDITOR') || $addon['directory'] == WYSIWYG_EDITOR) ? ' selected="selected"' : ''; - $template->set_var('SELECTED', $selected); - $template->parse('editor_list', 'editor_list_block', true); + if( $admin->get_permission($addon['directory'],'module' ) ) + { + $template->set_var('FILE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + $selected = (!defined('WYSIWYG_EDITOR') || $addon['directory'] == WYSIWYG_EDITOR) ? $sSelected : ''; + $template->set_var('SELECTED', $selected); + $template->parse('editor_list', 'editor_list_block', true); + } } } // Insert templates for search settings $search_template = ( ($search_template == DEFAULT_TEMPLATE) || ($search_template == '') ) ? '' : $search_template; - $selected = ( ($search_template != DEFAULT_TEMPLATE) ) ? ' selected="selected"' : $selected = ''; + $selected = ( ($search_template != DEFAULT_TEMPLATE) ) ? $sSelected : ''; $template->set_var(array( 'FILE' => '', @@ -289,17 +341,25 @@ )); $template->parse('search_template_list', 'search_template_list_block', true); - $result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' AND function = 'template' ORDER BY name"); - if($result->numRows() > 0) + $sql = 'SELECT `name`, `directory` FROM `'.TABLE_PREFIX.'addons` '; + $sql .= 'WHERE `type` = \'template\' '; + $sql .= 'AND `function` = \'template\' '; + $sql .= 'ORDER BY `name`'; + if( ($result = $database->query($sql)) && ($result->numRows() > 0) ) { +// $result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' AND function = 'template' ORDER BY name"); +// if($result->numRows() > 0) +// { while($addon = $result->fetchRow()) { - $template->set_var('FILE', $addon['directory']); - $template->set_var('NAME', $addon['name']); - $selected = ($addon['directory'] == $search_template) ? ' selected="selected"' : $selected = ''; - $template->set_var('SELECTED', $selected); - $template->parse('search_template_list', 'search_template_list_block', true); - + if( $admin->get_permission($addon['directory'],'template' ) ) + { + $template->set_var('FILE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + $selected = ($addon['directory'] == $search_template) ? $sSelected : ''; + $template->set_var('SELECTED', $selected); + $template->parse('search_template_list', 'search_template_list_block', true); + } } } @@ -309,11 +369,12 @@ { $template->set_var('VALUE', $value); $template->set_var('NAME', $title); - $selected = (ER_LEVEL == $value) ? ' selected="selected"' : ''; + $selected = (ER_LEVEL == $value) ? $sSelected : ''; $template->set_var('SELECTED', $selected); $template->parse('error_reporting_list', 'error_reporting_list_block', true); } + // Insert permissions values if($admin->get_permission('settings_advanced') != true) { @@ -326,7 +387,7 @@ $template->set_var('NUMBER', $i); if(PAGE_LEVEL_LIMIT == $i) { - $template->set_var('SELECTED', ' selected="selected"'); + $template->set_var('SELECTED', $sSelected); } else { $template->set_var('SELECTED', ''); } @@ -336,33 +397,33 @@ // Work-out if multiple menus feature is enabled if(defined('MULTIPLE_MENUS') && MULTIPLE_MENUS == true) { - $template->set_var('MULTIPLE_MENUS_ENABLED', ' checked="checked"'); + $template->set_var('MULTIPLE_MENUS_ENABLED', $checked); } else { - $template->set_var('MULTIPLE_MENUS_DISABLED', ' checked="checked"'); + $template->set_var('MULTIPLE_MENUS_DISABLED', $checked); } // Work-out if page languages feature is enabled if(defined('PAGE_LANGUAGES') && PAGE_LANGUAGES == true) { - $template->set_var('PAGE_LANGUAGES_ENABLED', ' checked="checked"'); + $template->set_var('PAGE_LANGUAGES_ENABLED', $checked); } else { - $template->set_var('PAGE_LANGUAGES_DISABLED', ' checked="checked"'); + $template->set_var('PAGE_LANGUAGES_DISABLED', $checked); } // Work-out if warn_page_leave feature is enabled if (defined('WARN_PAGE_LEAVE') && WARN_PAGE_LEAVE == true) { - $template->set_var('WARN_PAGE_LEAVE_ENABLED', ' checked="checked"'); + $template->set_var('WARN_PAGE_LEAVE_ENABLED', $checked); } else { - $template->set_var('WARN_PAGE_LEAVE_DISABLED', ' checked="checked"'); + $template->set_var('WARN_PAGE_LEAVE_DISABLED', $checked); } // Work-out if smart login feature is enabled if(defined('SMART_LOGIN') && SMART_LOGIN == true) { - $template->set_var('SMART_LOGIN_ENABLED', ' checked="checked"'); + $template->set_var('SMART_LOGIN_ENABLED', $checked); } else { - $template->set_var('SMART_LOGIN_DISABLED', ' checked="checked"'); + $template->set_var('SMART_LOGIN_DISABLED', $checked); } /* Make's sure GD library is installed */ @@ -376,41 +437,41 @@ // Work-out if section blocks feature is enabled if(defined('SECTION_BLOCKS') && SECTION_BLOCKS == true) { - $template->set_var('SECTION_BLOCKS_ENABLED', ' checked="checked"'); + $template->set_var('SECTION_BLOCKS_ENABLED', $checked); } else { - $template->set_var('SECTION_BLOCKS_DISABLED', ' checked="checked"'); + $template->set_var('SECTION_BLOCKS_DISABLED', $checked); } // Work-out if homepage redirection feature is enabled if(defined('HOMEPAGE_REDIRECTION') && HOMEPAGE_REDIRECTION == true) { - $template->set_var('HOMEPAGE_REDIRECTION_ENABLED', ' checked="checked"'); + $template->set_var('HOMEPAGE_REDIRECTION_ENABLED', $checked); } else { - $template->set_var('HOMEPAGE_REDIRECTION_DISABLED', ' checked="checked"'); + $template->set_var('HOMEPAGE_REDIRECTION_DISABLED', $checked); } // Work-out which server os should be checked if(OPERATING_SYSTEM == 'linux') { - $template->set_var('LINUX_SELECTED', ' checked="checked"'); + $template->set_var('LINUX_SELECTED', $checked); } elseif(OPERATING_SYSTEM == 'windows') { - $template->set_var('WINDOWS_SELECTED', ' checked="checked"'); + $template->set_var('WINDOWS_SELECTED', $checked); } // Work-out if developer infos feature is enabled if(defined('DEV_INFOS') && DEV_INFOS == true) { - $template->set_var('DEV_INFOS_ENABLED', ' checked="checked"'); + $template->set_var('DEV_INFOS_ENABLED', $checked); } else { - $template->set_var('DEV_INFOS_DISABLED', ' checked="checked"'); + $template->set_var('DEV_INFOS_DISABLED', $checked); } // Work-out if manage sections feature is enabled if(MANAGE_SECTIONS) { - $template->set_var('MANAGE_SECTIONS_ENABLED', ' checked="checked"'); + $template->set_var('MANAGE_SECTIONS_ENABLED', $checked); } else { - $template->set_var('MANAGE_SECTIONS_DISABLED', ' checked="checked"'); + $template->set_var('MANAGE_SECTIONS_DISABLED', $checked); } // Work-out which wbmailer routine should be checked @@ -427,17 +488,17 @@ 'TEXT_WBMAILER_SMTP_AUTH_NOTICE' => $TEXT['REQUIRED'].' '.$TEXT['WBMAILER_SMTP_AUTH'], 'TEXT_WBMAILER_SMTP_USERNAME' => $TEXT['WBMAILER_SMTP_USERNAME'], 'TEXT_WBMAILER_SMTP_PASSWORD' => $TEXT['WBMAILER_SMTP_PASSWORD'], - 'SMTP_AUTH_SELECTED' => ' checked="checked"' + 'SMTP_AUTH_SELECTED' => $checked )); if(WBMAILER_ROUTINE == 'phpmail') { - $template->set_var('PHPMAIL_SELECTED', ' checked="checked"'); + $template->set_var('PHPMAIL_SELECTED', $checked); $template->set_var('SMTP_VISIBILITY', ' style="display: none;"'); $template->set_var('SMTP_VISIBILITY_AUTH', ''); // $template->set_var('SMTP_AUTH_SELECTED', ''); } elseif(WBMAILER_ROUTINE == 'smtp') { - $template->set_var('SMTPMAIL_SELECTED', ' checked="checked"'); + $template->set_var('SMTPMAIL_SELECTED', $checked); $template->set_var('SMTP_VISIBILITY', ''); $template->set_var('SMTP_VISIBILITY_AUTH', ''); } @@ -445,7 +506,7 @@ // Work-out if SMTP authentification should be checked if(WBMAILER_SMTP_AUTH) { - $template->set_var('SMTP_AUTH_SELECTED', ' checked="checked"'); + $template->set_var('SMTP_AUTH_SELECTED', $checked); if(WBMAILER_ROUTINE == 'smtp') { $template->set_var('SMTP_VISIBILITY_AUTH', ''); @@ -460,31 +521,39 @@ // Work-out if intro feature is enabled if(INTRO_PAGE) { - $template->set_var('INTRO_PAGE_ENABLED', ' checked="checked"'); + $template->set_var('INTRO_PAGE_ENABLED', $checked); } else { - $template->set_var('INTRO_PAGE_DISABLED', ' checked="checked"'); + $template->set_var('INTRO_PAGE_DISABLED', $checked); } // Work-out if frontend login feature is enabled if(FRONTEND_LOGIN) { - $template->set_var('PRIVATE_ENABLED', ' checked="checked"'); + $template->set_var('PRIVATE_ENABLED', $checked); } else { - $template->set_var('PRIVATE_DISABLED', ' checked="checked"'); + $template->set_var('PRIVATE_DISABLED', $checked); } + // Work-out if frontend login feature is enabled + if(CONFIRMED_REGISTRATION) + { + $template->set_var('CONFIRMED_REGISTRATION_ENABLED', $checked); + } else { + $template->set_var('CONFIRMED_REGISTRATION_DISABLED', $checked); + } + // Work-out if page trash feature is disabled, in-line, or separate if(PAGE_TRASH == 'disabled') { - $template->set_var('PAGE_TRASH_DISABLED', ' checked="checked"'); + $template->set_var('PAGE_TRASH_DISABLED', $checked); $template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', 'display: none;'); } elseif(PAGE_TRASH == 'inline') { - $template->set_var('PAGE_TRASH_INLINE', ' checked="checked"'); + $template->set_var('PAGE_TRASH_INLINE', $checked); $template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', 'display: none;'); } elseif(PAGE_TRASH == 'separate') { - $template->set_var('PAGE_TRASH_SEPARATE', ' checked="checked"'); + $template->set_var('PAGE_TRASH_SEPARATE', $checked); $template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', 'display: inline;'); } @@ -491,100 +560,100 @@ // Work-out if media home folde feature is enabled if(HOME_FOLDERS) { - $template->set_var('HOME_FOLDERS_ENABLED', ' checked="checked"'); + $template->set_var('HOME_FOLDERS_ENABLED', $checked); } else { - $template->set_var('HOME_FOLDERS_DISABLED', ' checked="checked"'); + $template->set_var('HOME_FOLDERS_DISABLED', $checked); } // Insert search select if(SEARCH == 'private') { - $template->set_var('PRIVATE_SEARCH', ' selected="selected"'); + $template->set_var('PRIVATE_SEARCH', $sSelected); } elseif(SEARCH == 'registered') { - $template->set_var('REGISTERED_SEARCH', ' selected="selected"'); + $template->set_var('REGISTERED_SEARCH', $sSelected); } elseif(SEARCH == 'none') { - $template->set_var('NONE_SEARCH', ' selected="selected"'); + $template->set_var('NONE_SEARCH', $sSelected); } // Work-out if 777 permissions are set if(STRING_FILE_MODE == '0777' AND STRING_DIR_MODE == '0777') { - $template->set_var('WORLD_WRITEABLE_SELECTED', ' checked="checked"'); + $template->set_var('WORLD_WRITEABLE_SELECTED', $checked); } // Work-out which file mode boxes are checked if(extract_permission(STRING_FILE_MODE, 'u', 'r')) { - $template->set_var('FILE_U_R_CHECKED', ' checked="checked"'); + $template->set_var('FILE_U_R_CHECKED', $checked); } if(extract_permission(STRING_FILE_MODE, 'u', 'w')) { - $template->set_var('FILE_U_W_CHECKED', ' checked="checked"'); + $template->set_var('FILE_U_W_CHECKED', $checked); } if(extract_permission(STRING_FILE_MODE, 'u', 'e')) { - $template->set_var('FILE_U_E_CHECKED', ' checked="checked"'); + $template->set_var('FILE_U_E_CHECKED', $checked); } if(extract_permission(STRING_FILE_MODE, 'g', 'r')) { - $template->set_var('FILE_G_R_CHECKED', ' checked="checked"'); + $template->set_var('FILE_G_R_CHECKED', $checked); } if(extract_permission(STRING_FILE_MODE, 'g', 'w')) { - $template->set_var('FILE_G_W_CHECKED', ' checked="checked"'); + $template->set_var('FILE_G_W_CHECKED', $checked); } if(extract_permission(STRING_FILE_MODE, 'g', 'e')) { - $template->set_var('FILE_G_E_CHECKED', ' checked="checked"'); + $template->set_var('FILE_G_E_CHECKED', $checked); } if(extract_permission(STRING_FILE_MODE, 'o', 'r')) { - $template->set_var('FILE_O_R_CHECKED', ' checked="checked"'); + $template->set_var('FILE_O_R_CHECKED', $checked); } if(extract_permission(STRING_FILE_MODE, 'o', 'w')) { - $template->set_var('FILE_O_W_CHECKED', ' checked="checked"'); + $template->set_var('FILE_O_W_CHECKED', $checked); } if(extract_permission(STRING_FILE_MODE, 'o', 'e')) { - $template->set_var('FILE_O_E_CHECKED', ' checked="checked"'); + $template->set_var('FILE_O_E_CHECKED', $checked); } // Work-out which dir mode boxes are checked if(extract_permission(STRING_DIR_MODE, 'u', 'r')) { - $template->set_var('DIR_U_R_CHECKED', ' checked="checked"'); + $template->set_var('DIR_U_R_CHECKED', $checked); } if(extract_permission(STRING_DIR_MODE, 'u', 'w')) { - $template->set_var('DIR_U_W_CHECKED', ' checked="checked"'); + $template->set_var('DIR_U_W_CHECKED', $checked); } if(extract_permission(STRING_DIR_MODE, 'u', 'e')) { - $template->set_var('DIR_U_E_CHECKED', ' checked="checked"'); + $template->set_var('DIR_U_E_CHECKED', $checked); } if(extract_permission(STRING_DIR_MODE, 'g', 'r')) { - $template->set_var('DIR_G_R_CHECKED', ' checked="checked"'); + $template->set_var('DIR_G_R_CHECKED', $checked); } if(extract_permission(STRING_DIR_MODE, 'g', 'w')) { - $template->set_var('DIR_G_W_CHECKED', ' checked="checked"'); + $template->set_var('DIR_G_W_CHECKED', $checked); } if(extract_permission(STRING_DIR_MODE, 'g', 'e')) { - $template->set_var('DIR_G_E_CHECKED', ' checked="checked"'); + $template->set_var('DIR_G_E_CHECKED', $checked); } if(extract_permission(STRING_DIR_MODE, 'o', 'r')) { - $template->set_var('DIR_O_R_CHECKED', ' checked="checked"'); + $template->set_var('DIR_O_R_CHECKED', $checked); } if(extract_permission(STRING_DIR_MODE, 'o', 'w')) { - $template->set_var('DIR_O_W_CHECKED', ' checked="checked"'); + $template->set_var('DIR_O_W_CHECKED', $checked); } if(extract_permission(STRING_DIR_MODE, 'o', 'e')) { - $template->set_var('DIR_O_E_CHECKED', ' checked="checked"'); + $template->set_var('DIR_O_E_CHECKED', $checked); } $template->set_var(array( @@ -609,7 +678,7 @@ $template->set_var('NAME', $group['name']); if(FRONTEND_SIGNUP == $group['group_id']) { - $template->set_var('SELECTED', ' selected="selected"'); + $template->set_var('SELECTED', $sSelected); } else { $template->set_var('SELECTED', ''); } @@ -660,7 +729,7 @@ 'TEXT_FRONTEND' => $TEXT['FRONTEND'], 'TEXT_LOGIN' => $TEXT['LOGIN'], 'TEXT_REDIRECT_AFTER' => $TEXT['REDIRECT_AFTER'], - 'TEXT_SIGNUP' => $TEXT['SIGNUP'], + 'TEXT_SIGNUP' => $TEXT['SIGNUP'].' '.$TEXT['GROUP'], 'TEXT_PHP_ERROR_LEVEL' => $TEXT['PHP_ERROR_LEVEL'], 'TEXT_MULTILINGUAL' => $TEXT['MULTILINGUAL'], 'TEXT_DEV_INFOS' => $TEXT['DEV_INFOS'], @@ -707,6 +776,7 @@ 'TEXT_EXECUTE' => $TEXT['EXECUTE'], 'TEXT_WARN_PAGE_LEAVE' => '', 'TEXT_SMART_LOGIN' => $TEXT['SMART_LOGIN'], + 'TEXT_CONFIRMED_REGISTRATION' => $TEXT['EMAIL'].' '.$TEXT['SIGNUP'], 'TEXT_MULTIPLE_MENUS' => $TEXT['MULTIPLE_MENUS'], 'TEXT_HOMEPAGE_REDIRECTION' => $TEXT['HOMEPAGE_REDIRECTION'], 'TEXT_SECTION_BLOCKS' => $TEXT['SECTION_BLOCKS'],