Index: trunk/CHANGELOG =================================================================== --- trunk/CHANGELOG (revision 932) +++ trunk/CHANGELOG (revision 933) @@ -12,6 +12,7 @@ ------------------------------------- 2.8.0 ------------------------------------- 16-Feb-2009 Christian Sommer +! moved reload option of Add-ons to main Add-on section ! reworked logout to reset possible remember key in database when logging out 15-Feb-2009 Christian Sommer # fixed bug with smart login option (remember me) (ticket #689) Index: trunk/wb/admin/templates/reload.php =================================================================== --- trunk/wb/admin/templates/reload.php (revision 932) +++ trunk/wb/admin/templates/reload.php (nonexistent) @@ -1,84 +0,0 @@ - - * 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 -*/ - -// include WB configuration file and WB admin class -require_once('../../config.php'); -require_once('../../framework/class.admin.php'); - -// check user permissions for admintools (redirect users with wrong permissions) -$admin = new admin('Admintools', 'admintools', false, false); -if ($admin->get_permission('admintools') == false) die(header('Location: ../../index.php')); - -// check if the referer URL if available -$referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : - (isset($HTTP_SERVER_VARS['HTTP_REFERER']) ? $HTTP_SERVER_VARS['HTTP_REFERER'] : ''); - -// if referer is set, check if script was invoked from "admin/modules/index.php" -$required_url = '/admin/templates/index.php'; -if ($referer != '' && (!(strpos($referer, $required_url) !== false || strpos($referer, $required_url) !== false))) - die(header('Location: ../../index.php')); - -// include WB functions file -require_once(WB_PATH . '/framework/functions.php'); - -// load WB language file -require_once(WB_PATH . '/languages/' . LANGUAGE .'.php'); - -// create Admin object with admin header -$admin = new admin('Addons', '', true, false); -$js_back = ADMIN_URL . '/templates/index.php'; - -// reload template information from template "info.php" files -if ($handle = opendir(WB_PATH . '/templates/')) { - // remove all templates from database - $table = TABLE_PREFIX . 'addons'; - $sql = "DELETE FROM $table WHERE `type` = 'template'"; - $database->query($sql); - - // loop over all templates - while(false !== ($file = readdir($handle))) { - if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'index.php') { - load_template(WB_PATH . '/templates/' . $file); - } - } - closedir($handle); - // output success message - $admin->print_success($MESSAGE['ADDON']['TEMPLATES_RELOADED'], $js_back); - -} else { - // output error message - $admin->print_error($MESSAGE['ADDON']['ERROR_RELOAD'], $js_back); -} - -?> \ No newline at end of file Property changes on: trunk/wb/admin/templates/reload.php ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Index: trunk/wb/admin/templates/index.php =================================================================== --- trunk/wb/admin/templates/index.php (revision 932) +++ trunk/wb/admin/templates/index.php (revision 933) @@ -54,9 +54,6 @@ if($admin->get_permission('templates_view') != true) { $template->set_var('DISPLAY_LIST', 'hide'); } -if($admin->get_permission('admintools') != true) { - $template->set_var('DISPLAY_RELOAD', 'hide'); -} // Insert language headings $template->set_var(array( @@ -75,10 +72,7 @@ 'TEXT_UNINSTALL' => $TEXT['UNINSTALL'], 'TEXT_VIEW_DETAILS' => $TEXT['VIEW_DETAILS'], 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], - 'CHANGE_TEMPLATE_NOTICE' => $MESSAGE['TEMPLATES']['CHANGE_TEMPLATE_NOTICE'], - 'TXT_ADMIN_SETTINGS' => $TEXT['ADMIN'] . '-' . $TEXT['SETTINGS'], - 'TEXT_RELOAD_ADDON' => $MESSAGE['ADDON']['RELOAD'], - 'TEXT_RELOAD' => $TEXT['RELOAD'] + 'CHANGE_TEMPLATE_NOTICE' => $MESSAGE['TEMPLATES']['CHANGE_TEMPLATE_NOTICE'] ) ); Index: trunk/wb/admin/templates/template.html =================================================================== --- trunk/wb/admin/templates/template.html (revision 932) +++ trunk/wb/admin/templates/template.html (revision 933) @@ -76,14 +76,4 @@
-
-
- -

{TXT_ADMIN_SETTINGS}

-

{TEXT_RELOAD_ADDON}

- - -
-
- \ No newline at end of file Index: trunk/wb/admin/languages/reload.php =================================================================== --- trunk/wb/admin/languages/reload.php (revision 932) +++ trunk/wb/admin/languages/reload.php (nonexistent) @@ -1,84 +0,0 @@ - - * 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 -*/ - -// include WB configuration file and WB admin class -require_once('../../config.php'); -require_once('../../framework/class.admin.php'); - -// check user permissions for admintools (redirect users with wrong permissions) -$admin = new admin('Admintools', 'admintools', false, false); -if ($admin->get_permission('admintools') == false) die(header('Location: ../../index.php')); - -// check if the referer URL if available -$referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : - (isset($HTTP_SERVER_VARS['HTTP_REFERER']) ? $HTTP_SERVER_VARS['HTTP_REFERER'] : ''); - -// if referer is set, check if script was invoked from "admin/modules/index.php" -$required_url = '/admin/languages/index.php'; -if ($referer != '' && (!(strpos($referer, $required_url) !== false || strpos($referer, $required_url) !== false))) - die(header('Location: ../../index.php')); - -// include WB functions file -require_once(WB_PATH . '/framework/functions.php'); - -// load WB language file -require_once(WB_PATH . '/languages/' . LANGUAGE .'.php'); - -// create Admin object with admin header -$admin = new admin('Addons', '', true, false); -$js_back = ADMIN_URL . '/languages/index.php'; - -// reload template information from language "info.php" files -if ($handle = opendir(WB_PATH . '/languages/')) { - // remove all languages from database - $table = TABLE_PREFIX . 'addons'; - $sql = "DELETE FROM $table WHERE `type` = 'language'"; - $database->query($sql); - - // loop over all languages - while(false !== ($file = readdir($handle))) { - if($file != '' && substr($file, 0, 1) != '.' && $file != 'index.php') { - load_language(WB_PATH . '/languages/' . $file); - } - } - closedir($handle); - // output success message - $admin->print_success($MESSAGE['ADDON']['LANGUAGES_RELOADED'], $js_back); - -} else { - // output error message - $admin->print_error($MESSAGE['ADDON']['ERROR_RELOAD'], $js_back); -} - -?> \ No newline at end of file Property changes on: trunk/wb/admin/languages/reload.php ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Index: trunk/wb/admin/languages/index.php =================================================================== --- trunk/wb/admin/languages/index.php (revision 932) +++ trunk/wb/admin/languages/index.php (revision 933) @@ -54,9 +54,6 @@ if($admin->get_permission('languages_view') != true) { $template->set_var('DISPLAY_LIST', 'hide'); } -if($admin->get_permission('admintools') != true) { - $template->set_var('DISPLAY_RELOAD', 'hide'); -} // Insert language headings $template->set_var(array( @@ -74,10 +71,7 @@ 'TEXT_INSTALL' => $TEXT['INSTALL'], 'TEXT_UNINSTALL' => $TEXT['UNINSTALL'], 'TEXT_VIEW_DETAILS' => $TEXT['VIEW_DETAILS'], - 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], - 'TXT_ADMIN_SETTINGS' => $TEXT['ADMIN'] . '-' . $TEXT['SETTINGS'], - 'TEXT_RELOAD_ADDON' => $MESSAGE['ADDON']['RELOAD'], - 'TEXT_RELOAD' => $TEXT['RELOAD'] + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'] ) ); Index: trunk/wb/admin/languages/template.html =================================================================== --- trunk/wb/admin/languages/template.html (revision 932) +++ trunk/wb/admin/languages/template.html (revision 933) @@ -73,14 +73,4 @@
-
-
- -

{TXT_ADMIN_SETTINGS}

-

{TEXT_RELOAD_ADDON}

- - -
-
- \ No newline at end of file Index: trunk/wb/admin/addons/reload.php =================================================================== --- trunk/wb/admin/addons/reload.php (nonexistent) +++ trunk/wb/admin/addons/reload.php (revision 933) @@ -0,0 +1,153 @@ + + * 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 +*/ + +/** + * check if there is anything to do + */ +$post_check = array('reload_modules', 'reload_templates', 'reload_languages'); +foreach ($post_check as $index => $key) { + if (!isset($_POST[$key])) unset($post_check[$index]); +} +if (count($post_check) == 0) die(header('Location: index.php')); + +/** + * check if user has permissions to access this file + */ +// include WB configuration file and WB admin class +require_once('../../config.php'); +require_once('../../framework/class.admin.php'); + +// check user permissions for admintools (redirect users with wrong permissions) +$admin = new admin('Admintools', 'admintools', false, false); +if ($admin->get_permission('admintools') == false) die(header('Location: ../../index.php')); + +// check if the referer URL if available +$referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : + (isset($HTTP_SERVER_VARS['HTTP_REFERER']) ? $HTTP_SERVER_VARS['HTTP_REFERER'] : ''); + +// if referer is set, check if script was invoked from "admin/modules/index.php" +$required_url = ADMIN_URL . '/addons/index.php'; +if ($referer != '' && (!(strpos($referer, $required_url) !== false || strpos($referer, $required_url) !== false))) + die(header('Location: ../../index.php')); + +// include WB functions file +require_once(WB_PATH . '/framework/functions.php'); + +// load WB language file +require_once(WB_PATH . '/languages/' . LANGUAGE .'.php'); + +// create Admin object with admin header +$admin = new admin('Addons', '', true, false); +$js_back = ADMIN_URL . '/addons/index.php'; + +/** + * Reload all specified Addons + */ +$msg = array(); +$table = TABLE_PREFIX . 'addons'; + +foreach ($post_check as $key) { + switch ($key) { + case 'reload_modules': + if ($handle = opendir(WB_PATH . '/modules')) { + // delete modules from database + $sql = "DELETE FROM `$table` WHERE `type` = 'module'"; + $database->query($sql); + + // loop over all modules + while(false !== ($file = readdir($handle))) { + if ($file != '' && substr($file, 0, 1) != '.' && $file != 'admin.php' && $file != 'index.php') { + load_module(WB_PATH . '/modules/' . $file); + } + } + closedir($handle); + // add success message + $msg[] = $MESSAGE['ADDON']['MODULES_RELOADED']; + + } else { + // provide error message and stop + $admin->print_error($MESSAGE['ADDON']['ERROR_RELOAD'], $js_back); + } + break; + + case 'reload_templates': + if ($handle = opendir(WB_PATH . '/templates')) { + // delete templates from database + $sql = "DELETE FROM `$table` WHERE `type` = 'template'"; + $database->query($sql); + + // loop over all templates + while(false !== ($file = readdir($handle))) { + if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'index.php') { + load_template(WB_PATH . '/templates/' . $file); + } + } + closedir($handle); + // add success message + $msg[] = $MESSAGE['ADDON']['TEMPLATES_RELOADED']; + + } else { + // provide error message and stop + $admin->print_error($MESSAGE['ADDON']['ERROR_RELOAD'], $js_back); + } + break; + + case 'reload_languages': + if ($handle = opendir(WB_PATH . '/languages/')) { + // delete languages from database + $sql = "DELETE FROM `$table` WHERE `type` = 'language'"; + $database->query($sql); + + // loop over all languages + while(false !== ($file = readdir($handle))) { + if ($file != '' && substr($file, 0, 1) != '.' && $file != 'index.php') { + load_language(WB_PATH . '/languages/' . $file); + } + } + closedir($handle); + // add success message + $msg[] = $MESSAGE['ADDON']['LANGUAGES_RELOADED']; + + } else { + // provide error message and stop + $admin->print_error($MESSAGE['ADDON']['ERROR_RELOAD'], $js_back); + } + break; + } +} + +// output success message +$admin->print_success(implode($msg, '
'), $js_back); + +?> \ No newline at end of file Property changes on: trunk/wb/admin/addons/reload.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: trunk/wb/admin/addons/index.php =================================================================== --- trunk/wb/admin/addons/index.php (revision 932) +++ trunk/wb/admin/addons/index.php (revision 933) @@ -49,6 +49,9 @@ if($admin->get_permission('languages') != true) { $template->set_var('DISPLAY_LANGUAGES', 'none'); } +if($admin->get_permission('admintools') != true) { + $template->set_var('DISPLAY_RELOAD', 'none'); +} // Insert section names and descriptions $template->set_var(array( @@ -57,7 +60,11 @@ 'LANGUAGES' => $MENU['LANGUAGES'], 'MODULES_OVERVIEW' => $OVERVIEW['MODULES'], 'TEMPLATES_OVERVIEW' => $OVERVIEW['TEMPLATES'], - 'LANGUAGES_OVERVIEW' => $OVERVIEW['LANGUAGES'] + 'LANGUAGES_OVERVIEW' => $OVERVIEW['LANGUAGES'], + 'TXT_ADMIN_SETTINGS' => $TEXT['ADMIN'] . ' ' . $TEXT['SETTINGS'], + 'MESSAGE_RELOAD_ADDONS' => $MESSAGE['ADDON']['RELOAD'], + 'TEXT_RELOAD' => $TEXT['RELOAD'], + 'RELOAD_URL' => ADMIN_URL . '/addons/reload.php', ) ); Index: trunk/wb/admin/addons/template.html =================================================================== --- trunk/wb/admin/addons/template.html (revision 932) +++ trunk/wb/admin/addons/template.html (revision 933) @@ -42,7 +42,7 @@ - +
@@ -61,7 +61,7 @@
- +
@@ -80,7 +80,7 @@
- +
@@ -97,7 +97,36 @@
+ + + + + + + + + +
+ + + {TXT_ADMIN_SETTINGS} +
+
+ {MESSAGE_RELOAD_ADDONS}
+ + + + + + + + + + +
+
+ Index: trunk/wb/admin/modules/reload.php =================================================================== --- trunk/wb/admin/modules/reload.php (revision 932) +++ trunk/wb/admin/modules/reload.php (nonexistent) @@ -1,84 +0,0 @@ - - * 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 -*/ - -// include WB configuration file and WB admin class -require_once('../../config.php'); -require_once('../../framework/class.admin.php'); - -// check user permissions for admintools (redirect users with wrong permissions) -$admin = new admin('Admintools', 'admintools', false, false); -if ($admin->get_permission('admintools') == false) die(header('Location: ../../index.php')); - -// check if the referer URL if available -$referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : - (isset($HTTP_SERVER_VARS['HTTP_REFERER']) ? $HTTP_SERVER_VARS['HTTP_REFERER'] : ''); - -// if referer is set, check if script was invoked from "admin/modules/index.php" -$required_url = '/admin/modules/index.php'; -if ($referer != '' && (!(strpos($referer, $required_url) !== false || strpos($referer, $required_url) !== false))) - die(header('Location: ../../index.php')); - -// include WB functions file -require_once(WB_PATH . '/framework/functions.php'); - -// load WB language file -require_once(WB_PATH . '/languages/' . LANGUAGE .'.php'); - -// create Admin object with admin header -$admin = new admin('Addons', '', true, false); -$js_back = ADMIN_URL . '/modules/index.php'; - -// reload module information from module "info.php" files -if ($handle = opendir(WB_PATH . '/modules/')) { - // remove all modules from database - $table = TABLE_PREFIX . 'addons'; - $sql = "DELETE FROM $table WHERE `type` = 'module'"; - $database->query($sql); - - // loop over all modules - while(false !== ($file = readdir($handle))) { - if ($file != '' && substr($file, 0, 1) != '.' && $file != 'admin.php' && $file != 'index.php') { - load_module(WB_PATH.'/modules/'.$file); - } - } - closedir($handle); - // output success message - $admin->print_success($MESSAGE['ADDON']['MODULES_RELOADED'], $js_back); - -} else { - // output error message - $admin->print_error($MESSAGE['ADDON']['ERROR_RELOAD'], $js_back); -} - -?> \ No newline at end of file Property changes on: trunk/wb/admin/modules/reload.php ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Index: trunk/wb/admin/modules/index.php =================================================================== --- trunk/wb/admin/modules/index.php (revision 932) +++ trunk/wb/admin/modules/index.php (revision 933) @@ -54,9 +54,6 @@ if($admin->get_permission('modules_view') != true) { $template->set_var('DISPLAY_LIST', 'hide'); } -if($admin->get_permission('admintools') != true) { - $template->set_var('DISPLAY_RELOAD', 'hide'); -} // Insert language headings $template->set_var(array( @@ -74,10 +71,7 @@ 'TEXT_INSTALL' => $TEXT['INSTALL'], 'TEXT_UNINSTALL' => $TEXT['UNINSTALL'], 'TEXT_VIEW_DETAILS' => $TEXT['VIEW_DETAILS'], - 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], - 'TXT_ADMIN_SETTINGS' => $TEXT['ADMIN'] . '-' . $TEXT['SETTINGS'], - 'TEXT_RELOAD_ADDON' => $MESSAGE['ADDON']['RELOAD'], - 'TEXT_RELOAD' => $TEXT['RELOAD'] + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'] ) ); Index: trunk/wb/admin/modules/template.html =================================================================== --- trunk/wb/admin/modules/template.html (revision 932) +++ trunk/wb/admin/modules/template.html (revision 933) @@ -73,14 +73,4 @@
-
-
- -

{TXT_ADMIN_SETTINGS}

-

{TEXT_RELOAD_ADDON}

- - -
-
- \ No newline at end of file Index: trunk/wb/languages/FI.php =================================================================== --- trunk/wb/languages/FI.php (revision 932) +++ trunk/wb/languages/FI.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Rajoitus voimassa, yritä tunnin kuluttua uudelleen'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'Tarkistusluku (Captcha) virheellinen '; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Moduulin lataus onnistui'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Sivupohjan lataus onnistui'; Index: trunk/wb/languages/EN.php =================================================================== --- trunk/wb/languages/EN.php (revision 932) +++ trunk/wb/languages/EN.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Sorry, this form has been submitted too many times so far this hour. Please retry in the next hour.'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email: '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Modules reloaded successfully'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Templates reloaded successfully'; Index: trunk/wb/languages/CS.php =================================================================== --- trunk/wb/languages/CS.php (revision 932) +++ trunk/wb/languages/CS.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Omlouváme se, ale tento formulář dosáhl limitu povolených odeslání pro tuto hodinu. Prosím zkuste to znovu v další hodině..'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'Kontrolní kód (známý jako Captcha) neodpovídá. Pokud máte problémy s přečtením tohoto kódu, kontaktujte '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Moduly byly úspěšně přehrány'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Šablony byly úspěšně přehrány'; Index: trunk/wb/languages/SE.php =================================================================== --- trunk/wb/languages/SE.php (revision 932) +++ trunk/wb/languages/SE.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Tyvärr, detta formulär har skickats för många gånger inom denna timme. Försök igen om ett tag.'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'Verifieringsnumret (också känt som Captcha) som du angav är felaktigt. Om du har problem med att läsa ut Captcha, vänligen sänd email till: '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Moduler laddades om'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Mallar laddades om'; Index: trunk/wb/languages/ES.php =================================================================== --- trunk/wb/languages/ES.php (revision 932) +++ trunk/wb/languages/ES.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Disculpe este formulario ha sido enviado demasiadas veces seguidas. Vuelva a intentarlo en una hora.'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'El número de verificación que ha introducido es incorrecto. Si estás teniendo problemas leyéndolo, por favor, envíe un e-mail a: '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Módulos recargados correctamente'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Plantillas recargadas correctamente'; Index: trunk/wb/languages/FR.php =================================================================== --- trunk/wb/languages/FR.php (revision 932) +++ trunk/wb/languages/FR.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Désolé mais vous avez utilisé ce formulaire trop de fois durant cette heure. Merci de réessayer à l\'heure suivante'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'Le numéro de vérification (Captcha) que vous avez entré est incorrect. Si vous rencontrez des problèmes quant à la lecture de ce numéro, merci d\'envoyer un email à : '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Modules réinstallés avec succès'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Modèles réinstallés avec succès'; Index: trunk/wb/languages/ET.php =================================================================== --- trunk/wb/languages/ET.php (revision 932) +++ trunk/wb/languages/ET.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Vabandame, see vorm on juba liiga palju kordi selle tunni jooksul saadetud. Palun proovi järgmine tund uuesti.'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email: '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Modules reloaded successfully'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Templates reloaded successfully'; Index: trunk/wb/languages/HR.php =================================================================== --- trunk/wb/languages/HR.php (revision 932) +++ trunk/wb/languages/HR.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Ova forma je pregledavana previše puta u jednom satu. Molimo pokušajte slijedeæi sat.'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'Broj provjere (poznat kao Captcha) netoèno je unešen. Ako imate problema s èitanjem Captcha, molimo pošaljite email: '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Uspješno nasnimljeni moduli'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Uspješno nasnimljeni predlošci'; Index: trunk/wb/languages/NL.php =================================================================== --- trunk/wb/languages/NL.php (revision 932) +++ trunk/wb/languages/NL.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Sorry, dit formulier is te vaak verstuurd binnen dit uur. Probeert u het over een uur nog eens.'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'Het verificatienummer (ook wel Captcha genoemd) dat u hebt ingevoerd is incorrect. Als u de Captcha niet goed kunt lezen, stuur dan een e-mail naar: '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Modules succesvol herladen'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Templates succesvol herladen'; Index: trunk/wb/languages/PL.php =================================================================== --- trunk/wb/languages/PL.php (revision 932) +++ trunk/wb/languages/PL.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Niestety, ten formularz został wysłany zbyt wiele razy w ciągu tej godziny. Prosimy spróbować ponownie za godzinę.'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'Wprowadzony numer weryfikacyjny (tzw. Captcha) jest nieprawidłowy. Jeśli masz problemy z odczytaniem Captcha, napisz do: '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Moduły zostały załadowane ponownie'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Szablony zostały załadowane ponownie'; Index: trunk/wb/languages/HU.php =================================================================== --- trunk/wb/languages/HU.php (revision 932) +++ trunk/wb/languages/HU.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Sajnáljuk, de ez az ûrlap túl sokszor lett kitöltve egy óran belül! Kérem próbálja meg egy óra múlva.'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email: '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Modules reloaded successfully'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Templates reloaded successfully'; Index: trunk/wb/languages/IT.php =================================================================== --- trunk/wb/languages/IT.php (revision 932) +++ trunk/wb/languages/IT.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Spiacente: hai compilato questa form troppe volte nell\'ultima ora.'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'Il numero di controllo (chiama Captcha) che hai inserito non è valido. Se hai problemi con la lettura del Captcha, invia un email email: '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Moduli ricaricati con successo'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Templates ricaricati con successo'; Index: trunk/wb/languages/NO.php =================================================================== --- trunk/wb/languages/NO.php (revision 932) +++ trunk/wb/languages/NO.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Beklager, denne form har blitt sendt for mange ganger denne timen. Vennligst prøv igjen neste time.'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'Bekreftelsesnummeret (også kjent som Captcha) som du skrev inn er feil. Hvis du har problemer med å lese Captcha, vennligst kontakt: '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Lykkes i å oppdatere moduler'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Lykkes i å oppdatere maler'; Index: trunk/wb/languages/LV.php =================================================================== --- trunk/wb/languages/LV.php (revision 932) +++ trunk/wb/languages/LV.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Atvaino, ši forma ir tikusi aizpildita parak daudz reižu šis stundas laika. Ludzu pamegini velreiz pec stundas.'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'Ievaditais parbaudes numurs ir nepareizs. Ja radušas problemas ar parbaudes koda nolasišanu, suti zinu uz: '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Moduli veiksmigi parladeti'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'šabloni veiksmigi parladeti'; Index: trunk/wb/languages/CA.php =================================================================== --- trunk/wb/languages/CA.php (revision 932) +++ trunk/wb/languages/CA.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Ho sentim, aquest formulari ha estat enviat massa vegades durant l\'última hora. Per favor torneu-ho a intentar d\'ací una hora.'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email: '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Modules reloaded successfully'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Templates reloaded successfully'; Index: trunk/wb/languages/PT.php =================================================================== --- trunk/wb/languages/PT.php (revision 932) +++ trunk/wb/languages/PT.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Desculpe, este formulário foi submetido várias vezes nessa hora. Favor tentar novamente dentro de uma hora.'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'O Número de Verifica&ccdil;ão (conhecido como Captcha) que você entrou, é inválido. Se estiver tendo problemas usando o Captcha, envie uma mensagem para: '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Módulos recarregados com sucesso'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Temas (Templates) recarregados com sucesso'; Index: trunk/wb/languages/DA.php =================================================================== --- trunk/wb/languages/DA.php (revision 932) +++ trunk/wb/languages/DA.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Beklager! Denne formular er blevet afsendt for mange gange indenfor den sidste time, og du vil derfor blive afvist - Prøv igen om en times tid!'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'Verifikations tallene (også kendt som Captcha) som du tastede er ikke korrekte. Hvis du har problemer med at læse Captha tallene, så kontakt venligst sidens Administrator på denne mailadresse: '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Moduler opdateret med succes'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Templates opdateret med succes'; Index: trunk/wb/languages/TR.php =================================================================== --- trunk/wb/languages/TR.php (revision 932) +++ trunk/wb/languages/TR.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Sorry, this form has been submitted too many times so far this hour. Please retry in the next hour.'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email: '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Modül, baþarýlý bir þekildeninkini tekrar yüklendi'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Kalýplar, baþarýlý bir þekildeninkini tekrar yüklendi'; Index: trunk/wb/languages/RU.php =================================================================== --- trunk/wb/languages/RU.php (revision 932) +++ trunk/wb/languages/RU.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Извините, слишком много сообщений за последний час. Пожалуйста попробуйте повторить отправку через некоторое время.'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'Код подтверждения введен неверно. Если вы не можете прочесть код, пожалуйста сообщите разработчикам: '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Модули перезагружены успешно'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Шаблоны перезагружены успешно'; Index: trunk/wb/languages/DE.php =================================================================== --- trunk/wb/languages/DE.php (revision 932) +++ trunk/wb/languages/DE.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Dieses Formular wurde zu oft aufgerufen. Bitte versuchen Sie es in einer Stunde noch einmal.'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'Die eingegebene Prüfziffer stimmt nicht überein. Wenn Sie Probleme mit dem Lesen der Prüfziffer haben, bitte schreiben Sie eine E-Mail an uns: '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'Nachfolgende Schaltfläche gleicht die Informationen der Datenbank mit den Daten der Addon Dateien "info.php" ab. Dies kann notwendig sein, wenn Addons über FTP hochgeladen wurden.'; +$MESSAGE['ADDON']['RELOAD'] = 'Abgleich der Datenbank mit den Informationen aus den Addon-Dateien (z.B. nach FTP Upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Fehler beim Abgleich der Addon Informationen.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Module erfolgreich geladen'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Designvorlagen erfolgreich geladen'; Index: trunk/wb/languages/BG.php =================================================================== --- trunk/wb/languages/BG.php (revision 932) +++ trunk/wb/languages/BG.php (revision 933) @@ -586,7 +586,7 @@ $MESSAGE['MOD_FORM']['EXCESS_SUBMISSIONS'] = 'Съжаляваме, този форуляр е подаден повече пъти от позволеното през този час. Опитайте отнове по време на следващи час.'; $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'] = 'Контролния номер (позант като Captcha) е грешен. Ако имате проблем с четенето на Captcha, изпратете e-mail на: '.SERVER_EMAIL.''; -$MESSAGE['ADDON']['RELOAD'] = 'The button below updates the information in the database with the data stored in the Add-On "info.php" files. This may be required if you have uploaded Addons via FTP.'; +$MESSAGE['ADDON']['RELOAD'] = 'Update database with information from Add-on files (e.g. after FTP upload).'; $MESSAGE['ADDON']['ERROR_RELOAD'] = 'Error while updating the Add-On information.'; $MESSAGE['ADDON']['MODULES_RELOADED'] = 'Modules reloaded successfully'; $MESSAGE['ADDON']['TEMPLATES_RELOADED'] = 'Templates reloaded successfully';