From 19b197c32c96ce8eea26561fb7b40e87c57716ae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 28 Jun 2010 05:14:11 +0000 Subject: [PATCH] New extension added, more EL-rewrites, naming-convention applied: - New extension 'ext-timezone' added to more easilier change the timezone this installation runs with. It is essential to install this extension and keep it active. - Even more rewrites to make use of EL - theme_ver is outdated, we use theme_version (no short-cutted texts) - TODOs.txt updated --- .gitattributes | 5 + DOCS/TODOs.txt | 9 +- DOCS/prop-set.sh | 1 + inc/config-global.php | 5 - inc/extensions-functions.php | 5 +- inc/extensions/ext-sql_patches.php | 12 +- inc/extensions/ext-theme.php | 13 +- inc/extensions/ext-timezone.php | 111 ++++++++++++ inc/language/timezone_de.php | 52 ++++++ inc/libs/theme_functions.php | 4 +- inc/libs/timezone_functions.php | 55 ++++++ inc/modules/admin/what-config_proxy.php | 8 - inc/modules/admin/what-config_timezone.php | 57 +++++++ inc/modules/admin/what-theme_check.php | 158 +----------------- inc/modules/admin/what-theme_edit.php | 17 +- inc/modules/admin/what-theme_import.php | 21 ++- inc/modules/member/what-themes.php | 16 +- .../de/html/admin/admin_config_proxy.tpl | 8 +- .../de/html/admin/admin_config_timezone.tpl | 25 +++ templates/de/html/admin/admin_list_theme.tpl | 26 +-- .../de/html/admin/admin_list_theme_row.tpl | 14 +- .../de/html/admin/admin_theme_edit_row.tpl | 2 +- .../de/html/admin/admin_theme_import_row.tpl | 10 +- templates/de/html/ext/ext_sql_patches.tpl | 3 +- templates/de/html/ext/ext_timezone.tpl | 3 + 25 files changed, 379 insertions(+), 261 deletions(-) create mode 100644 inc/extensions/ext-timezone.php create mode 100644 inc/language/timezone_de.php create mode 100644 inc/libs/timezone_functions.php create mode 100644 inc/modules/admin/what-config_timezone.php create mode 100644 templates/de/html/admin/admin_config_timezone.tpl create mode 100644 templates/de/html/ext/ext_timezone.tpl diff --git a/.gitattributes b/.gitattributes index f8c01dafc8..72a12c76df 100644 --- a/.gitattributes +++ b/.gitattributes @@ -260,6 +260,7 @@ inc/language/support_de.php -text inc/language/surfbar_de.php -text inc/language/task_de.php -text inc/language/theme_de.php -text +inc/language/timezone_de.php -text inc/language/top10_de.php -text inc/language/transfer_de.php -text inc/language/usage_de.php -text @@ -304,6 +305,7 @@ inc/libs/sponsor_functions.php -text inc/libs/surfbar_functions.php -text inc/libs/task_functions.php -text inc/libs/theme_functions.php -text +inc/libs/timezone_functions.php -text inc/libs/transfer_functions.php -text inc/libs/uberwach_functions.php -text inc/libs/user_functions.php -text @@ -413,6 +415,7 @@ inc/modules/admin/what-config_session.php -text inc/modules/admin/what-config_sponsor.php -text inc/modules/admin/what-config_stats.php -text inc/modules/admin/what-config_surfbar.php -text +inc/modules/admin/what-config_timezone.php -text inc/modules/admin/what-config_title.php -text inc/modules/admin/what-config_top10.php -text inc/modules/admin/what-config_transfer.php -text @@ -983,6 +986,7 @@ templates/de/html/admin/admin_config_sponsor.tpl -text templates/de/html/admin/admin_config_stats.tpl -text templates/de/html/admin/admin_config_sub_points.tpl -text templates/de/html/admin/admin_config_surfbar.tpl -text +templates/de/html/admin/admin_config_timezone.tpl -text templates/de/html/admin/admin_config_title.tpl -text templates/de/html/admin/admin_config_top10.tpl -text templates/de/html/admin/admin_config_transfer.tpl -text @@ -1368,6 +1372,7 @@ templates/de/html/ext/ext_support.tpl -text templates/de/html/ext/ext_surfbar.tpl -text templates/de/html/ext/ext_task.tpl -text templates/de/html/ext/ext_theme.tpl -text +templates/de/html/ext/ext_timezone.tpl -text templates/de/html/ext/ext_top10.tpl -text templates/de/html/ext/ext_transfer.tpl -text templates/de/html/ext/ext_uberwach.tpl -text diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 9fda182fd3..237437fde3 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -35,12 +35,12 @@ ./inc/extensions/ext-order.php:344: // @TODO This should be moved out to inc/reset/ ./inc/extensions/ext-rallye.php:331: // @TODO Move this code into rallye_functions.php ./inc/extensions/ext-rallye.php:94: // @TODO Fix config_rallye_prices to list_rallye_prices -./inc/extensions/ext-sql_patches.php:755: // @TODO Rewrite this to a filter +./inc/extensions/ext-sql_patches.php:763: // @TODO Rewrite this to a filter ./inc/extensions/ext-yoomedia.php:123: // @TODO Can this be moved into a database table? ./inc/extensions/ext-yoomedia.php:56:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y'); ./inc/extensions-functions.php:143: // @TODO Do we still need this? setExtensionUpdateNotes(''); -./inc/extensions-functions.php:423:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) ) -./inc/extensions-functions.php:539: // @TODO Extension is loaded, what next? +./inc/extensions-functions.php:422:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) ) +./inc/extensions-functions.php:538: // @TODO Extension is loaded, what next? ./inc/functions.php:1078:// @TODO $simple/$constants are deprecated ./inc/functions.php:1105: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates ./inc/functions.php:2382: // @TODO This can be easily moved out after the merge from EL branch to this is complete @@ -241,6 +241,9 @@ ./templates/de/html/surfbar/surfbar_frame_top.tpl:32:// @TODO Try to rewrite this JavaScript to js.php?js=surfbar_frame_top (wouldn't be easy) ### ### DEPRECATION FOLLOWS: ### ### ./inc/modules/admin/admin-inc.php:432:// @DEPRECATED +./inc/modules/admin/what-theme_check.php:2:// @DEPRECATED +./templates/de/html/admin/admin_list_theme_row.tpl:1: +./templates/de/html/admin/admin_list_theme.tpl:1: ### ### template-warnings.log follows: ### ### Warning: Not parsing JavaScript templates/de/html/js/js_order_send.tpl. Warning: Not parsing JavaScript templates/de/html/js/js_cookies_disabled.tpl. diff --git a/DOCS/prop-set.sh b/DOCS/prop-set.sh index c57b419b88..cfb62ece7f 100755 --- a/DOCS/prop-set.sh +++ b/DOCS/prop-set.sh @@ -3,4 +3,5 @@ find -type f -name "*.php" -exec svn propset svn:keywords "Author Id Revision HeadURL Date Tag" {} \; find -type f -name "*-" -exec svn propset svn:keywords "Author Id Revision HeadURL Date Tag" {} \; find -type f -name "*_" -exec svn propset svn:keywords "Author Id Revision HeadURL Date Tag" {} \; +find -type f -name "_*.php" -exec svn propset svn:keywords "Author Id Revision HeadURL Date Tag" {} \; find inc/phpmailer/ -type f -name "*.php" -exec svn propdel svn:keywords {} \; diff --git a/inc/config-global.php b/inc/config-global.php index 5c7110578e..2861f71424 100644 --- a/inc/config-global.php +++ b/inc/config-global.php @@ -46,11 +46,6 @@ if (!defined('__SECURITY')) { * PLEASE DO NOT EDIT THE COMMENTS! install.php NEEDS THEM! * ************************************************************************/ -if (function_exists('date_default_timezone_set')) { - // CFG: TIME-ZONE - @date_default_timezone_set('Europe/Berlin'); -} // END - if - // CFG: ERROR_REPORTING error_reporting(E_ALL | E_STRICT); diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php index a05bb7b4e1..06a2c16f56 100644 --- a/inc/extensions-functions.php +++ b/inc/extensions-functions.php @@ -377,11 +377,10 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru // In normal mode return a true on success $ret = true; } elseif (getExtensionDryRun() === true) { - // In "dry-run" mode return array with all SQL commands - $ret = getExtensionSqls(); + // In "dry-run" mode do always return a true + $ret = true; // Re-init queries and notes - initExtensionSqls(true); initExtensionNotes(); } else { // Extension has been removed for updates, so all is fine! diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index da81139181..4e644041ab 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -43,10 +43,10 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.7.0'); +setThisExtensionVersion('0.7.1'); // Version history array (add more with , '0.1.0' and so on) -setExtensionVersionHistory(array('0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0')); +setExtensionVersionHistory(array('0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1')); // Keep this extension always active! setExtensionAlwaysActive('Y'); @@ -733,6 +733,14 @@ INDEX (`ip`) // Update notes (these will be set as task text!) setExtensionUpdateNotes("IP-Resolver-Klasse hinzugefügt, um bei der Erweiterung ext-network DNS-Anfragen einzusparen."); break; + + case '0.7.1': // SQL queries for v0.7.1 + // This update just depends on ext-timezone to make integration of an essential extension much easier + addExtensionUpdateDependency('timezone'); + + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("Zeitzone ist nun mit ext-timezone konfigurierbar."); + break; } // END - switch break; diff --git a/inc/extensions/ext-theme.php b/inc/extensions/ext-theme.php index 8545512f33..10fff0feb6 100644 --- a/inc/extensions/ext-theme.php +++ b/inc/extensions/ext-theme.php @@ -43,10 +43,10 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.1.1'); +setThisExtensionVersion('0.1.2'); // Version history array (add more with , '0.1.0' and so on) -setExtensionVersionHistory(array('0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1')); +setExtensionVersionHistory(array('0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2')); switch (getExtensionMode()) { case 'register': // Do stuff when installation is running (modules.php?module=admin is called) @@ -136,7 +136,6 @@ INDEX (`theme_active`) addAdminMenuSql('theme', NULL, 'Themes','Verwalten Sie hier alle Designs (Themes) Ihres {OPEN_CONFIG}mt_word2{CLOSE_CONFIG}.', 8); addAdminMenuSql('theme','theme_import','Importieren','Es wird das Verzeichnis "theme" nach neuen Ordnern durchsucht und anschliessend in die Datenbank gesperrt aufgenommen.', 1); addAdminMenuSql('theme','theme_edit','Modifizieren','Ändern Sie Titel, Freigaben usw. an den Themes. Sie können bis auf das Standart-Theme "default" auch Themes aus der Datenbank entfernen. Vorher sollten Sie es jedoch vom Server löschen, damit es niht erneut importiert werden kann.', 2); - addAdminMenuSql('theme','theme_check','Prüfen','Nach neuen Themes suchen bzw. nach Updates zu den Themes suchen.', 3); // Guest menu addGuestMenuSql('themes',NULL,'Design-Auswahl','Y','N',4); @@ -177,6 +176,14 @@ INDEX (`theme_active`) // Update notes (these will be set as task text!) setExtensionUpdateNotes("Setzen des Mitgliedes' eigener Design-Auswahl per Filter (internes TODO)."); break; + + case '0.1.2': // SQL queries for v0.1.2 + // Remove deprecated menu + addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='theme_check' LIMIT 1"); + + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("Nicht mehr benötigtes Menü zum Prüfen von Theme-Versionen entfernt."); + break; } // END - switch break; diff --git a/inc/extensions/ext-timezone.php b/inc/extensions/ext-timezone.php new file mode 100644 index 0000000000..6346b02516 --- /dev/null +++ b/inc/extensions/ext-timezone.php @@ -0,0 +1,111 @@ + diff --git a/inc/language/timezone_de.php b/inc/language/timezone_de.php new file mode 100644 index 0000000000..94c0d47eec --- /dev/null +++ b/inc/language/timezone_de.php @@ -0,0 +1,52 @@ + "Konfiguration der Zeitzone", + 'ADMIN_CONFIG_TIMEZONE' => "Zeitzone einstellen (z.B. Europe/Berlin):", +)); + +// [EOF] +?> diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php index ef2d07b3aa..a6f61c9a37 100644 --- a/inc/libs/theme_functions.php +++ b/inc/libs/theme_functions.php @@ -122,9 +122,9 @@ function getThemeVersion ($name) { $cver = '?.?'; // Is the cache entry there? - if (isset($GLOBALS['cache_array']['themes']['theme_ver'][$name])) { + if (isset($GLOBALS['cache_array']['themes']['theme_version'][$name])) { // Get the version from cache - $cver = $GLOBALS['cache_array']['themes']['theme_ver'][$name]; + $cver = $GLOBALS['cache_array']['themes']['theme_version'][$name]; // Count up incrementStatsEntry('cache_hits'); diff --git a/inc/libs/timezone_functions.php b/inc/libs/timezone_functions.php new file mode 100644 index 0000000000..c00d3d60c9 --- /dev/null +++ b/inc/libs/timezone_functions.php @@ -0,0 +1,55 @@ + diff --git a/inc/modules/admin/what-config_proxy.php b/inc/modules/admin/what-config_proxy.php index 57f7a55e53..5566979b1c 100644 --- a/inc/modules/admin/what-config_proxy.php +++ b/inc/modules/admin/what-config_proxy.php @@ -55,14 +55,6 @@ if (isFormSent()) { loadTemplate('admin_settings_saved', false, getMessage('ADMIN_PROXY_SETTINGS_INVALID')); } } else { - // Prepare content - $content = array( - 'proxy_host' => getConfig('proxy_host'), - 'proxy_port' => getConfig('proxy_port'), - 'proxy_username' => getConfig('proxy_username'), - 'proxy_password' => getConfig('proxy_password'), - ); - // Load template loadTemplate('admin_config_proxy', false, $content); } diff --git a/inc/modules/admin/what-config_timezone.php b/inc/modules/admin/what-config_timezone.php new file mode 100644 index 0000000000..b7fea78575 --- /dev/null +++ b/inc/modules/admin/what-config_timezone.php @@ -0,0 +1,57 @@ + diff --git a/inc/modules/admin/what-theme_check.php b/inc/modules/admin/what-theme_check.php index 153d93a3a4..f551ef47b7 100644 --- a/inc/modules/admin/what-theme_check.php +++ b/inc/modules/admin/what-theme_check.php @@ -1,159 +1,3 @@ array(), // File names - 'fsize' => array(), // File size - 'fctime' => array(), // File creation timestamp - 'infos' => array(), // File informations (maybe loaded!) - 'ver' => array(), // Version number - 'cver' => array(), // Current version number - ); - - // Get count of theme_check for validation - $count = trim($response[count($response) - 2]); - foreach ($response as $idx => $value) { - $value = str_replace("\n", '', $value); $ver = ''; - - // Leave loop when data is invalid or EOF? - if ((substr($value, 0, 6) == 'theme-') && (substr($value, -4) == '.zip')) { - // Extract name and version - $name = substr($value, 6, -4); - $ver = trim(substr($response[$idx + 3], 4)); - - // Load version - $cver = getThemeVersion($name); - - // Is the theme already installed or not? - if (($ver != $cver) && ($cver != '?') && ($cver != '!')) { - // No, it isn't. So let's add this one! - $themes['fname'][] = $name; - $themes['fsize'][] = $response[$idx + 1]; - $themes['fctime'][] = $response[$idx + 2]; - $themes['ver'][] = $ver; - $themes['cver'][] = $cver; - - // Extract language strings from reponse - $langDummy = explode('[nl]', $response[$idx + 4]); - $languages = array(); - $themeInfo = getMessage('ADMIN_EXTENSION_NO_INFO_FOUND'); - - // Trim every data line - foreach ($langDummy as $k => $v) { - $v = trim($v); - if (substr($v, 3) == '') $v = '---'; - $langDummy[$k] = $v; - if ($v == 'xx:xx') break; - $languages[] = $v; - } // END - foreach - - // If language is found stop searching on matching line - foreach($languages as $search) { - if (substr($search, 0, 3) == (getLanguage().':')) { $themeInfo = substr($search, 3); break; } - } // END - foreach - - // Add informations to array - $themes['infos'][] = $themeInfo; - } // END - if - } // END - if - } // END - foreach - - // Ok, themes are on our server but maybe you have already installed them? - if (count($themes['fname']) > 0) { - // Sort array (I missed ver and cver here) - array_pk_sort($themes, array('cver', 'fname'), 0, 1); - - // Extensions where found which are not downloaded and installed - $OUT = ''; $SW = 2; $totalSize = '0'; - foreach ($themes['fname'] as $idx => $name) { - // Prepare data - $content = array( - 'sw' => $SW, - 'index' => ($idx + 1), - 'name' => $name, - 'created' => generateDateTime($themes['fctime'][$idx], 2), - 'size' => translateComma(round($themes['fsize'][$idx] / 1.024) / 1000), - 'version' => $themes['ver'][$idx], - 'current' => $themes['cver'][$idx], - 'infos' => $themes['infos'][$idx], - ); - - // Load row template - $OUT .= loadTemplate('admin_list_theme_row', true, $content); - - // Add total size - $totalSize += $themes['fsize'][$idx]; - - // Switch color - $SW = 3 - $SW; - } - $content['rows'] = $OUT; - $content['total'] = count($themes['fname']); - $content['kbytes'] = translateComma(round($totalSize / 1.024) / 1000); - - // Load template - loadTemplate('admin_list_theme', false, $content); - } else { - // All Themes are downloaded and installed - loadTemplate('admin_theme_installed', false, $count); - } -} else { - // No theme where found - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_THEME_NOTHING_FOUND')); -} - -// [EOF] +// @DEPRECATED ?> diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php index 88c6bea489..cab625416e 100644 --- a/inc/modules/admin/what-theme_edit.php +++ b/inc/modules/admin/what-theme_edit.php @@ -129,15 +129,14 @@ if (SQL_NUMROWS($result) > 0) { // Prepare data for the row template $content = array( - 'sw' => $SW, - 'id' => $content['id'], - 'link' => $LINK, - 'theme_name' => $content['theme_name'], - 'theme_active' => $content['theme_active'], - 'email' => '' . $GLOBALS['theme_data']['author'] . '', + 'url' => $GLOBALS['theme_data']['url'], + 'theme_version' => $content['theme_version'], ); // Load row template and switch color diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php index 070a64b4ad..3a1c48d912 100644 --- a/inc/modules/admin/what-theme_import.php +++ b/inc/modules/admin/what-theme_import.php @@ -99,7 +99,7 @@ $THEMES = array( 'theme_author' => array(), // Theme author's name 'theme_email' => array(), // Author's email address 'theme_url' => array(), // URL were you can download it from - 'theme_ver' => array(), // Version number of theme + 'theme_version' => array(), // Version number of theme ); // Read directory "themes" @@ -119,7 +119,7 @@ foreach ($includes as $inc) { $THEMES['theme_author'][] = $GLOBALS['theme_data']['author']; $THEMES['theme_email'][] = $GLOBALS['theme_data']['email']; $THEMES['theme_url'][] = $GLOBALS['theme_data']['url']; - $THEMES['theme_ver'][] = $GLOBALS['theme_data']['version']; + $THEMES['theme_version'][] = $GLOBALS['theme_data']['version']; } // END - while // Sort array by Uni* name @@ -139,15 +139,14 @@ foreach ($THEMES['theme_unix'] as $key => $unix) { // Prepare content $content = array( - 'sw' => $SW, - 'unix' => $unix, - 'name' => $THEMES['theme_name'][$key], - 'email' => $THEMES['theme_email'][$key], - 'author' => $THEMES['theme_author'][$key], - 'link' => generateDerefererUrl($THEMES['theme_url'][$key]), - 'url' => $THEMES['theme_url'][$key], - 'version' => $THEMES['theme_ver'][$key], - 'form' => $formContent + 'sw' => $SW, + 'unix' => $unix, + 'theme_name' => $THEMES['theme_name'][$key], + 'theme_email' => $THEMES['theme_email'][$key], + 'theme_author' => $THEMES['theme_author'][$key], + 'theme_url' => $THEMES['theme_url'][$key], + 'theme_version' => $THEMES['theme_version'][$key], + 'form_content' => $formContent ); // Add row template diff --git a/inc/modules/member/what-themes.php b/inc/modules/member/what-themes.php index b05034d6c0..4995716159 100644 --- a/inc/modules/member/what-themes.php +++ b/inc/modules/member/what-themes.php @@ -74,7 +74,7 @@ $THEMES = array( 'theme_author' => array(), // Theme author's name 'theme_email' => array(), // Author's email address 'theme_url' => array(), // URL were you can download it from - 'theme_ver' => array(), // Version number of theme + 'theme_version' => array(), // Version number of theme ); // Read directory "themes" @@ -91,12 +91,12 @@ foreach ($includes as $inc) { loadInclude($inc); // Add found theme to array - $THEMES['theme_unix'][] = $dir; - $THEMES['theme_name'][] = $GLOBALS['theme_data']['name']; - $THEMES['theme_author'][] = $GLOBALS['theme_data']['author']; - $THEMES['theme_email'][] = $GLOBALS['theme_data']['email']; - $THEMES['theme_url'][] = $GLOBALS['theme_data']['url']; - $THEMES['theme_ver'][] = $GLOBALS['theme_data']['version']; + $THEMES['theme_unix'][] = $dir; + $THEMES['theme_name'][] = $GLOBALS['theme_data']['name']; + $THEMES['theme_author'][] = $GLOBALS['theme_data']['author']; + $THEMES['theme_email'][] = $GLOBALS['theme_data']['email']; + $THEMES['theme_url'][] = $GLOBALS['theme_data']['url']; + $THEMES['theme_version'][] = $GLOBALS['theme_data']['version']; } // END - if } // END - while @@ -124,7 +124,7 @@ foreach ($THEMES['theme_unix'] as $key => $unix) { ".$THEMES['theme_url'][$key]." - v".$THEMES['theme_ver'][$key]." + v".$THEMES['theme_version'][$key]." \n"; $SW = 3 - $SW; } // END - foreach diff --git a/templates/de/html/admin/admin_config_proxy.tpl b/templates/de/html/admin/admin_config_proxy.tpl index 3953136c56..3aea7a42fd 100644 --- a/templates/de/html/admin/admin_config_proxy.tpl +++ b/templates/de/html/admin/admin_config_proxy.tpl @@ -11,7 +11,7 @@ {--ADMIN_CONFIG_PROXY_HOST--} - + @@ -19,7 +19,7 @@ {--ADMIN_CONFIG_PROXY_PORT--} - + @@ -27,7 +27,7 @@ {--ADMIN_CONFIG_PROXY_USERNAME--} - + @@ -35,7 +35,7 @@ {--ADMIN_CONFIG_PROXY_PASSWORD--} - + diff --git a/templates/de/html/admin/admin_config_timezone.tpl b/templates/de/html/admin/admin_config_timezone.tpl new file mode 100644 index 0000000000..be13ad39c8 --- /dev/null +++ b/templates/de/html/admin/admin_config_timezone.tpl @@ -0,0 +1,25 @@ +
+
+ + + + + + + + + + + +
+ {--ADMIN_EDIT_TIMEZONE_SETTINGS--} +
+ {--ADMIN_CONFIG_TIMEZONE--} + + +
+ + +
+
+
diff --git a/templates/de/html/admin/admin_list_theme.tpl b/templates/de/html/admin/admin_list_theme.tpl index 100e523d57..11f5d85d80 100644 --- a/templates/de/html/admin/admin_list_theme.tpl +++ b/templates/de/html/admin/admin_list_theme.tpl @@ -1,25 +1 @@ - - - - - - - - - - - -$content[rows] - - - - -
- {--ADMIN_THEME_NEW_FOUND_TITLE--}: -
{--ID_SELECT--}{--ADMIN_EXTENSION_DOWNLOAD_LINK--}{--ADMIN_THEME_FILE_CTIME--}{--ADMIN_EXTENSION_FILE_SIZE--}{--THEME_VERSION--}
- {--ADMIN_THEME_TOTAL_FOUND--}: - $content[total] - - {--ADMIN_EXTENSION_TOTAL_FSIZE--}: - $content[kbytes] {--KBYTES--} -
+ diff --git a/templates/de/html/admin/admin_list_theme_row.tpl b/templates/de/html/admin/admin_list_theme_row.tpl index 3f4a8afe73..11f5d85d80 100644 --- a/templates/de/html/admin/admin_list_theme_row.tpl +++ b/templates/de/html/admin/admin_list_theme_row.tpl @@ -1,13 +1 @@ - - $content[index]. - $content[name] - $content[created] - $content[size] {--KBYTES--} - $content[version] ($content[current]) - - -   - -
$content[infos]
- - + diff --git a/templates/de/html/admin/admin_theme_edit_row.tpl b/templates/de/html/admin/admin_theme_edit_row.tpl index a6d7ae2048..7532662a57 100644 --- a/templates/de/html/admin/admin_theme_edit_row.tpl +++ b/templates/de/html/admin/admin_theme_edit_row.tpl @@ -16,7 +16,7 @@ $content[email] - $content[url_title] + $content[url] v$content[theme_ver] diff --git a/templates/de/html/admin/admin_theme_import_row.tpl b/templates/de/html/admin/admin_theme_import_row.tpl index 4c5891a2f7..90ab827345 100644 --- a/templates/de/html/admin/admin_theme_import_row.tpl +++ b/templates/de/html/admin/admin_theme_import_row.tpl @@ -1,14 +1,14 @@ $content[unix] - $content[name] + $content[theme_name] - $content[author] + $content[theme_author] - $content[url] + $content[theme_url] - v$content[version] + v$content[theme_ver] - $content[form] + $content[form_content] diff --git a/templates/de/html/ext/ext_sql_patches.tpl b/templates/de/html/ext/ext_sql_patches.tpl index 4b539e8ff1..0dcac4288e 100644 --- a/templates/de/html/ext/ext_sql_patches.tpl +++ b/templates/de/html/ext/ext_sql_patches.tpl @@ -1,3 +1,2 @@ Diese Erweiterung ist das, was ihr Name sagt: Datenbank-Updates (daher -SQL_Upgrades) noch einfacher als mit dem upgrade.php Script einspielen! -Somit wird auch dies zum Kinderspiel. +sql_patches) noch einfacher als mit dem upgrade.php Script einspielen. diff --git a/templates/de/html/ext/ext_timezone.tpl b/templates/de/html/ext/ext_timezone.tpl new file mode 100644 index 0000000000..d44cbb44d2 --- /dev/null +++ b/templates/de/html/ext/ext_timezone.tpl @@ -0,0 +1,3 @@ +Erlaubt das Ändern der Zeitzone und sollte unbedingt installiert werden. +Einige Funktionen Ihres {OPEN_CONFIG}MT_WORD2{CLOSE_CONFIG} könnten unter +Umständen ohne dieser Erweiterung nicht mehr korrekt funktionieren. -- 2.39.5