Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php (revision 1766)
+++ branches/2.8.x/wb/admin/interface/version.php (revision 1767)
@@ -51,5 +51,5 @@
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
if(!defined('VERSION')) define('VERSION', '2.8.3');
-if(!defined('REVISION')) define('REVISION', '1766');
+if(!defined('REVISION')) define('REVISION', '1767');
if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/admin/settings/save.php
===================================================================
--- branches/2.8.x/wb/admin/settings/save.php (revision 1766)
+++ branches/2.8.x/wb/admin/settings/save.php (revision 1767)
@@ -24,6 +24,7 @@
// Print admin header
require('../../config.php');
require_once(WB_PATH.'/framework/class.admin.php');
+require_once(WB_PATH.'/framework/functions.php');
// suppress to print the header, so no new FTAN will be set
if($advanced == '')
@@ -154,9 +155,11 @@
}
$allow_tags_in_fields = array('website_header', 'website_footer','website_signature');
-$allow_empty_values = array('website_header','website_footer','pages_directory','page_spacer','website_signature,page_icon_dir');
+$allow_empty_values = array('website_header','website_footer','pages_directory','page_spacer','website_signature,page_icon_dir','modules_upgrade_list');
$disallow_in_fields = array('pages_directory', 'media_directory','wb_version');
+$bRebuildAccessFiles = ( (isset( $_POST['rebuild_access_files']) && ( $_POST['rebuild_access_files'] == true )) ? true : false ) ;
+
// Query current settings in the db, then loop through them and update the db with the new value
$settings = array();
$old_settings = array();
@@ -168,8 +171,8 @@
$passed = false;
while($setting = $res_settings->fetchRow())
{
- $old_settings[$setting['name']] = $setting['value'];
$setting_name = $setting['name'];
+ $old_settings[$setting_name] = $setting['value'];
$value = $admin->get_post($setting_name);
$value = isset($_POST[$setting_name]) ? $value : $old_settings[$setting_name] ;
switch ($setting_name) {
@@ -184,11 +187,20 @@
case 'string_file_mode':
$value=$file_mode;
$passed = true;
- break;
+ break;
case 'sec_anchor':
$value=(($value=='') ? 'section_' : $value);
$passed = true;
+ break;
case 'pages_directory':
+ $bNewPageFile = ( ( $value!= $old_settings['pages_directory'] ) ? true : false );
+ $passed = $bNewPageFile;
+ $sGetId = '&id='.$bNewPageFile;
+// if(!is_dir(WB_PATH.$value) && is_writable(WB_PATH)) {
+// $passed = make_dir(WB_PATH.$value);
+// }
+ $value = (($passed == true) ? $value : $old_settings['pages_directory']);
+ $sPageDirectory = $value;
break;
case 'wbmailer_smtp_auth':
// $value = isset($_POST[$setting_name]) ? $_POST[$setting_name] : '' ;
@@ -200,6 +212,7 @@
break;
}
+
if (!in_array($setting_name, $allow_tags_in_fields))
{
$value = strip_tags($value);
@@ -212,7 +225,6 @@
$sql .= 'SET `value` = \''.$value.'\' ';
$sql .= 'WHERE `name` != \'wb_version\' ';
$sql .= 'AND `name` = \''.$setting_name.'\' ';
-
if (!$database->query($sql))
{
if($database->is_error()) {
@@ -221,6 +233,13 @@
}
}
}
+
+ if(($bRebuildAccessFiles==true) && ($_POST['modules_upgrade_list']!='') && ($sPageDirectory==$old_settings['pages_directory']) ) {
+ rebuild_all_accessfiles();
+ $aModuleList = ( explode(',', $_POST['modules_upgrade_list']));
+ upgrade_modules($aModuleList);
+ }
+
}
// Query current search settings in the db, then loop through them and update the db with the new value
Index: branches/2.8.x/wb/admin/settings/languages/EN.php
===================================================================
--- branches/2.8.x/wb/admin/settings/languages/EN.php (revision 1766)
+++ branches/2.8.x/wb/admin/settings/languages/EN.php (revision 1767)
@@ -7,5 +7,9 @@
$TEXT['WEBSITE_SIGNATURE'] = 'Contact Signature';
$TEXT['PAGE_EXTENDED'] = 'Extended Pagesettings';
-$TEXT['CONFIRMED_REGISTRATION'] = 'Activation-Mail';
+$TEXT['CONFIRMED_REGISTRATION'] = 'Register with Activation-Mail';
+$TEXT['REBUILD_ACCESS_FILES'] = 'Rebuild Accessfiles';
+$TEXT['MODULES_DIRECTORY'] = 'Modules for upgrade';
$HELP['ACTIVATION_MAIL'] = 'Registration per Activation-Mail (Enabled) or Directregistration (Disabled)';
+$HELP['REBUILD_ACCESS_FILES'] = '- Modules listet in the next field, will be upgraded too, (Comma separate list)';
+//
Index: branches/2.8.x/wb/admin/settings/languages/DE.php
===================================================================
--- branches/2.8.x/wb/admin/settings/languages/DE.php (revision 1766)
+++ branches/2.8.x/wb/admin/settings/languages/DE.php (revision 1767)
@@ -8,5 +8,9 @@
$TEXT['WEBSITE_SIGNATURE'] = 'Kontakt Signature';
$TEXT['PAGE_EXTENDED'] = 'Erweiterte Seiteneinstellungen';
-$TEXT['CONFIRMED_REGISTRATION'] = 'Aktivierungs-Mail';
+$TEXT['CONFIRMED_REGISTRATION'] = 'Registrierung mit Aktivierungs-Mail';
+$TEXT['REBUILD_ACCESS_FILES'] = 'Zugriffsdateien aktualiseren';
+$TEXT['MODULES_DIRECTORY'] = 'Module für Aktualisierung';
$HELP['ACTIVATION_MAIL'] = 'Registrierung per Aktivierungs-Mail (Eingeschaltet) oder Direktregistrierung (Ausgeschaltet)';
+$HELP['REBUILD_ACCESS_FILES'] = '- Aktualisiert auch nachfolgend eingetragene geprüfte Module, (Komma getrennte Liste)';
+//
Index: branches/2.8.x/wb/admin/settings/index.php
===================================================================
--- branches/2.8.x/wb/admin/settings/index.php (revision 1766)
+++ branches/2.8.x/wb/admin/settings/index.php (revision 1767)
@@ -28,6 +28,7 @@
$cfg = array(
'website_signature' => defined('WEBSITE_SIGNATURE') ? WEBSITE_SIGNATURE : '',
'confirmed_registration' => (defined('CONFIRMED_REGISTRATION') ? CONFIRMED_REGISTRATION : '0'),
+ 'modules_upgrade_list' => (defined('MODULES_UPGRADE_LIST') ? MODULES_UPGRADE_LIST : ''),
);
db_update_key_value( 'settings', $cfg );
@@ -40,7 +41,7 @@
// Setup template object, parse vars to it, then parse it
// Create new template object
-$template = new Template(dirname($admin->correct_theme_source('settings.htt')));
+$template = new Template(dirname($admin->correct_theme_source('settings.htt')),'keep');
// $template->debug = true;
$template->set_file('page', 'settings.htt');
$template->set_block('page', 'main_block', 'main');
@@ -70,7 +71,7 @@
$template->set_block('main_block', 'show_search_block', 'show_search');
$template->set_block('main_block', 'show_redirect_timer_block', 'show_redirect_timer');
/*-- insert all needed vars from language files ----------------------------------------*/
- $template->set_var($mLang->getLangArray());
+$template->set_var($mLang->getLangArray());
// Query current settings in the db, then loop through them and print them
$query = "SELECT * FROM ".TABLE_PREFIX."settings";
@@ -783,6 +784,7 @@
$template->set_var(array(
'PAGES_DIRECTORY' => PAGES_DIRECTORY,
+ 'MODULES_DIRECTORY' => MODULES_UPGRADE_LIST,
'PAGE_ICON_DIR' => PAGE_ICON_DIR,
'MEDIA_DIRECTORY' => MEDIA_DIRECTORY,
'PAGE_EXTENSION' => PAGE_EXTENSION,
@@ -951,5 +953,5 @@
// Parse template objects output
$template->parse('main', 'main_block', false);
$template->pparse('output', 'page');
-
+unset($template);
$admin->print_footer();