Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG (revision 1240)
+++ branches/2.8.x/CHANGELOG (revision 1241)
@@ -11,11 +11,14 @@
! = Update/Change
------------------------------------- 2.8.1 -------------------------------------
-13-Jan-2010 Dietmar Woellbrink (Luisehahne)
+12-Jan-2010 Dietmar Woellbrink (Luisehahne)
+# Ticket #906 Search Template bug
+! update editor min width, dragableresize table
+12-Jan-2010 Dietmar Woellbrink (Luisehahne)
# Ticket #907 js files in backend themes are stored at wrong places
+ add include/jquery/plugins/toggle_zip.js
- removed toggle_zip.js in backend themes
-112-Jan-2010 Dietmar Woellbrink (Luisehahne)
+12-Jan-2010 Dietmar Woellbrink (Luisehahne)
# fix open_basedir restriction in effect in save_post.php
11-Jan-2010 Dietmar Woellbrink (Luisehahne)
! fix load_module, load_language (tks to Webbird)
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php (revision 1240)
+++ branches/2.8.x/wb/admin/interface/version.php (revision 1241)
@@ -70,6 +70,6 @@
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
if(!defined('VERSION')) define('VERSION', '2.8.1');
-if(!defined('REVISION')) define('REVISION', '1240');
+if(!defined('REVISION')) define('REVISION', '1241');
?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/settings/save.php
===================================================================
--- branches/2.8.x/wb/admin/settings/save.php (revision 1240)
+++ branches/2.8.x/wb/admin/settings/save.php (revision 1241)
@@ -1,189 +1,230 @@
-
- Copyright (C) 2004-2009, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-*/
-
-// prevent this file from being accessed directly in the browser (would set all entries in DB settings table to '')
-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 = '');
-
-// Print admin header
-require('../../config.php');
-require_once(WB_PATH.'/framework/class.admin.php');
-if($advanced == '') {
- $admin = new admin('Settings', 'settings_basic');
- $_POST['database_password'] = DB_PASSWORD;
-} else {
- $admin = new admin('Settings', 'settings_advanced');
-}
-
-// Create a javascript back link
-$js_back = "javascript: history.go(-1);";
-
-// Ensure that the specified default email is formally valid
-if(isset($_POST['server_email'])) {
- $_POST['server_email'] = strip_tags($_POST['server_email']);
- if(!eregi("^([0-9a-zA-Z]+[-._+&])*[0-9a-zA-Z]+@([-0-9a-zA-Z]+[.])+[a-zA-Z]{2,6}$", $_POST['server_email'])) {
- $admin->print_error($MESSAGE['USERS']['INVALID_EMAIL'].
- '
Email: '.htmlentities($_POST['server_email']).'', $js_back);
- }
-}
-
-// Work-out file mode
-if($advanced == '') {
- // Check if should be set to 777 or left alone
- if(isset($_POST['world_writeable']) AND $_POST['world_writeable'] == 'true') {
- $file_mode = '0777';
- $dir_mode = '0777';
- } else {
- $file_mode = STRING_FILE_MODE;
- $dir_mode = STRING_DIR_MODE;
- }
-} else {
- // Work-out the octal value for file mode
- $u = 0;
- if(isset($_POST['file_u_r']) AND $_POST['file_u_r'] == 'true') {
- $u = $u+4;
- }
- if(isset($_POST['file_u_w']) AND $_POST['file_u_w'] == 'true') {
- $u = $u+2;
- }
- if(isset($_POST['file_u_e']) AND $_POST['file_u_e'] == 'true') {
- $u = $u+1;
- }
- $g = 0;
- if(isset($_POST['file_g_r']) AND $_POST['file_g_r'] == 'true') {
- $g = $g+4;
- }
- if(isset($_POST['file_g_w']) AND $_POST['file_g_w'] == 'true') {
- $g = $g+2;
- }
- if(isset($_POST['file_g_e']) AND $_POST['file_g_e'] == 'true') {
- $g = $g+1;
- }
- $o = 0;
- if(isset($_POST['file_o_r']) AND $_POST['file_o_r'] == 'true') {
- $o = $o+4;
- }
- if(isset($_POST['file_o_w']) AND $_POST['file_o_w'] == 'true') {
- $o = $o+2;
- }
- if(isset($_POST['file_o_e']) AND $_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') {
- $u = $u+4;
- }
- if(isset($_POST['dir_u_w']) AND $_POST['dir_u_w'] == 'true') {
- $u = $u+2;
- }
- if(isset($_POST['dir_u_e']) AND $_POST['dir_u_e'] == 'true') {
- $u = $u+1;
- }
- $g = 0;
- if(isset($_POST['dir_g_r']) AND $_POST['dir_g_r'] == 'true') {
- $g = $g+4;
- }
- if(isset($_POST['dir_g_w']) AND $_POST['dir_g_w'] == 'true') {
- $g = $g+2;
- }
- if(isset($_POST['dir_g_e']) AND $_POST['dir_g_e'] == 'true') {
- $g = $g+1;
- }
- $o = 0;
- if(isset($_POST['dir_o_r']) AND $_POST['dir_o_r'] == 'true') {
- $o = $o+4;
- }
- if(isset($_POST['dir_o_w']) AND $_POST['dir_o_w'] == 'true') {
- $o = $o+2;
- }
- if(isset($_POST['dir_o_e']) AND $_POST['dir_o_e'] == 'true') {
- $o = $o+1;
- }
- $dir_mode = "0".$u.$g.$o;
-}
-
-// Create new database object
-$database = new database();
-
-// Query current settings in the db, then loop through them and update the db with the new value
-$query = "SELECT name FROM ".TABLE_PREFIX."settings";
-$results = $database->query($query);
-while($setting = $results->fetchRow()) {
- $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);
- }
- 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()) {
- $old_value = $search_setting['value'];
- $setting_name = $search_setting['name'];
- $post_name = 'search_'.$search_setting['name'];
- if($admin->get_post($post_name) == '')
- $value = $old_value;
- else
- $value = $admin->get_post($post_name);
- $value = $admin->add_slashes($value);
- $database->query("UPDATE ".TABLE_PREFIX."search SET value = '$value' WHERE name = '$setting_name'");
-}
-
-// 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();
-}
-
-$admin->print_success($MESSAGE['SETTINGS']['SAVED'], ADMIN_URL.'/settings/index.php'.$advanced);
-$admin->print_footer();
-
-?>
+
+* Copyright (C) 2009, Website Baker Org. e.V.
+* http://start.websitebaker2.org/impressum-datenschutz.php
+* Copyright (C) 2004-2009, Ryan Djurovich
+*
+* About WebsiteBaker
+*
+* Website Baker is a PHP-based Content Management System (CMS)
+* designed with one goal in mind: to enable its users to produce websites
+* with ease.
+*
+*****************************************************************************
+*
+*****************************************************************************
+* LICENSE INFORMATION
+*
+* WebsiteBaker is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* WebsiteBaker is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* See the GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+****************************************************************************
+*
+* WebsiteBaker Extra Information
+*
+*
+*
+*
+*****************************************************************************/
+/**
+ *
+ * @category admin
+ * @package settings
+ * @author Ryan Djurovich
+ * @copyright 2004-2009, Ryan Djurovich
+ * @copyright 2009-2010, Website Baker Org. e.V.
+ * @version $Id$
+ * @platform WebsiteBaker 2.8.x
+ * @requirements >= PHP 4.3.4
+ * @license http://www.gnu.org/licenses/gpl.html
+ *
+ */
+
+// prevent this file from being accessed directly in the browser (would set all entries in DB settings table to '')
+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 = '');
+
+// Print admin header
+require('../../config.php');
+require_once(WB_PATH.'/framework/class.admin.php');
+if($advanced == '') {
+ $admin = new admin('Settings', 'settings_basic');
+ $_POST['database_password'] = DB_PASSWORD;
+} else {
+ $admin = new admin('Settings', 'settings_advanced');
+}
+
+// Create a javascript back link
+$js_back = "javascript: history.go(-1);";
+
+// Ensure that the specified default email is formally valid
+if(isset($_POST['server_email'])) {
+ $_POST['server_email'] = strip_tags($_POST['server_email']);
+ if(!eregi("^([0-9a-zA-Z]+[-._+&])*[0-9a-zA-Z]+@([-0-9a-zA-Z]+[.])+[a-zA-Z]{2,6}$", $_POST['server_email'])) {
+ $admin->print_error($MESSAGE['USERS']['INVALID_EMAIL'].
+ '
Email: '.htmlentities($_POST['server_email']).'', $js_back);
+ }
+}
+
+// Work-out file mode
+if($advanced == '') {
+ // Check if should be set to 777 or left alone
+ if(isset($_POST['world_writeable']) AND $_POST['world_writeable'] == 'true') {
+ $file_mode = '0777';
+ $dir_mode = '0777';
+ } else {
+ $file_mode = STRING_FILE_MODE;
+ $dir_mode = STRING_DIR_MODE;
+ }
+} else {
+ // Work-out the octal value for file mode
+ $u = 0;
+ if(isset($_POST['file_u_r']) AND $_POST['file_u_r'] == 'true') {
+ $u = $u+4;
+ }
+ if(isset($_POST['file_u_w']) AND $_POST['file_u_w'] == 'true') {
+ $u = $u+2;
+ }
+ if(isset($_POST['file_u_e']) AND $_POST['file_u_e'] == 'true') {
+ $u = $u+1;
+ }
+ $g = 0;
+ if(isset($_POST['file_g_r']) AND $_POST['file_g_r'] == 'true') {
+ $g = $g+4;
+ }
+ if(isset($_POST['file_g_w']) AND $_POST['file_g_w'] == 'true') {
+ $g = $g+2;
+ }
+ if(isset($_POST['file_g_e']) AND $_POST['file_g_e'] == 'true') {
+ $g = $g+1;
+ }
+ $o = 0;
+ if(isset($_POST['file_o_r']) AND $_POST['file_o_r'] == 'true') {
+ $o = $o+4;
+ }
+ if(isset($_POST['file_o_w']) AND $_POST['file_o_w'] == 'true') {
+ $o = $o+2;
+ }
+ if(isset($_POST['file_o_e']) AND $_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') {
+ $u = $u+4;
+ }
+ if(isset($_POST['dir_u_w']) AND $_POST['dir_u_w'] == 'true') {
+ $u = $u+2;
+ }
+ if(isset($_POST['dir_u_e']) AND $_POST['dir_u_e'] == 'true') {
+ $u = $u+1;
+ }
+ $g = 0;
+ if(isset($_POST['dir_g_r']) AND $_POST['dir_g_r'] == 'true') {
+ $g = $g+4;
+ }
+ if(isset($_POST['dir_g_w']) AND $_POST['dir_g_w'] == 'true') {
+ $g = $g+2;
+ }
+ if(isset($_POST['dir_g_e']) AND $_POST['dir_g_e'] == 'true') {
+ $g = $g+1;
+ }
+ $o = 0;
+ if(isset($_POST['dir_o_r']) AND $_POST['dir_o_r'] == 'true') {
+ $o = $o+4;
+ }
+ if(isset($_POST['dir_o_w']) AND $_POST['dir_o_w'] == 'true') {
+ $o = $o+2;
+ }
+ if(isset($_POST['dir_o_e']) AND $_POST['dir_o_e'] == 'true') {
+ $o = $o+1;
+ }
+ $dir_mode = "0".$u.$g.$o;
+}
+
+// Create new database object
+$database = new database();
+
+// Query current settings in the db, then loop through them and update the db with the new value
+$query = "SELECT name FROM ".TABLE_PREFIX."settings";
+$results = $database->query($query);
+while($setting = $results->fetchRow()) {
+ $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);
+ }
+ 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())
+{
+ $old_value = $search_setting['value'];
+ $setting_name = $search_setting['name'];
+ $post_name = 'search_'.$search_setting['name'];
+ if($admin->get_post($post_name) == '')
+ {
+ $value = $old_value;
+ }
+ else
+ {
+ $value = $admin->get_post($post_name);
+ }
+
+ $value = $admin->add_slashes($value);
+ $database->query("UPDATE ".TABLE_PREFIX."search SET value = '$value' WHERE name = '$setting_name'");
+}
+
+// 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();
+}
+
+$admin->print_success($MESSAGE['SETTINGS']['SAVED'], ADMIN_URL.'/settings/index.php'.$advanced);
+$admin->print_footer();
+
+?>
\ No newline at end of file
Index: branches/2.8.x/wb/admin/settings/index.php
===================================================================
--- branches/2.8.x/wb/admin/settings/index.php (revision 1240)
+++ branches/2.8.x/wb/admin/settings/index.php (revision 1241)
@@ -1,651 +1,713 @@
-
- Copyright (C) 2004-2009, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-*/
-
-require('../../config.php');
-require_once(WB_PATH.'/framework/class.admin.php');
-if(isset($_GET['advanced']) AND $_GET['advanced'] == 'yes') {
- $admin = new admin('Settings', 'settings_advanced');
-} else {
- $admin = new admin('Settings', 'settings_basic');
-}
-
-// Include the WB functions file
-require_once(WB_PATH.'/framework/functions.php');
-require_once(WB_PATH.'/framework/functions-utf8.php');
-
-// Create new template object
-$template = new Template(THEME_PATH.'/templates');
-$template->set_file('page', 'settings.htt');
-$template->set_block('page', 'main_block', 'main');
-
-// Query current settings in the db, then loop through them and print them
-$query = "SELECT * FROM ".TABLE_PREFIX."settings";
-$results = $database->query($query);
-while($setting = $results->fetchRow()) {
- $setting_name = $setting['name'];
- $setting_value = ( $setting_name != 'wbmailer_smtp_password' ) ? htmlspecialchars($setting['value']) : $setting['value'];
- $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 = '';
-
-// Tell the browser whether or not to show advanced options
-if(isset($_GET['advanced']) AND $_GET['advanced'] == 'yes') {
- $template->set_var('DISPLAY_ADVANCED', '');
- $template->set_var('ADVANCED', 'yes');
- $template->set_var('ADVANCED_BUTTON', '<< '.$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('ADVANCED', 'no');
- $template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].' >>');
- $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(
- 'PAGES_DIRECTORY' => PAGES_DIRECTORY,
- 'MEDIA_DIRECTORY' => MEDIA_DIRECTORY,
- 'PAGE_EXTENSION' => PAGE_EXTENSION,
- 'PAGE_SPACER' => PAGE_SPACER,
- 'WB_PATH' => WB_PATH,
- 'WB_URL' => WB_URL,
- '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,
- '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
- }
- 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);
- }
-}
-
-// 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);
- $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');
-$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', '');
- }
- $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', '');
- }
- $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', '');
- }
- $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 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') OR $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'");
-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');
-if($search_template == '') { $selected = ' selected="selected"'; } else { $selected = ''; }
-$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' 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'] == $search_template ? $selected = ' selected="selected"' : $selected = '');
- $template->set_var('SELECTED', $selected);
- $template->parse('search_template_list', 'search_template_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);
- if(ER_LEVEL == $value) {
- $template->set_var('SELECTED', ' selected="selected"');
- } else {
- $template->set_var('SELECTED', '');
- }
- $template->parse('error_reporting_list', 'error_reporting_list_block', true);
-}
-
-// Insert permissions values
-if($admin->get_permission('settings_advanced') != true) {
- $template->set_var('DISPLAY_ADVANCED_BUTTON', 'hide');
-}
-
-// 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"');
- } else {
- $template->set_var('SELECTED', '');
- }
- $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 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 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"');
-}
-
-if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg')) { /* Make's sure GD library is installed */
- $template->set_var('GD_EXTENSION_ENABLED', '');
-} else {
- $template->set_var('GD_EXTENSION_ENABLED', 'none');
-}
-
-// 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 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 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', 'none');
- $template->set_var('SMTP_VISIBILITY_AUTH', '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', 'none');
- }
-} else {
- $template->set_var('SMTP_VISIBILITY_AUTH', '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 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 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"');
-}
-
-// 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"');
-}
-
-// 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', '');
- }
- $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(
- 'HEADING_GENERAL_SETTINGS' => $HEADING['GENERAL_SETTINGS'],
- 'HEADING_DEFAULT_SETTINGS' => $HEADING['DEFAULT_SETTINGS'],
- 'HEADING_SEARCH_SETTINGS' => $HEADING['SEARCH_SETTINGS'],
- 'HEADING_SERVER_SETTINGS' => $HEADING['SERVER_SETTINGS'],
- 'HEADING_WBMAILER_SETTINGS' => $HEADING['WBMAILER_SETTINGS'],
- 'HEADING_ADMINISTRATION_TOOLS' => $HEADING['ADMINISTRATION_TOOLS']
- )
- );
-// 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_WEBSITE_HEADER' => $TEXT['WEBSITE_HEADER'],
- 'TEXT_WEBSITE_FOOTER' => $TEXT['WEBSITE_FOOTER'],
- 'TEXT_HEADER' => $TEXT['HEADER'],
- 'TEXT_FOOTER' => $TEXT['FOOTER'],
- 'TEXT_VISIBILITY' => $TEXT['VISIBILITY'],
- 'TEXT_RESULTS_HEADER' => $TEXT['RESULTS_HEADER'],
- 'TEXT_RESULTS_LOOP' => $TEXT['RESULTS_LOOP'],
- 'TEXT_RESULTS_FOOTER' => $TEXT['RESULTS_FOOTER'],
- 'TEXT_NO_RESULTS' => $TEXT['NO_RESULTS'],
- 'TEXT_TEXT' => $TEXT['TEXT'],
- 'TEXT_DEFAULT' => $TEXT['DEFAULT'],
- 'TEXT_LANGUAGE' => $TEXT['LANGUAGE'],
- 'TEXT_TIMEZONE' => $TEXT['TIMEZONE'],
- 'TEXT_CHARSET' => $TEXT['CHARSET'],
- 'TEXT_DATE_FORMAT' => $TEXT['DATE_FORMAT'],
- 'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'],
- 'TEXT_TEMPLATE' => $TEXT['TEMPLATE'],
- 'TEXT_THEME' => $TEXT['THEME'],
- 'TEXT_WYSIWYG_EDITOR' => $TEXT['WYSIWYG_EDITOR'],
- 'TEXT_PAGE_LEVEL_LIMIT' => $TEXT['PAGE_LEVEL_LIMIT'],
- 'TEXT_INTRO_PAGE' => $TEXT['INTRO_PAGE'],
- 'TEXT_FRONTEND' => $TEXT['FRONTEND'],
- 'TEXT_LOGIN' => $TEXT['LOGIN'],
- 'TEXT_REDIRECT_AFTER' => $TEXT['REDIRECT_AFTER'],
- 'TEXT_SIGNUP' => $TEXT['SIGNUP'],
- 'TEXT_PHP_ERROR_LEVEL' => $TEXT['PHP_ERROR_LEVEL'],
- 'TEXT_PAGES_DIRECTORY' => $TEXT['PAGES_DIRECTORY'],
- 'TEXT_MEDIA_DIRECTORY' => $TEXT['MEDIA_DIRECTORY'],
- 'TEXT_PAGE_EXTENSION' => $TEXT['PAGE_EXTENSION'],
- 'TEXT_PAGE_SPACER' => $TEXT['PAGE_SPACER'],
- 'TEXT_RENAME_FILES_ON_UPLOAD' => $TEXT['RENAME_FILES_ON_UPLOAD'],
- 'TEXT_APP_NAME' => $TEXT['APP_NAME'],
- 'TEXT_SESSION_IDENTIFIER' => $TEXT['SESSION_IDENTIFIER'],
- 'TEXT_SEC_ANCHOR' => $TEXT['SEC_ANCHOR'],
- 'TEXT_SERVER_OPERATING_SYSTEM' => $TEXT['SERVER_OPERATING_SYSTEM'],
- 'TEXT_LINUX_UNIX_BASED' => $TEXT['LINUX_UNIX_BASED'],
- 'TEXT_WINDOWS' => $TEXT['WINDOWS'],
- 'TEXT_ADMIN' => $TEXT['ADMIN'],
- 'TEXT_TYPE' => $TEXT['TYPE'],
- 'TEXT_DATABASE' => $TEXT['DATABASE'],
- 'TEXT_HOST' => $TEXT['HOST'],
- 'TEXT_USERNAME' => $TEXT['USERNAME'],
- 'TEXT_PASSWORD' => $TEXT['PASSWORD'],
- 'TEXT_NAME' => $TEXT['NAME'],
- 'TEXT_TABLE_PREFIX' => $TEXT['TABLE_PREFIX'],
- 'TEXT_SAVE' => $TEXT['SAVE'],
- 'TEXT_RESET' => $TEXT['RESET'],
- 'TEXT_CHANGES' => $TEXT['CHANGES'],
- 'TEXT_ENABLED' => $TEXT['ENABLED'],
- 'TEXT_DISABLED' => $TEXT['DISABLED'],
- 'TEXT_MANAGE_SECTIONS' => $HEADING['MANAGE_SECTIONS'],
- 'TEXT_MANAGE' => $TEXT['MANAGE'],
- 'TEXT_SEARCH' => $TEXT['SEARCH'],
- 'TEXT_PUBLIC' => $TEXT['PUBLIC'],
- 'TEXT_PRIVATE' => $TEXT['PRIVATE'],
- 'TEXT_REGISTERED' => $TEXT['REGISTERED'],
- 'TEXT_NONE' => $TEXT['NONE'],
- 'TEXT_FILES' => strtoupper(substr($TEXT['FILES'], 0, 1)).substr($TEXT['FILES'], 1),
- 'TEXT_DIRECTORIES' => $TEXT['DIRECTORIES'],
- 'TEXT_FILESYSTEM_PERMISSIONS' => $TEXT['FILESYSTEM_PERMISSIONS'],
- 'TEXT_USER' => $TEXT['USER'],
- 'TEXT_GROUP' => $TEXT['GROUP'],
- 'TEXT_OTHERS' => $TEXT['OTHERS'],
- 'TEXT_READ' => $TEXT['READ'],
- 'TEXT_WRITE' => $TEXT['WRITE'],
- 'TEXT_EXECUTE' => $TEXT['EXECUTE'],
- 'TEXT_SMART_LOGIN' => $TEXT['SMART_LOGIN'],
- 'TEXT_MULTIPLE_MENUS' => $TEXT['MULTIPLE_MENUS'],
- 'TEXT_HOMEPAGE_REDIRECTION' => $TEXT['HOMEPAGE_REDIRECTION'],
- 'TEXT_SECTION_BLOCKS' => $TEXT['SECTION_BLOCKS'],
- 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
- 'TEXT_PAGE_TRASH' => $TEXT['PAGE_TRASH'],
- 'TEXT_PAGE_LANGUAGES' => $TEXT['PAGE_LANGUAGES'],
- 'TEXT_INLINE' => $TEXT['INLINE'],
- 'TEXT_SEPARATE' => $TEXT['SEPARATE'],
- 'TEXT_HOME_FOLDERS' => $TEXT['HOME_FOLDERS'],
- 'TEXT_WYSIWYG_STYLE' => $TEXT['WYSIWYG_STYLE'],
- 'TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS' => $TEXT['WORLD_WRITEABLE_FILE_PERMISSIONS'],
- 'TEXT_WBMAILER_DEFAULT_SETTINGS_NOTICE' => $TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'],
- 'TEXT_WBMAILER_DEFAULT_SENDER_MAIL' => $TEXT['WBMAILER_DEFAULT_SENDER_MAIL'],
- 'TEXT_WBMAILER_DEFAULT_SENDER_NAME' => $TEXT['WBMAILER_DEFAULT_SENDER_NAME'],
- 'TEXT_WBMAILER_NOTICE' => $TEXT['WBMAILER_NOTICE'],
- 'TEXT_WBMAILER_FUNCTION' => $TEXT['WBMAILER_FUNCTION'],
- 'TEXT_WBMAILER_SMTP_HOST' => $TEXT['WBMAILER_SMTP_HOST'],
- 'TEXT_WBMAILER_PHP' => $TEXT['WBMAILER_PHP'],
- 'TEXT_WBMAILER_SMTP' => $TEXT['WBMAILER_SMTP'],
- 'TEXT_WBMAILER_SMTP_AUTH' => $TEXT['WBMAILER_SMTP_AUTH'],
- 'TEXT_WBMAILER_SMTP_AUTH_NOTICE' => $TEXT['WBMAILER_SMTP_AUTH_NOTICE'],
- 'TEXT_WBMAILER_SMTP_USERNAME' => $TEXT['WBMAILER_SMTP_USERNAME'],
- 'TEXT_WBMAILER_SMTP_PASSWORD' => $TEXT['WBMAILER_SMTP_PASSWORD'],
- 'MODE_SWITCH_WARNING' => $MESSAGE['SETTINGS']['MODE_SWITCH_WARNING'],
- 'WORLD_WRITEABLE_WARNING' => $MESSAGE['SETTINGS']['WORLD_WRITEABLE_WARNING'],
- 'TEXT_MODULE_ORDER' => $TEXT['MODULE_ORDER'],
- 'TEXT_MAX_EXCERPT' => $TEXT['MAX_EXCERPT'],
- 'TEXT_TIME_LIMIT' => $TEXT['TIME_LIMIT']
- )
- );
-
-// Parse template objects output
-$template->parse('main', 'main_block', false);
-$template->pparse('output', 'page');
-
-$admin->print_footer();
-
-?>
+
+* Copyright (C) 2009, Website Baker Org. e.V.
+* http://start.websitebaker2.org/impressum-datenschutz.php
+* Copyright (C) 2004-2009, Ryan Djurovich
+*
+* About WebsiteBaker
+*
+* Website Baker is a PHP-based Content Management System (CMS)
+* designed with one goal in mind: to enable its users to produce websites
+* with ease.
+*
+*****************************************************************************
+*
+*****************************************************************************
+* LICENSE INFORMATION
+*
+* WebsiteBaker is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* WebsiteBaker is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* See the GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+****************************************************************************
+*
+* WebsiteBaker Extra Information
+*
+*
+*
+*
+*****************************************************************************/
+/**
+ *
+ * @category admin
+ * @package settings
+ * @author Ryan Djurovich
+ * @copyright 2004-2009, Ryan Djurovich
+ * @copyright 2009-2010, Website Baker Org. e.V.
+ * @version $Id$
+ * @platform WebsiteBaker 2.8.x
+ * @requirements >= PHP 4.3.4
+ * @license http://www.gnu.org/licenses/gpl.html
+ *
+ */
+
+require('../../config.php');
+require_once(WB_PATH.'/framework/class.admin.php');
+if(isset($_GET['advanced']) AND $_GET['advanced'] == 'yes') {
+ $admin = new admin('Settings', 'settings_advanced');
+} else {
+ $admin = new admin('Settings', 'settings_basic');
+}
+
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+require_once(WB_PATH.'/framework/functions-utf8.php');
+
+// Create new template object
+$template = new Template(THEME_PATH.'/templates');
+$template->set_file('page', 'settings.htt');
+$template->set_block('page', 'main_block', 'main');
+
+// Query current settings in the db, then loop through them and print them
+$query = "SELECT * FROM ".TABLE_PREFIX."settings";
+$results = $database->query($query);
+while($setting = $results->fetchRow())
+{
+ $setting_name = $setting['name'];
+ $setting_value = ( $setting_name != 'wbmailer_smtp_password' ) ? htmlspecialchars($setting['value']) : $setting['value'];
+ $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 = '';
+
+// Tell the browser whether or not to show advanced options
+if(isset($_GET['advanced']) AND $_GET['advanced'] == 'yes') {
+ $template->set_var('DISPLAY_ADVANCED', '');
+ $template->set_var('ADVANCED', 'yes');
+ $template->set_var('ADVANCED_BUTTON', '<< '.$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('ADVANCED', 'no');
+ $template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].' >>');
+ $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(
+ 'PAGES_DIRECTORY' => PAGES_DIRECTORY,
+ 'MEDIA_DIRECTORY' => MEDIA_DIRECTORY,
+ 'PAGE_EXTENSION' => PAGE_EXTENSION,
+ 'PAGE_SPACER' => PAGE_SPACER,
+ 'WB_PATH' => WB_PATH,
+ 'WB_URL' => WB_URL,
+ '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,
+ '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
+ }
+ 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);
+ }
+}
+
+// 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);
+ $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');
+$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', '');
+ }
+ $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', '');
+ }
+ $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', '');
+ }
+ $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 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') OR $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'");
+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;
+if( $search_template == '')
+{
+ $selected = ' selected="selected"';
+}
+else
+{
+ $selected = '';
+}
+
+$template->set_var(array(
+ 'FILE' => DEFAULT_TEMPLATE,
+ '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");
+
+if($result->numRows() > 0)
+{
+ while($addon = $result->fetchRow())
+ {
+ $template->set_var('FILE', $addon['directory']);
+ $template->set_var('NAME', $addon['name']);
+
+ if($addon['directory'] == $search_template)
+ {
+ $selected = ' selected="selected"';
+ }
+ else
+ {
+ $selected = '';
+ }
+
+ $template->set_var('SELECTED', $selected);
+ $template->parse('search_template_list', 'search_template_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);
+ if(ER_LEVEL == $value) {
+ $template->set_var('SELECTED', ' selected="selected"');
+ } else {
+ $template->set_var('SELECTED', '');
+ }
+ $template->parse('error_reporting_list', 'error_reporting_list_block', true);
+}
+
+// Insert permissions values
+if($admin->get_permission('settings_advanced') != true) {
+ $template->set_var('DISPLAY_ADVANCED_BUTTON', 'hide');
+}
+
+// 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"');
+ } else {
+ $template->set_var('SELECTED', '');
+ }
+ $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 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 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"');
+}
+
+if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg')) { /* Make's sure GD library is installed */
+ $template->set_var('GD_EXTENSION_ENABLED', '');
+} else {
+ $template->set_var('GD_EXTENSION_ENABLED', 'none');
+}
+
+// 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 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 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', 'none');
+ $template->set_var('SMTP_VISIBILITY_AUTH', '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', 'none');
+ }
+} else {
+ $template->set_var('SMTP_VISIBILITY_AUTH', '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 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 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"');
+}
+
+// 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"');
+}
+
+// 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', '');
+ }
+ $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(
+ 'HEADING_GENERAL_SETTINGS' => $HEADING['GENERAL_SETTINGS'],
+ 'HEADING_DEFAULT_SETTINGS' => $HEADING['DEFAULT_SETTINGS'],
+ 'HEADING_SEARCH_SETTINGS' => $HEADING['SEARCH_SETTINGS'],
+ 'HEADING_SERVER_SETTINGS' => $HEADING['SERVER_SETTINGS'],
+ 'HEADING_WBMAILER_SETTINGS' => $HEADING['WBMAILER_SETTINGS'],
+ 'HEADING_ADMINISTRATION_TOOLS' => $HEADING['ADMINISTRATION_TOOLS']
+ )
+ );
+// 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_WEBSITE_HEADER' => $TEXT['WEBSITE_HEADER'],
+ 'TEXT_WEBSITE_FOOTER' => $TEXT['WEBSITE_FOOTER'],
+ 'TEXT_HEADER' => $TEXT['HEADER'],
+ 'TEXT_FOOTER' => $TEXT['FOOTER'],
+ 'TEXT_VISIBILITY' => $TEXT['VISIBILITY'],
+ 'TEXT_RESULTS_HEADER' => $TEXT['RESULTS_HEADER'],
+ 'TEXT_RESULTS_LOOP' => $TEXT['RESULTS_LOOP'],
+ 'TEXT_RESULTS_FOOTER' => $TEXT['RESULTS_FOOTER'],
+ 'TEXT_NO_RESULTS' => $TEXT['NO_RESULTS'],
+ 'TEXT_TEXT' => $TEXT['TEXT'],
+ 'TEXT_DEFAULT' => $TEXT['DEFAULT'],
+ 'TEXT_LANGUAGE' => $TEXT['LANGUAGE'],
+ 'TEXT_TIMEZONE' => $TEXT['TIMEZONE'],
+ 'TEXT_CHARSET' => $TEXT['CHARSET'],
+ 'TEXT_DATE_FORMAT' => $TEXT['DATE_FORMAT'],
+ 'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'],
+ 'TEXT_TEMPLATE' => $TEXT['TEMPLATE'],
+ 'TEXT_THEME' => $TEXT['THEME'],
+ 'TEXT_WYSIWYG_EDITOR' => $TEXT['WYSIWYG_EDITOR'],
+ 'TEXT_PAGE_LEVEL_LIMIT' => $TEXT['PAGE_LEVEL_LIMIT'],
+ 'TEXT_INTRO_PAGE' => $TEXT['INTRO_PAGE'],
+ 'TEXT_FRONTEND' => $TEXT['FRONTEND'],
+ 'TEXT_LOGIN' => $TEXT['LOGIN'],
+ 'TEXT_REDIRECT_AFTER' => $TEXT['REDIRECT_AFTER'],
+ 'TEXT_SIGNUP' => $TEXT['SIGNUP'],
+ 'TEXT_PHP_ERROR_LEVEL' => $TEXT['PHP_ERROR_LEVEL'],
+ 'TEXT_PAGES_DIRECTORY' => $TEXT['PAGES_DIRECTORY'],
+ 'TEXT_MEDIA_DIRECTORY' => $TEXT['MEDIA_DIRECTORY'],
+ 'TEXT_PAGE_EXTENSION' => $TEXT['PAGE_EXTENSION'],
+ 'TEXT_PAGE_SPACER' => $TEXT['PAGE_SPACER'],
+ 'TEXT_RENAME_FILES_ON_UPLOAD' => $TEXT['RENAME_FILES_ON_UPLOAD'],
+ 'TEXT_APP_NAME' => $TEXT['APP_NAME'],
+ 'TEXT_SESSION_IDENTIFIER' => $TEXT['SESSION_IDENTIFIER'],
+ 'TEXT_SEC_ANCHOR' => $TEXT['SEC_ANCHOR'],
+ 'TEXT_SERVER_OPERATING_SYSTEM' => $TEXT['SERVER_OPERATING_SYSTEM'],
+ 'TEXT_LINUX_UNIX_BASED' => $TEXT['LINUX_UNIX_BASED'],
+ 'TEXT_WINDOWS' => $TEXT['WINDOWS'],
+ 'TEXT_ADMIN' => $TEXT['ADMIN'],
+ 'TEXT_TYPE' => $TEXT['TYPE'],
+ 'TEXT_DATABASE' => $TEXT['DATABASE'],
+ 'TEXT_HOST' => $TEXT['HOST'],
+ 'TEXT_USERNAME' => $TEXT['USERNAME'],
+ 'TEXT_PASSWORD' => $TEXT['PASSWORD'],
+ 'TEXT_NAME' => $TEXT['NAME'],
+ 'TEXT_TABLE_PREFIX' => $TEXT['TABLE_PREFIX'],
+ 'TEXT_SAVE' => $TEXT['SAVE'],
+ 'TEXT_RESET' => $TEXT['RESET'],
+ 'TEXT_CHANGES' => $TEXT['CHANGES'],
+ 'TEXT_ENABLED' => $TEXT['ENABLED'],
+ 'TEXT_DISABLED' => $TEXT['DISABLED'],
+ 'TEXT_MANAGE_SECTIONS' => $HEADING['MANAGE_SECTIONS'],
+ 'TEXT_MANAGE' => $TEXT['MANAGE'],
+ 'TEXT_SEARCH' => $TEXT['SEARCH'],
+ 'TEXT_PUBLIC' => $TEXT['PUBLIC'],
+ 'TEXT_PRIVATE' => $TEXT['PRIVATE'],
+ 'TEXT_REGISTERED' => $TEXT['REGISTERED'],
+ 'TEXT_NONE' => $TEXT['NONE'],
+ 'TEXT_FILES' => strtoupper(substr($TEXT['FILES'], 0, 1)).substr($TEXT['FILES'], 1),
+ 'TEXT_DIRECTORIES' => $TEXT['DIRECTORIES'],
+ 'TEXT_FILESYSTEM_PERMISSIONS' => $TEXT['FILESYSTEM_PERMISSIONS'],
+ 'TEXT_USER' => $TEXT['USER'],
+ 'TEXT_GROUP' => $TEXT['GROUP'],
+ 'TEXT_OTHERS' => $TEXT['OTHERS'],
+ 'TEXT_READ' => $TEXT['READ'],
+ 'TEXT_WRITE' => $TEXT['WRITE'],
+ 'TEXT_EXECUTE' => $TEXT['EXECUTE'],
+ 'TEXT_SMART_LOGIN' => $TEXT['SMART_LOGIN'],
+ 'TEXT_MULTIPLE_MENUS' => $TEXT['MULTIPLE_MENUS'],
+ 'TEXT_HOMEPAGE_REDIRECTION' => $TEXT['HOMEPAGE_REDIRECTION'],
+ 'TEXT_SECTION_BLOCKS' => $TEXT['SECTION_BLOCKS'],
+ 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
+ 'TEXT_PAGE_TRASH' => $TEXT['PAGE_TRASH'],
+ 'TEXT_PAGE_LANGUAGES' => $TEXT['PAGE_LANGUAGES'],
+ 'TEXT_INLINE' => $TEXT['INLINE'],
+ 'TEXT_SEPARATE' => $TEXT['SEPARATE'],
+ 'TEXT_HOME_FOLDERS' => $TEXT['HOME_FOLDERS'],
+ 'TEXT_WYSIWYG_STYLE' => $TEXT['WYSIWYG_STYLE'],
+ 'TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS' => $TEXT['WORLD_WRITEABLE_FILE_PERMISSIONS'],
+ 'TEXT_WBMAILER_DEFAULT_SETTINGS_NOTICE' => $TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'],
+ 'TEXT_WBMAILER_DEFAULT_SENDER_MAIL' => $TEXT['WBMAILER_DEFAULT_SENDER_MAIL'],
+ 'TEXT_WBMAILER_DEFAULT_SENDER_NAME' => $TEXT['WBMAILER_DEFAULT_SENDER_NAME'],
+ 'TEXT_WBMAILER_NOTICE' => $TEXT['WBMAILER_NOTICE'],
+ 'TEXT_WBMAILER_FUNCTION' => $TEXT['WBMAILER_FUNCTION'],
+ 'TEXT_WBMAILER_SMTP_HOST' => $TEXT['WBMAILER_SMTP_HOST'],
+ 'TEXT_WBMAILER_PHP' => $TEXT['WBMAILER_PHP'],
+ 'TEXT_WBMAILER_SMTP' => $TEXT['WBMAILER_SMTP'],
+ 'TEXT_WBMAILER_SMTP_AUTH' => $TEXT['WBMAILER_SMTP_AUTH'],
+ 'TEXT_WBMAILER_SMTP_AUTH_NOTICE' => $TEXT['WBMAILER_SMTP_AUTH_NOTICE'],
+ 'TEXT_WBMAILER_SMTP_USERNAME' => $TEXT['WBMAILER_SMTP_USERNAME'],
+ 'TEXT_WBMAILER_SMTP_PASSWORD' => $TEXT['WBMAILER_SMTP_PASSWORD'],
+ 'MODE_SWITCH_WARNING' => $MESSAGE['SETTINGS']['MODE_SWITCH_WARNING'],
+ 'WORLD_WRITEABLE_WARNING' => $MESSAGE['SETTINGS']['WORLD_WRITEABLE_WARNING'],
+ 'TEXT_MODULE_ORDER' => $TEXT['MODULE_ORDER'],
+ 'TEXT_MAX_EXCERPT' => $TEXT['MAX_EXCERPT'],
+ 'TEXT_TIME_LIMIT' => $TEXT['TIME_LIMIT']
+ )
+ );
+
+// Parse template objects output
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+$admin->print_footer();
+
+?>
Index: branches/2.8.x/wb/framework/initialize.php
===================================================================
--- branches/2.8.x/wb/framework/initialize.php (revision 1240)
+++ branches/2.8.x/wb/framework/initialize.php (revision 1241)
@@ -1,35 +1,70 @@
+* Copyright (C) 2009, Website Baker Org. e.V.
+* http://start.websitebaker2.org/impressum-datenschutz.php
+* Copyright (C) 2004-2009, Ryan Djurovich
+*
+* About WebsiteBaker
+*
+* Website Baker is a PHP-based Content Management System (CMS)
+* designed with one goal in mind: to enable its users to produce websites
+* with ease.
+*
+*****************************************************************************
+*
+*****************************************************************************
+* LICENSE INFORMATION
+*
+* WebsiteBaker is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* WebsiteBaker is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* See the GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+****************************************************************************
+*
+* WebsiteBaker Extra Information
+*
+*
+*
+*
+*****************************************************************************/
+/**
+ *
+ * @category framework
+ * @package config
+ * @author Ryan Djurovich
+ * @copyright 2004-2009, Ryan Djurovich
+ * @copyright 2009-2010, Website Baker Org. e.V.
+ * @version $Id$
+ * @platform WebsiteBaker 2.8.x
+ * @requirements >= PHP 4.3.4
+ * @license http://www.gnu.org/licenses/gpl.html
+ *
+ */
-// $Id$
-
-/*
-
- Website Baker Project
- Copyright (C) 2004-2009, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-*/
-
//set_include_path(get_include_path() . PATH_SEPARATOR . WB_PATH);
if (file_exists(WB_PATH.'/framework/class.database.php')) {
-
+
require_once(WB_PATH.'/framework/class.database.php');
-
+
// Create database class
$database = new database();
@@ -125,7 +160,7 @@
} else {
define('TIME_FORMAT', DEFAULT_TIME_FORMAT);
}
-
+
// Set Theme dir
define('THEME_URL', WB_URL.'/templates/'.DEFAULT_THEME);
define('THEME_PATH', WB_PATH.'/templates/'.DEFAULT_THEME);
@@ -133,8 +168,8 @@
// extended wb_settings
define('EDIT_ONE_SECTION', true);
- define('EDITOR_WIDTH', 900);
+ define('EDITOR_WIDTH', 925); // no prozent
}
-?>
+?>
\ No newline at end of file
Index: branches/2.8.x/wb/modules/fckeditor/include.php
===================================================================
--- branches/2.8.x/wb/modules/fckeditor/include.php (revision 1240)
+++ branches/2.8.x/wb/modules/fckeditor/include.php (revision 1241)
@@ -1,28 +1,63 @@
+* Copyright (C) 2009, Website Baker Org. e.V.
+* http://start.websitebaker2.org/impressum-datenschutz.php
+* Copyright (C) 2004-2009, Ryan Djurovich
+*
+* About WebsiteBaker
+*
+* Website Baker is a PHP-based Content Management System (CMS)
+* designed with one goal in mind: to enable its users to produce websites
+* with ease.
+*
+*****************************************************************************
+*
+*****************************************************************************
+* LICENSE INFORMATION
+*
+* WebsiteBaker is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* WebsiteBaker is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* See the GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+****************************************************************************
+*
+* WebsiteBaker Extra Information
+*
+*
+*
+*
+*****************************************************************************/
+/**
+ *
+ * @category modules
+ * @package fckeditor
+ * @author Ryan Djurovich
+ * @copyright 2004-2009, Ryan Djurovich
+ * @copyright 2009-2010, Website Baker Org. e.V.
+ * @version $Id$
+ * @platform WebsiteBaker 2.8.x
+ * @requirements >= PHP 4.3.4
+ * @license http://www.gnu.org/licenses/gpl.html
+ *
+ */
-// $Id$
-
-/*
-
- Website Baker Project
- Copyright (C) 2004-2009, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-*/
-
function reverse_htmlentities($mixed) {
$mixed = str_replace(array('>','<','"','&'), array('>','<','"','&'), $mixed);
return $mixed;
@@ -113,7 +148,7 @@
if(defined('EDITOR_WIDTH'))
{
- $width = ($width < EDITOR_WIDTH) ? EDITOR_WIDTH : $width;
+ $width = ( ($width > EDITOR_WIDTH ) OR (EDITOR_WIDTH <= 0) ) ? $width : EDITOR_WIDTH;
}
$oFCKeditor->Value = reverse_htmlentities($content);
Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/fckconfig.js
===================================================================
--- branches/2.8.x/wb/modules/fckeditor/fckeditor/fckconfig.js (revision 1240)
+++ branches/2.8.x/wb/modules/fckeditor/fckeditor/fckconfig.js (revision 1241)
@@ -51,7 +51,7 @@
FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ;
// FCKConfig.Plugins.Add( 'autogrow' ) ;
-// FCKConfig.Plugins.Add( 'dragresizetable' );
+FCKConfig.Plugins.Add( 'dragresizetable' );
FCKConfig.AutoGrowMax = 400 ;
// FCKConfig.ProtectedSource.Add( /<%[\s\S]*?%>/g ) ; // ASP style server side code <%...%>