/ - Diff - WB 2.08.x - Tracking

« Previous | Next »

Revision 1335

Added by Dietmar over 14 years ago

Fixed update search settings
Fixed bug in /modules/admin.php

     ! = Update/Change
     ------------------------------------- 2.8.1 -------------------------------------
 -Apr-2010 Dietmar Woellbrink (Luisehahne)
     #	Fixed update search settings
     #	Fixed bug in /modules/admin.php
 -Apr-2010 Dietmar Woellbrink (Luisehahne)
     #	Fixed bug in /modules/admin.php
 -Apr-2010 Dietmar Woellbrink (Luisehahne)

branches/2.8.x/wb/admin/interface/version.php
52	52
53	53	// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
54	54	if(!defined('VERSION')) define('VERSION', '2.8.x');
55		if(!defined('REVISION')) define('REVISION', '1334');
	55	if(!defined('REVISION')) define('REVISION', '1335');
56	56
57	57	?>

     if(!isset($_POST['default_language']) || $_POST['default_language'] == '') die(header('Location: index.php'));
     // Find out if the user was view advanced options or not
     if($_POST['advanced'] == 'yes' ? $advanced = '?advanced=yes' : $advanced = '');
     $advanced = ($_POST['advanced'] == 'yes') ? '?advanced=yes' : '';
     // Print admin header
     require('../../config.php');
     require_once(WB_PATH.'/framework/class.admin.php');
     if($advanced == '')
+    {
     	$admin = new admin('Settings', 'settings_basic');
-...
     if($advanced == '')
+    {
     	// Check if should be set to 777 or left alone
     	if(isset($_POST['world_writeable']) AND $_POST['world_writeable'] == 'true')
     	if(isset($_POST['world_writeable']) && $_POST['world_writeable'] == 'true')
+        {
     		$file_mode = '0777';
     		$dir_mode = '0777';
-...
     } else {
     	// Work-out the octal value for file mode
     	$u = 0;
     	if(isset($_POST['file_u_r']) AND $_POST['file_u_r'] == 'true') {
     	if(isset($_POST['file_u_r']) && $_POST['file_u_r'] == 'true') {
     		$u = $u+4;
+    	}
     	if(isset($_POST['file_u_w']) AND $_POST['file_u_w'] == 'true') {
     	if(isset($_POST['file_u_w']) && $_POST['file_u_w'] == 'true') {
     		$u = $u+2;
+    	}
     	if(isset($_POST['file_u_e']) AND $_POST['file_u_e'] == 'true') {
     	if(isset($_POST['file_u_e']) && $_POST['file_u_e'] == 'true') {
     		$u = $u+1;
+    	}
     	$g = 0;
     	if(isset($_POST['file_g_r']) AND $_POST['file_g_r'] == 'true') {
     	if(isset($_POST['file_g_r']) && $_POST['file_g_r'] == 'true') {
     		$g = $g+4;
+    	}
     	if(isset($_POST['file_g_w']) AND $_POST['file_g_w'] == 'true') {
     	if(isset($_POST['file_g_w']) && $_POST['file_g_w'] == 'true') {
     		$g = $g+2;
+    	}
     	if(isset($_POST['file_g_e']) AND $_POST['file_g_e'] == 'true') {
     	if(isset($_POST['file_g_e']) && $_POST['file_g_e'] == 'true') {
     		$g = $g+1;
+    	}
     	$o = 0;
     	if(isset($_POST['file_o_r']) AND $_POST['file_o_r'] == 'true') {
     	if(isset($_POST['file_o_r']) && $_POST['file_o_r'] == 'true') {
     		$o = $o+4;
+    	}
     	if(isset($_POST['file_o_w']) AND $_POST['file_o_w'] == 'true') {
     	if(isset($_POST['file_o_w']) && $_POST['file_o_w'] == 'true') {
     		$o = $o+2;
+    	}
     	if(isset($_POST['file_o_e']) AND $_POST['file_o_e'] == 'true') {
     	if(isset($_POST['file_o_e']) && $_POST['file_o_e'] == 'true') {
     		$o = $o+1;
+    	}
     	$file_mode = "0".$u.$g.$o;
     	// Work-out the octal value for dir mode
     	$u = 0;
     	if(isset($_POST['dir_u_r']) AND $_POST['dir_u_r'] == 'true') {
     	if(isset($_POST['dir_u_r']) && $_POST['dir_u_r'] == 'true') {
     		$u = $u+4;
+    	}
     	if(isset($_POST['dir_u_w']) AND $_POST['dir_u_w'] == 'true') {
     	if(isset($_POST['dir_u_w']) && $_POST['dir_u_w'] == 'true') {
     		$u = $u+2;
+    	}
     	if(isset($_POST['dir_u_e']) AND $_POST['dir_u_e'] == 'true') {
     	if(isset($_POST['dir_u_e']) && $_POST['dir_u_e'] == 'true') {
     		$u = $u+1;
+    	}
     	$g = 0;
     	if(isset($_POST['dir_g_r']) AND $_POST['dir_g_r'] == 'true') {
     	if(isset($_POST['dir_g_r']) && $_POST['dir_g_r'] == 'true') {
     		$g = $g+4;
+    	}
     	if(isset($_POST['dir_g_w']) AND $_POST['dir_g_w'] == 'true') {
     	if(isset($_POST['dir_g_w']) && $_POST['dir_g_w'] == 'true') {
     		$g = $g+2;
+    	}
     	if(isset($_POST['dir_g_e']) AND $_POST['dir_g_e'] == 'true') {
     	if(isset($_POST['dir_g_e']) && $_POST['dir_g_e'] == 'true') {
     		$g = $g+1;
+    	}
     	$o = 0;
     	if(isset($_POST['dir_o_r']) AND $_POST['dir_o_r'] == 'true') {
     	if(isset($_POST['dir_o_r']) && $_POST['dir_o_r'] == 'true') {
     		$o = $o+4;
+    	}
     	if(isset($_POST['dir_o_w']) AND $_POST['dir_o_w'] == 'true') {
     	if(isset($_POST['dir_o_w']) && $_POST['dir_o_w'] == 'true') {
     		$o = $o+2;
+    	}
     	if(isset($_POST['dir_o_e']) AND $_POST['dir_o_e'] == 'true') {
     	if(isset($_POST['dir_o_e']) && $_POST['dir_o_e'] == 'true') {
     		$o = $o+1;
+    	}
     	$dir_mode = "0".$u.$g.$o;
-...
+    {
     	$setting_name = $setting['name'];
     	$value = $admin->get_post($setting_name);
     	if ($setting_name!='wb_version')
+        {
     		$allow_tags_in_fields = array('website_header', 'website_footer','wbmailer_smtp_password');
     		if(!in_array($setting_name, $allow_tags_in_fields)) {
     			$value = strip_tags($value);
         if(isset($value))
+    	{
     		if ($setting_name!='wb_version')
+    	    {
     			$allow_tags_in_fields = array('website_header', 'website_footer','wbmailer_smtp_password');
     			if(!in_array($setting_name, $allow_tags_in_fields)) {
     				$value = strip_tags($value);
+    			}
     			switch ($setting_name) {
     				case 'default_timezone':
     					$value=$value*60*60;
     					break;
     				case 'string_dir_mode':
     					$value=$dir_mode;
     					break;
     				case 'string_file_mode':
     					$value=$file_mode;
     					break;
     				case 'pages_directory':
     					if(trim($value)=='/') $value='';
     					break;
+    			}
     			$value = $admin->add_slashes($value);
     			$database->query("UPDATE ".TABLE_PREFIX."settings SET value = '$value' WHERE name = '$setting_name'");
+    		}
     		switch ($setting_name) {
     			case 'default_timezone':
     				$value=$value*60*60;
     				break;
     			case 'string_dir_mode':
     				$value=$dir_mode;
     				break;
     			case 'string_file_mode':
     				$value=$file_mode;
     				break;
     			case 'pages_directory':
     				if(trim($value)=='/') $value='';
     				break;
+    		}
     		$value = $admin->add_slashes($value);
     		$database->query("UPDATE ".TABLE_PREFIX."settings SET value = '$value' WHERE name = '$setting_name'");
+    	}
+    }
     // Query current search settings in the db, then loop through them and update the db with the new value
     $query = "SELECT name, value FROM ".TABLE_PREFIX."search WHERE extra = ''";
     $results = $database->query($query);
     while($search_setting = $results->fetchRow())
     $sql  = 'SELECT `name`, `value` FROM `'.TABLE_PREFIX.'search` ';
     $sql .= 'WHERE `extra` = ""';
     $res_search = $database->query($sql);
     if($database->is_error()) {
     	$admin->print_error($database->is_error(), ADMIN_URL.'/settings/index.php'.$advanced);
+    }
     while($search_setting = $res_search->fetchRow())
+    {
     	$old_value = $search_setting['value'];
     	$setting_name = $search_setting['name'];
     	$post_name = 'search_'.$search_setting['name'];
         // hold old value if post is empty
         // check search template
         $value = ( ($admin->get_post($post_name) == '') AND ($setting_name != 'template') ) ? $old_value : $admin->get_post($post_name);
     	$value = $admin->add_slashes($value);
     	$database->query("UPDATE ".TABLE_PREFIX."search SET value = '$value' WHERE name = '$setting_name'");
         $value = ( ($admin->get_post($post_name) == '') && ($setting_name != 'template') ) ? $old_value : $admin->get_post($post_name);
         // $value =  ( ($admin->get_post($post_name) == '') && ($setting_name == 'template') ) ? DEFAULT_TEMPLATE : $admin->get_post($post_name);
         if(isset($value))
+    	{
     		$value = $admin->add_slashes($value);
             $sql  = 'UPDATE `'.TABLE_PREFIX.'search` ';
             $sql .= 'SET `value` = "'.$value.'" ';
             $sql .= 'WHERE `name` = "'.$setting_name.'" ';
             $sql .= 'AND `extra` = ""';
     		if($database->query($sql)) {
     			$sql_info = mysql_info($database->db_handle);
+    		}
     		if($database->is_error()) {
     			$admin->print_error($database->get_error, ADMIN_URL.'/settings/index.php'.$advanced);
+    		}
+        }
+    }
     // Check if there was an error updating the db
     if($database->is_error()) {
     	$admin->print_error($database->get_error, ADMIN_URL.'/settings/index.php'.$advanced);
     	$admin->print_footer();
     	exit();
     } else {
     	$admin->print_success($MESSAGE['SETTINGS']['SAVED'], ADMIN_URL.'/settings/index.php'.$advanced);
+    }
     $admin->print_success($MESSAGE['SETTINGS']['SAVED'], ADMIN_URL.'/settings/index.php'.$advanced);
     $admin->print_footer();
     ?>

     require('../../config.php');
     require_once(WB_PATH.'/framework/class.admin.php');
     if(isset($_GET['advanced']) AND $_GET['advanced'] == 'yes') {
     if(isset($_GET['advanced']) && $_GET['advanced'] == 'yes') {
     	$admin = new admin('Settings', 'settings_advanced');
     } else {
     	$admin = new admin('Settings', 'settings_basic');
-...
     // Create new template object
     $template = new Template(THEME_PATH.'/templates');
     $template->set_file('page', 'settings.htt');
     $template->set_block('page', 'main_block', 'main');
     // $template->debug = true;
     $template->set_file('page',        'settings.htt');
     $template->set_block('page',       'main_block', 'main');
     $template->set_block('main_block', 'template_list_block',         'template_list');
     $template->set_block('main_block', 'timezone_list_block',         'timezone_list');
     $template->set_block('main_block', 'language_list_block',         'language_list');
     $template->set_block('main_block', 'date_format_list_block',      'date_format_list');
     $template->set_block('main_block', 'time_format_list_block',      'time_format_list');
     $template->set_block('main_block', 'theme_list_block',            'theme_list');
     $template->set_block('main_block', 'search_template_list_block',  'search_template_list');
     $template->set_block('main_block', 'group_list_block',            'group_list');
     $template->set_block('main_block', 'charset_list_block',          'charset_list');
     $template->set_block('main_block', 'error_reporting_list_block',  'error_reporting_list');
     $template->set_block('main_block', 'editor_list_block',           'editor_list');
     $template->set_block('main_block', 'page_level_limit_list_block', 'page_level_limit_list');
     $template->set_block('main_block', 'show_page_level_limit_block', 'show_page_level_limit');
     $template->set_block('main_block', 'show_checkbox_1_block',       'show_checkbox_1');
     $template->set_block('main_block', 'show_checkbox_2_block',       'show_checkbox_2');
     $template->set_block('main_block', 'show_checkbox_3_block',       'show_checkbox_3');
     $template->set_block('main_block', 'show_php_error_level_block',  'show_php_error_level');
     $template->set_block('main_block', 'show_charset_block',          'show_charset');
     $template->set_block('main_block', 'show_wysiwyg_block',          'show_wysiwyg');
     $template->set_block('main_block', 'show_access_block',           'show_access');
     $template->set_block('main_block', 'show_search_block',           'show_search');
     $template->set_block('main_block', 'show_redirect_timer_block',   'show_redirect_timer');
     // Query current settings in the db, then loop through them and print them
     $query = "SELECT * FROM ".TABLE_PREFIX."settings";
     $results = $database->query($query);
-...
     	$template->set_var(strtoupper($setting_name),$setting_value);
+    }
     // Query current settings in the db, then loop through them and print them
     $query = "SELECT * FROM ".TABLE_PREFIX."search WHERE extra = ''";
     $results = $database->query($query);
     while($setting = $results->fetchRow()) {
     	$setting_name = $setting['name'];
     	$setting_value = htmlspecialchars(($setting['value']));
     	switch($setting_name) {
     		// Search header
     		case 'header':
     			$template->set_var('SEARCH_HEADER', $setting_value);
     		break;
     		// Search results header
     		case 'results_header':
     			$template->set_var('SEARCH_RESULTS_HEADER', $setting_value);
     		break;
     		// Search results loop
     		case 'results_loop':
     			$template->set_var('SEARCH_RESULTS_LOOP', $setting_value);
     		break;
     		// Search results footer
     		case 'results_footer':
     			$template->set_var('SEARCH_RESULTS_FOOTER', $setting_value);
     		break;
     		// Search no results
     		case 'no_results':
     			$template->set_var('SEARCH_NO_RESULTS', $setting_value);
     		break;
     		// Search footer
     		case 'footer':
     			$template->set_var('SEARCH_FOOTER', $setting_value);
     		break;
     		// Search module-order
     		case 'module_order':
     			$template->set_var('SEARCH_MODULE_ORDER', $setting_value);
     		break;
     		// Search max lines of excerpt
     		case 'max_excerpt':
     			$template->set_var('SEARCH_MAX_EXCERPT', $setting_value);
     		break;
     		// time-limit
     		case 'time_limit':
     			$template->set_var('SEARCH_TIME_LIMIT', $setting_value);
     		break;
     		// Search template
     		case 'template':
     			$search_template = $setting_value;
     		break;
+    	}
+    }
     // Do the same for settings stored in config file as with ones in db
     $database_type = '';
     $is_advanced = (isset($_GET['advanced']) && $_GET['advanced'] == 'yes');
     // Tell the browser whether or not to show advanced options
     if(isset($_GET['advanced']) AND $_GET['advanced'] == 'yes') {
     if($is_advanced)
+    {
     	$template->set_var('DISPLAY_ADVANCED', '');
     	$template->set_var('ADVANCED_FILE_PERMS_ID', 'file_perms_box');
     	$template->set_var('BASIC_FILE_PERMS_ID', 'hide');
     	$template->set_var('ADVANCED', 'yes');
     	$template->set_var('ADVANCED_BUTTON', '&lt;&lt; '.$TEXT['HIDE_ADVANCED']);
     	$template->set_var('ADVANCED_LINK', 'index.php?advanced=no');
     	$template->set_var('BASIC_FILE_PERMS_ID', 'hide');
     	$template->set_var('ADVANCED_FILE_PERMS_ID', 'file_perms_box');
     } else {
     	$template->set_var('DISPLAY_ADVANCED', ' style="display: none;"');
     	$template->set_var('BASIC_FILE_PERMS_ID', 'file_perms_box');
     	$template->set_var('ADVANCED_FILE_PERMS_ID', 'hide');
     	$template->set_var('ADVANCED', 'no');
     	$template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].' &gt;&gt;');
     	$template->set_var('ADVANCED_LINK', 'index.php?advanced=yes');
     	$template->set_var('BASIC_FILE_PERMS_ID', 'file_perms_box');
     	$template->set_var('ADVANCED_FILE_PERMS_ID', 'hide');
+    }
     $template->set_var(array(
     	$query = "SELECT * FROM ".TABLE_PREFIX."search WHERE extra = ''";
     	$results = $database->query($query);
     	// Query current settings in the db, then loop through them and print them
     	while($setting = $results->fetchRow())
+    	{
     		$setting_name = $setting['name'];
     		$setting_value = htmlspecialchars(($setting['value']));
     		switch($setting_name) {
     			// Search header
     			case 'header':
     				$template->set_var('SEARCH_HEADER', $setting_value);
     			break;
     			// Search results header
     			case 'results_header':
     				$template->set_var('SEARCH_RESULTS_HEADER', $setting_value);
     			break;
     			// Search results loop
     			case 'results_loop':
     				$template->set_var('SEARCH_RESULTS_LOOP', $setting_value);
     			break;
     			// Search results footer
     			case 'results_footer':
     				$template->set_var('SEARCH_RESULTS_FOOTER', $setting_value);
     			break;
     			// Search no results
     			case 'no_results':
     				$template->set_var('SEARCH_NO_RESULTS', $setting_value);
     			break;
     			// Search footer
     			case 'footer':
     				$template->set_var('SEARCH_FOOTER', $setting_value);
     			break;
     			// Search module-order
     			case 'module_order':
     				$template->set_var('SEARCH_MODULE_ORDER', $setting_value);
     			break;
     			// Search max lines of excerpt
     			case 'max_excerpt':
     				$template->set_var('SEARCH_MAX_EXCERPT', $setting_value);
     			break;
     			// time-limit
     			case 'time_limit':
     				$template->set_var('SEARCH_TIME_LIMIT', $setting_value);
     			break;
     			// Search template
     			case 'template':
     				$search_template = $setting_value;
     			break;
+    		}
+    	}
     	$template->set_var(array(
     									'PAGES_DIRECTORY' => PAGES_DIRECTORY,
     									'MEDIA_DIRECTORY' => MEDIA_DIRECTORY,
     									'PAGE_EXTENSION' => PAGE_EXTENSION,
-...
     									'THEME_URL' => THEME_URL,
     									'ADMIN_PATH' => ADMIN_PATH,
     									'ADMIN_URL' => ADMIN_URL,
     									'DATABASE_TYPE' => DB_TYPE,
     									'DATABASE_HOST' => DB_HOST,
     									'DATABASE_USERNAME' => DB_USERNAME,
     									'DATABASE_NAME' => DB_NAME,
     								    'DATABASE_TYPE' => '',
     									'DATABASE_HOST' => '',
     									'DATABASE_USERNAME' => '',
     									'DATABASE_NAME' => '',
     									'TABLE_PREFIX' => TABLE_PREFIX
+    								 )
     						 );
     								 ));
     // Insert language values
     $template->set_block('main_block', 'language_list_block', 'language_list');
     $result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'language' ORDER BY name");
     if($result->numRows() > 0) {
     	while($addon = $result->fetchRow()) {
     		$l_codes[$addon['name']] = $addon['directory'];
     		$l_names[$addon['name']] = entities_to_7bit($addon['name']); // sorting-problem workaround
     	// Insert language values
     	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'language' ORDER BY name");
     	if($result->numRows() > 0)
+    	{
     		while($addon = $result->fetchRow()) {
     			$l_codes[$addon['name']] = $addon['directory'];
     			$l_names[$addon['name']] = entities_to_7bit($addon['name']); // sorting-problem workaround
+    		}
     		asort($l_names);
     		foreach($l_names as $l_name=>$v) {
     			// Insert code and name
     			$template->set_var(array(
     									'CODE' => $l_codes[$l_name],
     									'NAME' => $l_name,
     									'FLAG' => THEME_URL.'/images/flags/'.strtolower($l_codes[$l_name]),
     									));
     			// Check if it is selected
     			if(DEFAULT_LANGUAGE == $l_codes[$l_name]) {
     				$template->set_var('SELECTED', ' selected="selected"');
     			} else {
     				$template->set_var('SELECTED', '');
+    			}
     			$template->parse('language_list', 'language_list_block', true);
+    		}
+    	}
     	asort($l_names);
     	foreach($l_names as $l_name=>$v) {
     		// Insert code and name
     		$template->set_var(array(
     								'CODE' => $l_codes[$l_name],
     								'NAME' => $l_name,
     								'FLAG' => THEME_URL.'/images/flags/'.strtolower($l_codes[$l_name]),
     								));
     		// Check if it is selected
     		if(DEFAULT_LANGUAGE == $l_codes[$l_name]) {
     	// Insert default timezone values
     	require(ADMIN_PATH.'/interface/timezones.php');
     	foreach($TIMEZONES AS $hour_offset => $title)
+    	{
     		// Make sure we dont list "System Default" as we are setting this value!
     		if($hour_offset != '-20') {
     			$template->set_var('VALUE', $hour_offset);
     			$template->set_var('NAME', $title);
     			if(DEFAULT_TIMEZONE == $hour_offset*60*60) {
     				$template->set_var('SELECTED', ' selected="selected"');
     			} else {
     				$template->set_var('SELECTED', '');
+    			}
     			$template->parse('timezone_list', 'timezone_list_block', true);
+    		}
+    	}
     	// Insert default charset values
     	require(ADMIN_PATH.'/interface/charsets.php');
     	foreach($CHARSETS AS $code => $title) {
     		$template->set_var('VALUE', $code);
     		$template->set_var('NAME', $title);
     		if(DEFAULT_CHARSET == $code) {
     			$template->set_var('SELECTED', ' selected="selected"');
     		} else {
     			$template->set_var('SELECTED', '');
+    		}
     		$template->parse('language_list', 'language_list_block', true);
     		$template->parse('charset_list', 'charset_list_block', true);
+    	}
+    }
     // Insert default timezone values
     require(ADMIN_PATH.'/interface/timezones.php');
     $template->set_block('main_block', 'timezone_list_block', 'timezone_list');
     foreach($TIMEZONES AS $hour_offset => $title) {
     	// Make sure we dont list "System Default" as we are setting this value!
     	if($hour_offset != '-20') {
     		$template->set_var('VALUE', $hour_offset);
     	// Insert date format list
     	require(ADMIN_PATH.'/interface/date_formats.php');
     	foreach($DATE_FORMATS AS $format => $title) {
     		$format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key)
     		if($format != 'system_default') {
     			$template->set_var('VALUE', $format);
     		} else {
     			$template->set_var('VALUE', '');
+    		}
     		$template->set_var('NAME', $title);
     		if(DEFAULT_TIMEZONE == $hour_offset*60*60) {
     		if(DEFAULT_DATE_FORMAT == $format) {
     			$template->set_var('SELECTED', ' selected="selected"');
     		} else {
     			$template->set_var('SELECTED', '');
+    		}
     		$template->parse('timezone_list', 'timezone_list_block', true);
     		$template->parse('date_format_list', 'date_format_list_block', true);
+    	}
+    }
     // Insert default charset values
     require(ADMIN_PATH.'/interface/charsets.php');
     $template->set_block('main_block', 'charset_list_block', 'charset_list');
     foreach($CHARSETS AS $code => $title) {
     	$template->set_var('VALUE', $code);
     	$template->set_var('NAME', $title);
     	if(DEFAULT_CHARSET == $code) {
     		$template->set_var('SELECTED', ' selected="selected"');
     	} else {
     		$template->set_var('SELECTED', '');
     	// Insert time format list
     	require(ADMIN_PATH.'/interface/time_formats.php');
     	foreach($TIME_FORMATS AS $format => $title) {
     		$format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key)
     		if($format != 'system_default') {
     			$template->set_var('VALUE', $format);
     		} else {
     			$template->set_var('VALUE', '');
+    		}
     		$template->set_var('NAME', $title);
     		if(DEFAULT_TIME_FORMAT == $format) {
     			$template->set_var('SELECTED', ' selected="selected"');
     		} else {
     			$template->set_var('SELECTED', '');
+    		}
     		$template->parse('time_format_list', 'time_format_list_block', true);
+    	}
     	$template->parse('charset_list', 'charset_list_block', true);
+    }
     // Insert date format list
     require(ADMIN_PATH.'/interface/date_formats.php');
     $template->set_block('main_block', 'date_format_list_block', 'date_format_list');
     foreach($DATE_FORMATS AS $format => $title) {
     	$format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key)
     	if($format != 'system_default') {
     		$template->set_var('VALUE', $format);
     	} else {
     		$template->set_var('VALUE', '');
     	// 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);
+    		}
+    	}
     	$template->set_var('NAME', $title);
     	if(DEFAULT_DATE_FORMAT == $format) {
     		$template->set_var('SELECTED', ' selected="selected"');
     	} else {
     		$template->set_var('SELECTED', '');
+    	}
     	$template->parse('date_format_list', 'date_format_list_block', true);
+    }
     // Insert time format list
     require(ADMIN_PATH.'/interface/time_formats.php');
     $template->set_block('main_block', 'time_format_list_block', 'time_format_list');
     foreach($TIME_FORMATS AS $format => $title) {
     	$format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key)
     	if($format != 'system_default') {
     		$template->set_var('VALUE', $format);
     	} else {
     		$template->set_var('VALUE', '');
     	// 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);
+    		}
+    	}
     	$template->set_var('NAME', $title);
     	if(DEFAULT_TIME_FORMAT == $format) {
     		$template->set_var('SELECTED', ' selected="selected"');
     	} else {
     		$template->set_var('SELECTED', '');
+    	}
     	$template->parse('time_format_list', 'time_format_list_block', true);
+    }
     // Insert templates
     $template->set_block('main_block', 'template_list_block', 'template_list');
     $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 WYSIWYG modules
     	$file='none';
     	$module_name=$TEXT['NONE'];
     	$template->set_var('FILE', $file);
     	$template->set_var('NAME', $module_name);
     	$selected = (!defined('WYSIWYG_EDITOR') || $file == WYSIWYG_EDITOR) ? ' selected="selected"' : '';
     	$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)
+    	{
     		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);
+    		}
+    	}
+    }
     // Insert backend theme
     $template->set_block('main_block', 'theme_list_block', 'theme_list');
     $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 WYSIWYG modules
     $template->set_block('main_block', 'editor_list_block', 'editor_list');
     $file='none';
     $module_name=$TEXT['NONE'];
     $template->set_var('FILE', $file);
     $template->set_var('NAME', $module_name);
     if((!defined('WYSIWYG_EDITOR') || $file == WYSIWYG_EDITOR) ? $selected = ' selected="selected"' : $selected = '');
     $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)
+    {
     	while($addon = $result->fetchRow())
+        {
     		$template->set_var('FILE', $addon['directory']);
     		$template->set_var('NAME', $addon['name']);
     		if((defined('WYSIWYG_EDITOR') AND $addon['directory'] == WYSIWYG_EDITOR) ? $selected = ' selected="selected"' : $selected = '');
     		$template->set_var('SELECTED', $selected);
     		$template->parse('editor_list', 'editor_list_block', true);
+    	}
+    }
     // Insert templates for search settings
     $template->set_block('main_block', 'search_template_list_block', 'search_template_list');
     	$search_template = ( ($search_template == DEFAULT_TEMPLATE) || ($search_template == '') ) ? DEFAULT_TEMPLATE : $search_template;
     	$selected = ( ($search_template != DEFAULT_TEMPLATE) ) ?  ' selected="selected"' : $selected = '';
     $search_template = ( ($search_template == DEFAULT_TEMPLATE) OR ($search_template == '') ) ? '' : $search_template;
     	$template->set_var(array(
     	        'FILE' => '',
     	        'NAME' => $TEXT['SYSTEM_DEFAULT'],
     	        'SELECTED' => $selected
     	    ));
     $selected = ( ($search_template != DEFAULT_TEMPLATE) ) ?  ' selected="selected"' : $selected = '';
     	$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);
     $template->set_var(array(
             'FILE' => '',
             'NAME' => $TEXT['SYSTEM_DEFAULT'],
             'SELECTED' => $selected
         ));
+    		}
+    	}
     $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");
     	// Insert default error reporting values
     	require(ADMIN_PATH.'/interface/er_levels.php');
     	foreach($ER_LEVELS AS $value => $title)
+    	{
     		$template->set_var('VALUE', $value);
     		$template->set_var('NAME', $title);
     	    $selected = (ER_LEVEL == $value) ? ' selected="selected"' : '';
     	    $template->set_var('SELECTED', $selected);
     		$template->parse('error_reporting_list', 'error_reporting_list_block', true);
+    	}
     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);
     	// Insert permissions values
     	if($admin->get_permission('settings_advanced') != true)
+    	{
     		$template->set_var('DISPLAY_ADVANCED_BUTTON', 'hide');
+    	}
     		$template->parse('search_template_list', 'search_template_list_block', true);
     	// Insert page level limits
     	for($i = 1; $i <= 10; $i++)
+    	{
     		$template->set_var('NUMBER', $i);
     		if(PAGE_LEVEL_LIMIT == $i)
+    	    {
     			$template->set_var('SELECTED', ' selected="selected"');
     		} else {
     			$template->set_var('SELECTED', '');
+    		}
     		$template->parse('page_level_limit_list', 'page_level_limit_list_block', true);
+    	}
+    }
     // Insert default error reporting values
     require(ADMIN_PATH.'/interface/er_levels.php');
     $template->set_block('main_block', 'error_reporting_list_block', 'error_reporting_list');
     foreach($ER_LEVELS AS $value => $title)
+    {
     	$template->set_var('VALUE', $value);
     	$template->set_var('NAME', $title);
         $selected = (ER_LEVEL == $value) ? ' selected="selected"' : '';
         $template->set_var('SELECTED', $selected);
     	// Work-out if multiple menus feature is enabled
     	if(defined('MULTIPLE_MENUS') && MULTIPLE_MENUS == true)
+    	{
     		$template->set_var('MULTIPLE_MENUS_ENABLED', ' checked="checked"');
     	} else {
     		$template->set_var('MULTIPLE_MENUS_DISABLED', ' checked="checked"');
+    	}
     	$template->parse('error_reporting_list', 'error_reporting_list_block', true);
+    }
     	// Work-out if page languages feature is enabled
     	if(defined('PAGE_LANGUAGES') && PAGE_LANGUAGES == true)
+    	{
     	        $template->set_var('PAGE_LANGUAGES_ENABLED', ' checked="checked"');
     	} else {
     	        $template->set_var('PAGE_LANGUAGES_DISABLED', ' checked="checked"');
+    	}
     // Insert permissions values
     if($admin->get_permission('settings_advanced') != true)
+    {
     	$template->set_var('DISPLAY_ADVANCED_BUTTON', 'hide');
+    }
     	// Work-out if smart login feature is enabled
     	if(defined('SMART_LOGIN') && SMART_LOGIN == true)
+    	{
     		$template->set_var('SMART_LOGIN_ENABLED', ' checked="checked"');
     	} else {
     		$template->set_var('SMART_LOGIN_DISABLED', ' checked="checked"');
+    	}
     // Insert page level limits
     $template->set_block('main_block', 'page_level_limit_list_block', 'page_level_limit_list');
     for($i = 1; $i <= 10; $i++)
+    {
     	$template->set_var('NUMBER', $i);
     	if(PAGE_LEVEL_LIMIT == $i)
+        {
     		$template->set_var('SELECTED', ' selected="selected"');
     	/* Make's sure GD library is installed */
     	if(extension_loaded('gd') && function_exists('imageCreateFromJpeg'))
+    	{
     		$template->set_var('GD_EXTENSION_ENABLED', '');
     	} else {
     		$template->set_var('SELECTED', '');
     		$template->set_var('GD_EXTENSION_ENABLED', ' style="display: none;"');
+    	}
     	$template->parse('page_level_limit_list', 'page_level_limit_list_block', true);
+    }
     // Work-out if multiple menus feature is enabled
     if(defined('MULTIPLE_MENUS') AND MULTIPLE_MENUS == true)
+    {
     	$template->set_var('MULTIPLE_MENUS_ENABLED', ' checked="checked"');
     } else {
     	$template->set_var('MULTIPLE_MENUS_DISABLED', ' checked="checked"');
+    }
     	// Work-out if section blocks feature is enabled
     	if(defined('SECTION_BLOCKS') && SECTION_BLOCKS == true)
+    	{
     		$template->set_var('SECTION_BLOCKS_ENABLED', ' checked="checked"');
     	} else {
     		$template->set_var('SECTION_BLOCKS_DISABLED', ' checked="checked"');
+    	}
     // Work-out if page languages feature is enabled
     if(defined('PAGE_LANGUAGES') AND PAGE_LANGUAGES == true)
+    {
             $template->set_var('PAGE_LANGUAGES_ENABLED', ' checked="checked"');
     } else {
             $template->set_var('PAGE_LANGUAGES_DISABLED', ' checked="checked"');
+    }
     	// Work-out if homepage redirection feature is enabled
     	if(defined('HOMEPAGE_REDIRECTION') && HOMEPAGE_REDIRECTION == true)
+    	{
     		$template->set_var('HOMEPAGE_REDIRECTION_ENABLED', ' checked="checked"');
     	} else {
     		$template->set_var('HOMEPAGE_REDIRECTION_DISABLED', ' checked="checked"');
+    	}
     // Work-out if smart login feature is enabled
     if(defined('SMART_LOGIN') AND SMART_LOGIN == true)
+    {
     	$template->set_var('SMART_LOGIN_ENABLED', ' checked="checked"');
     } else {
     	$template->set_var('SMART_LOGIN_DISABLED', ' checked="checked"');
+    }
     	// Work-out which server os should be checked
     	if(OPERATING_SYSTEM == 'linux')
+    	{
     		$template->set_var('LINUX_SELECTED', ' checked="checked"');
     	} elseif(OPERATING_SYSTEM == 'windows') {
     		$template->set_var('WINDOWS_SELECTED', ' checked="checked"');
+    	}
     /* Make's sure GD library is installed */
     if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg'))
+    {
     	$template->set_var('GD_EXTENSION_ENABLED', '');
     } else {
     	$template->set_var('GD_EXTENSION_ENABLED', ' style="display: none;"');
+    }
     	// Work-out if manage sections feature is enabled
     	if(MANAGE_SECTIONS)
+    	{
     		$template->set_var('MANAGE_SECTIONS_ENABLED', ' checked="checked"');
     	} else {
     		$template->set_var('MANAGE_SECTIONS_DISABLED', ' checked="checked"');
+    	}
     // Work-out if section blocks feature is enabled
     if(defined('SECTION_BLOCKS') AND SECTION_BLOCKS == true)
+    {
     	$template->set_var('SECTION_BLOCKS_ENABLED', ' checked="checked"');
     } else {
     	$template->set_var('SECTION_BLOCKS_DISABLED', ' checked="checked"');
+    }
     	// Work-out which wbmailer routine should be checked
     	if(WBMAILER_ROUTINE == 'phpmail')
+    	{
     		$template->set_var('PHPMAIL_SELECTED', ' checked="checked"');
     		$template->set_var('SMTP_VISIBILITY', ' style="display: none;"');
     		$template->set_var('SMTP_VISIBILITY_AUTH', ' style="display: none;"');
     	} elseif(WBMAILER_ROUTINE == 'smtp')
+    	{
     		$template->set_var('SMTPMAIL_SELECTED', ' checked="checked"');
     		$template->set_var('SMTP_VISIBILITY', '');
+    	}
     // Work-out if homepage redirection feature is enabled
     if(defined('HOMEPAGE_REDIRECTION') AND HOMEPAGE_REDIRECTION == true)
+    {
     	$template->set_var('HOMEPAGE_REDIRECTION_ENABLED', ' checked="checked"');
     } else {
     	$template->set_var('HOMEPAGE_REDIRECTION_DISABLED', ' checked="checked"');
+    }
     	// Work-out if SMTP authentification should be checked
     	if(WBMAILER_SMTP_AUTH)
+    	{
     		$template->set_var('SMTP_AUTH_SELECTED', ' checked="checked"');
     		if(WBMAILER_ROUTINE == 'smtp')
+    	    {
     			$template->set_var('SMTP_VISIBILITY_AUTH', '');
     // Work-out which server os should be checked
     if(OPERATING_SYSTEM == 'linux')
+    {
     	$template->set_var('LINUX_SELECTED', ' checked="checked"');
     } elseif(OPERATING_SYSTEM == 'windows') {
     	$template->set_var('WINDOWS_SELECTED', ' checked="checked"');
+    }
     // Work-out if manage sections feature is enabled
     if(MANAGE_SECTIONS)
+    {
     	$template->set_var('MANAGE_SECTIONS_ENABLED', ' checked="checked"');
     } else {
     	$template->set_var('MANAGE_SECTIONS_DISABLED', ' checked="checked"');
+    }
     // Work-out which wbmailer routine should be checked
     if(WBMAILER_ROUTINE == 'phpmail')
+    {
     	$template->set_var('PHPMAIL_SELECTED', ' checked="checked"');
     	$template->set_var('SMTP_VISIBILITY', ' style="display: none;"');
     	$template->set_var('SMTP_VISIBILITY_AUTH', ' style="display: none;"');
     } elseif(WBMAILER_ROUTINE == 'smtp')
+    {
     	$template->set_var('SMTPMAIL_SELECTED', ' checked="checked"');
     	$template->set_var('SMTP_VISIBILITY', '');
+    }
     // Work-out if SMTP authentification should be checked
     if(WBMAILER_SMTP_AUTH)
+    {
     	$template->set_var('SMTP_AUTH_SELECTED', ' checked="checked"');
     	if(WBMAILER_ROUTINE == 'smtp')
+        {
     		$template->set_var('SMTP_VISIBILITY_AUTH', '');
     		} else {
     			$template->set_var('SMTP_VISIBILITY_AUTH', ' style="display: none;"');
+    		}
     	} else {
     		$template->set_var('SMTP_VISIBILITY_AUTH', ' style="display: none;"');
+    	}
     } else {
     	$template->set_var('SMTP_VISIBILITY_AUTH', ' style="display: none;"');
+    }
     // Work-out if intro feature is enabled
     if(INTRO_PAGE)
+    {
     	$template->set_var('INTRO_PAGE_ENABLED', ' checked="checked"');
     } else {
     	$template->set_var('INTRO_PAGE_DISABLED', ' checked="checked"');
+    }
     	// Work-out if intro feature is enabled
     	if(INTRO_PAGE)
+    	{
     		$template->set_var('INTRO_PAGE_ENABLED', ' checked="checked"');
     	} else {
     		$template->set_var('INTRO_PAGE_DISABLED', ' checked="checked"');
+    	}
     // Work-out if frontend login feature is enabled
     if(FRONTEND_LOGIN)
+    {
     	$template->set_var('PRIVATE_ENABLED', ' checked="checked"');
     } else {
     	$template->set_var('PRIVATE_DISABLED', ' checked="checked"');
+    }
     	// Work-out if frontend login feature is enabled
     	if(FRONTEND_LOGIN)
+    	{
     		$template->set_var('PRIVATE_ENABLED', ' checked="checked"');
     	} else {
     		$template->set_var('PRIVATE_DISABLED', ' checked="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('DISPLAY_PAGE_TRASH_SEPARATE', 'display: none;');
     } elseif(PAGE_TRASH == 'inline')
+    {
     	$template->set_var('PAGE_TRASH_INLINE', ' checked="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('DISPLAY_PAGE_TRASH_SEPARATE', 'display: inline;');
+    }
     	// 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('DISPLAY_PAGE_TRASH_SEPARATE', 'display: none;');
     	} elseif(PAGE_TRASH == 'inline')
+    	{
     		$template->set_var('PAGE_TRASH_INLINE', ' checked="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('DISPLAY_PAGE_TRASH_SEPARATE', 'display: inline;');
+    	}
     // Work-out if media home folde feature is enabled
     if(HOME_FOLDERS)
+    {
     	$template->set_var('HOME_FOLDERS_ENABLED', ' checked="checked"');
     } else {
     	$template->set_var('HOME_FOLDERS_DISABLED', ' checked="checked"');
+    }
     	// Work-out if media home folde feature is enabled
     	if(HOME_FOLDERS)
+    	{
     		$template->set_var('HOME_FOLDERS_ENABLED', ' checked="checked"');
     	} else {
     		$template->set_var('HOME_FOLDERS_DISABLED', ' checked="checked"');
+    	}
     // Insert search select
     if(SEARCH == 'private')
+    {
     	$template->set_var('PRIVATE_SEARCH', ' selected="selected"');
     } elseif(SEARCH == 'registered') {
     	$template->set_var('REGISTERED_SEARCH', ' selected="selected"');
     } elseif(SEARCH == 'none') {
     	$template->set_var('NONE_SEARCH', ' selected="selected"');
+    }
     	// Insert search select
     	if(SEARCH == 'private')
+    	{
     		$template->set_var('PRIVATE_SEARCH', ' selected="selected"');
     	} elseif(SEARCH == 'registered') {
     		$template->set_var('REGISTERED_SEARCH', ' selected="selected"');
     	} elseif(SEARCH == 'none') {
     		$template->set_var('NONE_SEARCH', ' selected="selected"');
+    	}
     // 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"');
+    }
     	// 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"');
+    	}
     // 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"');
+    }
     if(extract_permission(STRING_FILE_MODE, 'u', 'w'))
+    {
     	$template->set_var('FILE_U_W_CHECKED', ' checked="checked"');
+    }
     if(extract_permission(STRING_FILE_MODE, 'u', 'e'))
+    {
     	$template->set_var('FILE_U_E_CHECKED', ' checked="checked"');
+    }
     if(extract_permission(STRING_FILE_MODE, 'g', 'r'))
+    {
     	$template->set_var('FILE_G_R_CHECKED', ' checked="checked"');
+    }
     if(extract_permission(STRING_FILE_MODE, 'g', 'w'))
+    {
     	$template->set_var('FILE_G_W_CHECKED', ' checked="checked"');
+    }
     if(extract_permission(STRING_FILE_MODE, 'g', 'e'))
+    {
     	$template->set_var('FILE_G_E_CHECKED', ' checked="checked"');
+    }
     if(extract_permission(STRING_FILE_MODE, 'o', 'r'))
+    {
     	$template->set_var('FILE_O_R_CHECKED', ' checked="checked"');
+    }
     if(extract_permission(STRING_FILE_MODE, 'o', 'w'))
+    {
     	$template->set_var('FILE_O_W_CHECKED', ' checked="checked"');
+    }
     if(extract_permission(STRING_FILE_MODE, 'o', 'e'))
+    {
     	$template->set_var('FILE_O_E_CHECKED', ' 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"');
+    }
     if(extract_permission(STRING_DIR_MODE, 'u', 'w'))
+    {
     	$template->set_var('DIR_U_W_CHECKED', ' checked="checked"');
+    }
     if(extract_permission(STRING_DIR_MODE, 'u', 'e'))
+    {
     	$template->set_var('DIR_U_E_CHECKED', ' checked="checked"');
+    }
     if(extract_permission(STRING_DIR_MODE, 'g', 'r'))
+    {
     	$template->set_var('DIR_G_R_CHECKED', ' checked="checked"');
+    }
     if(extract_permission(STRING_DIR_MODE, 'g', 'w'))
+    {
     	$template->set_var('DIR_G_W_CHECKED', ' checked="checked"');
+    }
     if(extract_permission(STRING_DIR_MODE, 'g', 'e'))
+    {
     	$template->set_var('DIR_G_E_CHECKED', ' checked="checked"');
+    }
     if(extract_permission(STRING_DIR_MODE, 'o', 'r'))
+    {
     	$template->set_var('DIR_O_R_CHECKED', ' checked="checked"');
+    }
     if(extract_permission(STRING_DIR_MODE, 'o', 'w'))
+    {
     	$template->set_var('DIR_O_W_CHECKED', ' checked="checked"');
+    }
     if(extract_permission(STRING_DIR_MODE, 'o', 'e'))
+    {
     	$template->set_var('DIR_O_E_CHECKED', ' checked="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"');
+    	}
     	if(extract_permission(STRING_FILE_MODE, 'u', 'w'))
+    	{
     		$template->set_var('FILE_U_W_CHECKED', ' checked="checked"');
+    	}
     	if(extract_permission(STRING_FILE_MODE, 'u', 'e'))
+    	{
     		$template->set_var('FILE_U_E_CHECKED', ' checked="checked"');
+    	}
     	if(extract_permission(STRING_FILE_MODE, 'g', 'r'))
+    	{
     		$template->set_var('FILE_G_R_CHECKED', ' checked="checked"');
+    	}
     	if(extract_permission(STRING_FILE_MODE, 'g', 'w'))
+    	{
     		$template->set_var('FILE_G_W_CHECKED', ' checked="checked"');
+    	}
     	if(extract_permission(STRING_FILE_MODE, 'g', 'e'))
+    	{
     		$template->set_var('FILE_G_E_CHECKED', ' checked="checked"');
+    	}
     	if(extract_permission(STRING_FILE_MODE, 'o', 'r'))
+    	{
     		$template->set_var('FILE_O_R_CHECKED', ' checked="checked"');
+    	}
     	if(extract_permission(STRING_FILE_MODE, 'o', 'w'))
+    	{
     		$template->set_var('FILE_O_W_CHECKED', ' checked="checked"');
+    	}
     	if(extract_permission(STRING_FILE_MODE, 'o', 'e'))
+    	{
     		$template->set_var('FILE_O_E_CHECKED', ' 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"');
+    	}
     	if(extract_permission(STRING_DIR_MODE, 'u', 'w'))
+    	{
     		$template->set_var('DIR_U_W_CHECKED', ' checked="checked"');
+    	}
     	if(extract_permission(STRING_DIR_MODE, 'u', 'e'))
+    	{
     		$template->set_var('DIR_U_E_CHECKED', ' checked="checked"');
+    	}
     	if(extract_permission(STRING_DIR_MODE, 'g', 'r'))
+    	{
     		$template->set_var('DIR_G_R_CHECKED', ' checked="checked"');
+    	}
     	if(extract_permission(STRING_DIR_MODE, 'g', 'w'))
+    	{
     		$template->set_var('DIR_G_W_CHECKED', ' checked="checked"');
+    	}
     	if(extract_permission(STRING_DIR_MODE, 'g', 'e'))
+    	{
     		$template->set_var('DIR_G_E_CHECKED', ' checked="checked"');
+    	}
     	if(extract_permission(STRING_DIR_MODE, 'o', 'r'))
+    	{
     		$template->set_var('DIR_O_R_CHECKED', ' checked="checked"');
+    	}
     	if(extract_permission(STRING_DIR_MODE, 'o', 'w'))
+    	{
     		$template->set_var('DIR_O_W_CHECKED', ' checked="checked"');
+    	}
     	if(extract_permission(STRING_DIR_MODE, 'o', 'e'))
+    	{
     		$template->set_var('DIR_O_E_CHECKED', ' checked="checked"');
+    	}
     // Insert Server Email value into template
     $template->set_var('SERVER_EMAIL', SERVER_EMAIL);
     	// Insert Server Email value into template
     	$template->set_var('SERVER_EMAIL', SERVER_EMAIL);
     // Insert groups into signup list
     $template->set_block('main_block', 'group_list_block', 'group_list');
     $results = $database->query("SELECT group_id, name FROM ".TABLE_PREFIX."groups WHERE group_id != '1'");
     if($results->numRows() > 0)
+    {
     	while($group = $results->fetchRow())
+        {
     		$template->set_var('ID', $group['group_id']);
     		$template->set_var('NAME', $group['name']);
     		if(FRONTEND_SIGNUP == $group['group_id'])
+            {
     			$template->set_var('SELECTED', ' selected="selected"');
     		} else {
     			$template->set_var('SELECTED', '');
     	// Insert groups into signup list
     	$results = $database->query("SELECT group_id, name FROM ".TABLE_PREFIX."groups WHERE group_id != '1'");
     	if($results->numRows() > 0)
+    	{
     		while($group = $results->fetchRow())
+    	    {
     			$template->set_var('ID', $group['group_id']);
     			$template->set_var('NAME', $group['name']);
     			if(FRONTEND_SIGNUP == $group['group_id'])
+    	        {
     				$template->set_var('SELECTED', ' selected="selected"');
     			} else {
     				$template->set_var('SELECTED', '');
+    			}
     			$template->parse('group_list', 'group_list_block', true);
+    		}
     	} else {
     		$template->set_var('ID', 'disabled');
     		$template->set_var('NAME', $MESSAGE['GROUPS']['NO_GROUPS_FOUND']);
     		$template->parse('group_list', 'group_list_block', true);
+    	}
     } else {
     	$template->set_var('ID', 'disabled');
     	$template->set_var('NAME', $MESSAGE['GROUPS']['NO_GROUPS_FOUND']);
     	$template->parse('group_list', 'group_list_block', true);
+    }
     // Insert language headings
     $template->set_var(array(
     	// Insert language headings
     	$template->set_var(array(
     								'HEADING_GENERAL_SETTINGS' => $HEADING['GENERAL_SETTINGS'],
     								'HEADING_DEFAULT_SETTINGS' => $HEADING['DEFAULT_SETTINGS'],
     								'HEADING_SEARCH_SETTINGS' => $HEADING['SEARCH_SETTINGS'],
-...
     								'HEADING_ADMINISTRATION_TOOLS' => $HEADING['ADMINISTRATION_TOOLS']
+    								)
     						);
     // Insert language text and messages
     $template->set_var(array(
     	// Insert language text and messages
     	$template->set_var(array(
     								'TEXT_WEBSITE_TITLE' => $TEXT['WEBSITE_TITLE'],
     								'TEXT_WEBSITE_DESCRIPTION' => $TEXT['WEBSITE_DESCRIPTION'],
     								'TEXT_WEBSITE_KEYWORDS' => $TEXT['WEBSITE_KEYWORDS'],
-...
     								'TEXT_MODULE_ORDER' => $TEXT['MODULE_ORDER'],
     								'TEXT_MAX_EXCERPT' => $TEXT['MAX_EXCERPT'],
     								'TEXT_TIME_LIMIT' => $TEXT['TIME_LIMIT']
+    								)
     						);
     								));
     if($is_advanced)
+    {
     	$template->parse('show_page_level_limit', 'show_page_level_limit_block', true);
     	$template->parse('show_checkbox_1',       'show_checkbox_1_block', true);
      	$template->parse('show_checkbox_2',       'show_checkbox_2_block', true);
     	$template->parse('show_checkbox_3',       'show_checkbox_3_block', true);
     	$template->parse('show_php_error_level',  'show_php_error_level_block', true);
     	$template->parse('show_charset',          'show_charset_block', true);
     	$template->parse('show_access',           'show_access_block', true);
     	$template->parse('show_wysiwyg',          'show_wysiwyg_block', true);
     	$template->parse('show_search',           'show_search_block', false);
     	$template->parse('show_redirect_timer',   'show_redirect_timer_block', true);
     }else {
     	$template->set_block('show_page_level_limit', '');
     	$template->set_block('show_checkbox_1', '');
     	$template->set_block('show_checkbox_2', '');
     	$template->set_block('show_checkbox_3', '');
     	$template->set_block('show_php_error_level', '');
     	$template->set_block('show_charset', '');
     	$template->set_block('show_access', '');
     	$template->set_block('show_wysiwyg', '');
     	$template->set_block('show_search', '');
     	$template->set_block('show_redirect_timer', '');
+    }
     // Parse template objects output
     $template->parse('main', 'main_block', false);
     $template->pparse('output', 'page');

     h1 { color: #000000; font-size: 20px; text-align: center; text-transform: uppercase; }
     h2 { margin: 5px 0px 5px 0px; color: #336699; font-size: 15px; }
     h4 { margin: 0; border-bottom: 1px solid #DDD; padding-bottom: 5px; }
     a h3 { margin: 0; font-size :1.1em; padding-bottom: 2px; }
     li p { margin: 0.5em 0; }
     a:link, a:visited, a:active { color: #003366; text-decoration: none; }
     a:hover { color: #336699; text-decoration: none; }
     ul, li { margin: 0; padding: 0; list-style: none; }
     .current a, .current a:link, .current a:active, .current a:visited { background: #fff url(images/menuo.png); background-repeat: repeat-x; color: #fff; }
     label { cursor: pointer; }
     input:focus, input:active, select:focus, textarea:focus { background: #F1F8FD; }
     iframe { border: 1px solid #35373a; }
-...
     .header { width: 900px; margin: 0 auto; }
     .container { width: 85%; margin: 0 auto; background: #fff url(images/bgtitle.png); background-repeat: repeat-x; }
     .content { padding: 20px; width: 95%; height: 200px; margin: 0 auto; min-height: 300px;  vertical-align: top; }
     .current a, .current a:link, .current a:active, .current a:visited { background: #fff url(images/menuo.png); background-repeat: repeat-x; color: #fff; }
     .description { width: 240px; padding: 0px 0px 0px 3px; text-align: left; vertical-align: top; }
     .graphic { width: 50px; border: 4px solid #FDFDFD; padding-left: 3px; height: 50px; }
     .graphic img { padding: 3px 12px 3px 3px; margin-right: 12px; border-right: 3px solid silver; background-color: #FFFFFF; vertical-align: middle; }
-...
     .setting_value { width: 90%; }
     .setting_value textarea { height: 50px; }
     .title { width: 90%; padding: 4px 0px 0px 3px; color: #003366; font-weight: bold; font-size: 14px; text-align: left; height: 16px; }
     .tool_table ul { margin: 0; padding: 0; margin-left: 20px; margin-bottom: 10px; }
     .tool_table li { padding-bottom: 5px; list-style-type: disc; }
     .tool_table ul { margin: 0; padding: 0; margin-left: 20px; margin-bottom: 2px; }
     .tool_table li { padding: 1px; list-style-type: disc; }
     /* CSS STYLES FOR THE PAGES SECTION */
     table.pages_view { width: 100%; margin: 0 auto; border: 0; background-color: #ECF3F7; border-spacing: 0px; }
     table.pages_view tr:hover { background-color: #F1F8DD; }
-...
           background: #f5f5f5 none;
+       }
      div#username { height: 17px; width:402px; min-width:250px; border: 0px groove #6799c4; text-align: left; font-weight:bold; margin:0;}
      div#username { height: 17px; width:402px; background-color: #e9e9e9; min-width:250px; border: 0px groove #6799c4; text-align: left; font-weight:bold; margin:0;}
     .save_section { margin: 20px auto 5px auto; }

     		<textarea name="website_footer" cols="50" rows="3">{WEBSITE_FOOTER}</textarea>
     	</td>
     </tr>
     <!-- BEGIN show_page_level_limit_block -->
     <tr{DISPLAY_ADVANCED}>
     	<td class="setting_name">{TEXT_PAGE_LEVEL_LIMIT}:</td>
     	<td class="setting_value" colspan="2">
-...
     		</select>
     	</td>
     </tr>
     <!-- END show_page_level_limit_block -->
     <tr>
     	<td class="setting_name">{TEXT_PAGE_TRASH}:</td>
     	<td class="setting_value" colspan="2">
-...
     		</div>
     	</td>
     </tr>
     <!-- BEGIN show_checkbox_1_block -->
     <tr{DISPLAY_ADVANCED}>
             <td class="setting_name">{TEXT_PAGE_LANGUAGES}:</td>
             <td class="setting_value" colspan="2">
-...
     		<label for="multiple_menus_false">{TEXT_DISABLED}</label>
     	</td>
     </tr>
     <!-- END show_checkbox_1_block -->
     <tr>
     	<td class="setting_name">{TEXT_HOME_FOLDERS}:</td>
     	<td class="setting_value" colspan="2">
-...
     		<label for="home_folders_false">{TEXT_DISABLED}</label>
     	</td>
     </tr>
     <!-- BEGIN show_checkbox_2_block -->
     <tr{DISPLAY_ADVANCED}>
     	<td class="setting_name">{TEXT_MANAGE_SECTIONS}:</td>
     	<td class="setting_value" colspan="2">
-...
     		<label for="section_blocks_false">{TEXT_DISABLED}</label>
     	</td>
     </tr>
     <!-- END show_checkbox_2_block -->
     <tr>
     	<td class="setting_name">{TEXT_INTRO_PAGE}:</td>
     	<td class="setting_value" colspan="2">
-...
     		<label for="intro_page_false">{TEXT_DISABLED}</label>
     	</td>
     </tr>
     <!-- BEGIN show_checkbox_3_block -->
     <tr{DISPLAY_ADVANCED}>
     	<td class="setting_name">{TEXT_HOMEPAGE_REDIRECTION}:</td>
     	<td class="setting_value" colspan="2">
-...
     		<label for="smart_login_false">{TEXT_DISABLED}</label>
     	</td>
     </tr>
     <!-- END show_checkbox_3_block -->
     <tr>
     	<td class="setting_name">{TEXT_LOGIN}:</td>
     	<td class="setting_value" colspan="2">
-...
     		<label for="frontend_login_false">{TEXT_DISABLED}</label>
     	</td>
     </tr>
     <!-- BEGIN show_redirect_timer_block -->
     <tr{DISPLAY_ADVANCED}>
     	<td class="setting_name">{TEXT_REDIRECT_AFTER}:</td>
     	<td class="setting_value" colspan="2">
     		<input type="text" name="redirect_timer" value="{REDIRECT_TIMER}" />
     	</td>
     </tr>
     <!-- END show_redirect_timer_block -->
     <tr>
     	<td class="setting_name">{TEXT_SIGNUP}:</td>
     	<td class="setting_value" colspan="2">
-...
     		</select>
     	</td>
     </tr>
     <!-- BEGIN show_php_error_level_block -->
     <tr{DISPLAY_ADVANCED}>
     	<td class="setting_name">{TEXT_PHP_ERROR_LEVEL}:</td>
     	<td class="setting_value" colspan="2">
-...
     		</select>
     	</td>
     </tr>
     <!-- END show_php_error_level_block -->
     <!-- BEGIN show_wysiwyg_block -->
     <tr{DISPLAY_ADVANCED}>
     	<td class="setting_name">{TEXT_WYSIWYG_STYLE}:</td>
     	<td class="setting_value" colspan="2">
-...
     		</select>
     	</td>
     </tr>
     <!-- END show_wysiwyg_block -->
     <tr>
     	<td>&nbsp;</td>
     	<td align="left" nowrap="nowrap">
-...
     		</select>
     	</td>
     </tr>
     <!-- BEGIN show_charset_block -->
     <tr{DISPLAY_ADVANCED}>
     	<td class="setting_name">{TEXT_CHARSET}:</td>

... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff

Project

General

Profile

WB 2.08.x

Revision 1335

Added by Dietmar over 14 years ago