From 11692c9f43d52ad1dfe9498cd2f3aea70a3ebf78 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 16 Sep 2010 21:51:09 +0000 Subject: [PATCH] Function renamed, ext-forced now depends on ext-sponsor --- inc/extensions-functions.php | 4 ++-- inc/extensions/ext-active.php | 6 +++--- inc/extensions/ext-admins.php | 2 +- inc/extensions/ext-cache.php | 2 +- inc/extensions/ext-forced.php | 5 ++++- inc/extensions/ext-holiday.php | 6 +++--- inc/extensions/ext-html_mail.php | 6 +++--- inc/extensions/ext-iso3166.php | 7 +++---- inc/extensions/ext-mydata.php | 2 +- inc/extensions/ext-nickname.php | 2 +- inc/extensions/ext-rallye.php | 4 ++-- inc/extensions/ext-register.php | 6 +++--- inc/extensions/ext-removeip.php | 2 +- inc/extensions/ext-sponsor.php | 2 +- inc/extensions/ext-sql_patches.php | 10 +++++----- inc/extensions/ext-task.php | 11 +++++------ inc/extensions/ext-transfer.php | 2 +- inc/extensions/ext-user.php | 7 +++---- inc/filters.php | 2 +- .../de/html/admin/admin_list_network_config_row.tpl | 4 ++-- 20 files changed, 46 insertions(+), 46 deletions(-) diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php index bc17810735..95fbd32cfd 100644 --- a/inc/extensions-functions.php +++ b/inc/extensions-functions.php @@ -1200,7 +1200,7 @@ function isExtensionDeprecated () { } // Setter for EXT_UPDATE_DEPENDS flag -function addExtensionUpdateDependency ($updateDepends) { +function addExtensionDependency ($updateDepends) { //* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . '/' . $updateDepends . ' - ENTERED!'); // Is the update depency empty? (NEED TO BE FIXED!) if (empty($updateDepends)) { @@ -1336,7 +1336,7 @@ function countExtensionUpdateDependencies () { } // Removes given extension from update denpency list -function removeExtensionUpdateDependency ($ext_name) { +function removeExtensionDependency ($ext_name) { // Look it up $key = array_search($ext_name, getExtensionUpdateDependencies()); diff --git a/inc/extensions/ext-active.php b/inc/extensions/ext-active.php index 300809ff1f..c7e2014d14 100644 --- a/inc/extensions/ext-active.php +++ b/inc/extensions/ext-active.php @@ -118,7 +118,7 @@ switch (getExtensionMode()) { case '0.0.9': // SQL queries for v0.0.9 // Make update depending on 'online' - addExtensionUpdateDependency('online'); + addExtensionDependency('online'); // Register filter registerFilter('online_extra_links', 'ADD_LINK_ACTIVE_LIST', false, true, isExtensionDryRun()); @@ -126,7 +126,7 @@ switch (getExtensionMode()) { // Update notes (these will be set as task text!) setExtensionUpdateNotes("Filter für den "Wer ist Online" Block hinzugefügt und ist von online abhängig."); break; - } + } // END - switch break; case 'modify': // When the extension got modified @@ -141,7 +141,7 @@ switch (getExtensionMode()) { default: // Unknown extension mode logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName())); break; -} +} // END - switch // [EOF] ?> diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php index 763fe200c0..5904dd61a9 100644 --- a/inc/extensions/ext-admins.php +++ b/inc/extensions/ext-admins.php @@ -292,7 +292,7 @@ PRIMARY KEY (id) case '0.7.1': // SQL queries for v0.7.1 // Update depends on sql_patches - addExtensionUpdateDependency('sql_patches'); + addExtensionDependency('sql_patches'); // Add filters registerFilter('sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', false, true, isExtensionDryRun()); diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php index ca21f68f6c..586840ab38 100644 --- a/inc/extensions/ext-cache.php +++ b/inc/extensions/ext-cache.php @@ -191,7 +191,7 @@ switch (getExtensionMode()) { case '0.2.0': // SQL queries for v0.2.0 // This update depends on sql_patches - addExtensionUpdateDependency('sql_patches'); + addExtensionDependency('sql_patches'); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Die Erweiterung hängt nun von der sql_patches ab."); diff --git a/inc/extensions/ext-forced.php b/inc/extensions/ext-forced.php index 273cdd6089..58b505eb28 100644 --- a/inc/extensions/ext-forced.php +++ b/inc/extensions/ext-forced.php @@ -8,7 +8,7 @@ * -------------------------------------------------------------------- * * Short description : Clickable forced banner or text links * * -------------------------------------------------------------------- * - * Kurzbeschreibung : * + * Kurzbeschreibung : Klickbare Forced-Banner oder -Textlinks * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * @@ -51,6 +51,9 @@ enableExtensionProductive(false); switch (getExtensionMode()) { case 'register': // Do stuff when installation is running (modules.php?module=admin is called) + // This depends on 'sponsor' now + addExtensionDependency('sponsor'); + // SQL commands to run break; diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php index 99d29bbbe6..8ef1bff761 100644 --- a/inc/extensions/ext-holiday.php +++ b/inc/extensions/ext-holiday.php @@ -194,7 +194,7 @@ PRIMARY KEY (id) addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`, `la_action`, `la_what`) VALUES ('config', '', 'config_holiday')"); // Depends on sql_patches (or you have to execute these both SQL statements by phpMyAdmin - addExtensionUpdateDependency('sql_patches'); + addExtensionDependency('sql_patches'); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Erweiterung in's neue Menüsystem integriert."); @@ -218,7 +218,7 @@ PRIMARY KEY (id) // Update notes (these will be set as task text!) setExtensionUpdateNotes("Fehlerhinweis bei deaktivierter Erweiterung verbessert."); break; - } + } // END - switch break; case 'modify': // When the extension got modified @@ -233,7 +233,7 @@ PRIMARY KEY (id) default: // Unknown extension mode logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName())); break; -} +} // END - switch // [EOF] ?> diff --git a/inc/extensions/ext-html_mail.php b/inc/extensions/ext-html_mail.php index 7f983c6f1c..6474d140ae 100644 --- a/inc/extensions/ext-html_mail.php +++ b/inc/extensions/ext-html_mail.php @@ -119,10 +119,10 @@ switch (getExtensionMode()) { case '0.1.6': // Dependency is needed for ext-registration!! (want to alter a non existent Table) - addExtensionUpdateDependency('bonus'); + addExtensionDependency('bonus'); setExtensionUpdateNotes("Abhänigkeit von der Erweiterung bonus hinzugefügt."); break; - } + } // END - switch break; case 'modify': // When the extension got modified @@ -170,7 +170,7 @@ switch (getExtensionMode()) { default: // Unknown extension mode logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName())); break; -} // END - switc +} // END - switch // [EOF] ?> diff --git a/inc/extensions/ext-iso3166.php b/inc/extensions/ext-iso3166.php index 61738fb79e..eca4b4d91c 100644 --- a/inc/extensions/ext-iso3166.php +++ b/inc/extensions/ext-iso3166.php @@ -319,13 +319,12 @@ VALUES ('AD', 'Andorra', 'ext-iso3166'), ('ZW', 'Zimbabwe', 'ext-iso3166');"); // This extension depends on the country extension - addExtensionUpdateDependency('country'); + addExtensionDependency('country'); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Erste Liste von 243 Ländercodes nach ISO 3166. (Quelle: Selfhtml)
Alle Länder sind zuerst deaktiviert. Achtung DE könnte doppelt vorkommen.
Ein Aktivieren/Deaktivieren lässt alle Länder beim Registrieren anzeigen oder nicht Anzeigen."); break; - - } + } // END - switch break; case 'modify': // When the extension got modified @@ -340,7 +339,7 @@ VALUES ('AD', 'Andorra', 'ext-iso3166'), default: // Unknown extension mode logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName())); break; -} +} // END - switch // [EOF] ?> diff --git a/inc/extensions/ext-mydata.php b/inc/extensions/ext-mydata.php index 11426ded47..2bae63fbda 100644 --- a/inc/extensions/ext-mydata.php +++ b/inc/extensions/ext-mydata.php @@ -126,7 +126,7 @@ switch (getExtensionMode()) { Wichtig: Laden Sie noch die Template member_mydata_overview und member_mydata_edit (beide zu finden unter templates/".getLanguage()."/html/member/ !) mit hoch!"); // Depends on 'country'! - addExtensionUpdateDependency('country'); + addExtensionDependency('country'); break; case '0.1.3': // SQL queries for v0.1.3 diff --git a/inc/extensions/ext-nickname.php b/inc/extensions/ext-nickname.php index e8f97ac910..5ce17e5fcb 100644 --- a/inc/extensions/ext-nickname.php +++ b/inc/extensions/ext-nickname.php @@ -77,7 +77,7 @@ switch (getExtensionMode()) { addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET ext_has_css='Y' WHERE `ext_name`='nickname' AND ext_has_css='N' LIMIT 1"); // This update depends on sql_patches update! - addExtensionUpdateDependency('sql_patches'); + addExtensionDependency('sql_patches'); // Update notes (these will be set as task text!) setExtensionUpdateNotes("CSS-Datei kann per Adminbereich ein- und ausgeschaltet werden."); diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php index f8abbf08da..18282c368c 100644 --- a/inc/extensions/ext-rallye.php +++ b/inc/extensions/ext-rallye.php @@ -307,7 +307,7 @@ Zudem sollten Sie mindestens folgende Templates (in templates/".getLangu case '0.3.5': // SQL queries for 0.3.5 // This update depends on sql_patches - addExtensionUpdateDependency('sql_patches'); + addExtensionDependency('sql_patches'); // Register filter registerFilter('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', false, true, isExtensionDryRun()); @@ -315,7 +315,7 @@ Zudem sollten Sie mindestens folgende Templates (in templates/".getLangu // Update notes (these will be set as task text!) setExtensionUpdateNotes("Filter hinzugefügt und ist von sql_patches abhängig."); break; - } + } // END - switch break; case 'modify': // When the extension got modified diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php index c7354f981c..d6ed16780c 100644 --- a/inc/extensions/ext-register.php +++ b/inc/extensions/ext-register.php @@ -101,7 +101,7 @@ PRIMARY KEY (id) addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET ext_has_css='Y' WHERE `ext_name`='register' AND ext_has_css='N' LIMIT 1"); // This update depends on sql_patches update! - addExtensionUpdateDependency('sql_patches'); + addExtensionDependency('sql_patches'); // Update notes (these will be set as task text!) setExtensionUpdateNotes("CSS-Datei kann per Admin-Bereich ein- und ausgeschaltet werden."); @@ -109,7 +109,7 @@ PRIMARY KEY (id) case '0.1.3': // SQL queries for v0.1.3 // This update depends on sql_patches update! - addExtensionUpdateDependency('sql_patches'); + addExtensionDependency('sql_patches'); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Standart Referal-Id kann per Admin-Bereich eingestellt werden (war vorher nur in modules.php und index.php direkt eingebbar.)"); @@ -212,7 +212,7 @@ PRIMARY KEY (id) Wichtig: Laden Sie noch das Template guest_register.tpl mit hoch, welches unter templates/".getLanguage()."/html/guest/ zu finden ist!"); // Depends on 'country' - addExtensionUpdateDependency('country'); + addExtensionDependency('country'); break; case '0.3.3': // SQL queries for v0.3.3 diff --git a/inc/extensions/ext-removeip.php b/inc/extensions/ext-removeip.php index b4e7094b7f..0c61aa0e61 100644 --- a/inc/extensions/ext-removeip.php +++ b/inc/extensions/ext-removeip.php @@ -82,7 +82,7 @@ switch (getExtensionMode()) switch (getCurrentExtensionVersion()) { case '0.0.1': // SQL queries for v0.0.1 // Update depends on sql_patches - addExtensionUpdateDependency('sql_patches'); + addExtensionDependency('sql_patches'); // Add filters registerFilter('post_youhere_line', 'ADD_ANONYMITY_NOTICE', false, true, isExtensionDryRun()); diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php index e0a0615e0e..73e633b866 100644 --- a/inc/extensions/ext-sponsor.php +++ b/inc/extensions/ext-sponsor.php @@ -55,7 +55,7 @@ switch (getExtensionMode()) { // SQL commands to run // // Try to make it depend on repair - addExtensionUpdateDependency('repair'); + addExtensionDependency('repair'); // // Sponsor data diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index e48fa102ad..e0f1be082b 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -52,7 +52,7 @@ setExtensionAlwaysActive('Y'); switch (getExtensionMode()) { case 'register': // Do stuff when installation is running (modules.php?module=admin is called) // This depends on 'cache' now - addExtensionUpdateDependency('cache'); + addExtensionDependency('cache'); break; case 'remove': // Do stuff when removing extension @@ -507,7 +507,7 @@ PRIMARY KEY (`id`) addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `what`=NULL WHERE `what`=''"); // Make this depending on ext-menu - addExtensionUpdateDependency('menu'); + addExtensionDependency('menu'); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Schlüssel in Admin-, Gast- und Mitgliedsmenü verbessert."); @@ -578,7 +578,7 @@ PRIMARY KEY (`id`) addMemberMenuSql('main','reflist','Ref-Übersicht','N','Y',5); // Depends on refback extension - addExtensionUpdateDependency('refback'); + addExtensionDependency('refback'); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Ref-Übersicht eingebaut. Diese hängt von der Erweiterung refback ab."); @@ -641,7 +641,7 @@ PRIMARY KEY (`filter_id`) case '0.6.2': // SQL queries for v0.6.2 // Depends on refback extension - addExtensionUpdateDependency('user'); + addExtensionDependency('user'); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Abhängigkeit von ext-user gesetzt."); @@ -734,7 +734,7 @@ INDEX (`ip`) 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'); + addExtensionDependency('timezone'); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Zeitzone ist nun mit ext-timezone konfigurierbar."); diff --git a/inc/extensions/ext-task.php b/inc/extensions/ext-task.php index a42748578a..b271364ef8 100644 --- a/inc/extensions/ext-task.php +++ b/inc/extensions/ext-task.php @@ -73,13 +73,12 @@ switch (getExtensionMode()) { break; case 'update': // Update an extension - switch (getCurrentExtensionVersion()) - { + switch (getCurrentExtensionVersion()) { case '0.0.1': // SQL queries for v0.0.1 addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET ext_has_css='Y' WHERE `ext_name`='task' AND ext_has_css='N' LIMIT 1"); // This update depends on sql_patches update! - addExtensionUpdateDependency('sql_patches'); + addExtensionDependency('sql_patches'); // Update notes (these will be set as task text!) setExtensionUpdateNotes("CSS-Datei kann per Admin-Bereich ein- und ausgeschaltet werden."); @@ -239,12 +238,12 @@ switch (getExtensionMode()) { case '0.3.2': // SQL queries for v0.3.2 // This update depends on user update - addExtensionUpdateDependency('sql_patches'); + addExtensionDependency('sql_patches'); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Hängt nun von ext-user ab."); break; - } + } // END - switch break; case 'modify': // When the extension got modified @@ -259,7 +258,7 @@ switch (getExtensionMode()) { default: // Unknown extension mode logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName())); break; -} +} // END - switch // [EOF] ?> diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php index a542d1f06a..c9c67e0c64 100644 --- a/inc/extensions/ext-transfer.php +++ b/inc/extensions/ext-transfer.php @@ -234,7 +234,7 @@ PRIMARY KEY (`id`) addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`, `la_action`, `la_what`) VALUES ('config', '', 'config_transfer')"); // Depends on sql_patches (or you have to execute these both SQL statements by phpMyAdmin - addExtensionUpdateDependency('sql_patches'); + addExtensionDependency('sql_patches'); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Erweiterung in's neue Menüsystem integriert."); diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php index 4f560614ff..f4f3bd8a27 100644 --- a/inc/extensions/ext-user.php +++ b/inc/extensions/ext-user.php @@ -194,8 +194,7 @@ INDEX (`stats_type`) break; case 'update': // Update an extension - switch (getCurrentExtensionVersion()) - { + switch (getCurrentExtensionVersion()) { case '0.1.0': // SQL queries for v0.1 addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `user_limit` INT(7) UNSIGNED NOT NULL DEFAULT 20"); @@ -205,7 +204,7 @@ INDEX (`stats_type`) case '0.1.1': // SQL queries for v0.1.1 // This update depends on sql_patches update! - addExtensionUpdateDependency('sql_patches'); + addExtensionDependency('sql_patches'); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Ungültiges Update."); @@ -381,7 +380,7 @@ PRIMARY KEY (`id`) default: // Unknown extension mode logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName())); break; -} +} // END - switch // [EOF] ?> diff --git a/inc/filters.php b/inc/filters.php index de7de41c6d..c15b92abab 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -354,7 +354,7 @@ function FILTER_REMOVE_UPDATES ($data) { // Shall we remove this update? if (in_array($ext_name, getExtensionRemovalList())) { // Then remove this extension! - removeExtensionUpdateDependency($ext_name); + removeExtensionDependency($ext_name); } // END - if } // END - foreach } // END - if diff --git a/templates/de/html/admin/admin_list_network_config_row.tpl b/templates/de/html/admin/admin_list_network_config_row.tpl index c168a0d9df..0520875c58 100644 --- a/templates/de/html/admin/admin_list_network_config_row.tpl +++ b/templates/de/html/admin/admin_list_network_config_row.tpl @@ -9,7 +9,7 @@
($content[network_title])
- + {--ADMIN_NETWORK_CONFIG_ENTER_NETWORK_SITE_ID--}:
($content[network_title])
@@ -21,7 +21,7 @@
($content[network_title])
- + {--ADMIN_NETWORK_CONFIG_ENTER_NETWORK_QUERY_AMOUNT--}:
($content[network_title])
-- 2.39.5