X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions%2Fext-admins.php;h=fdd9d635db349c40e2d8642a25c876fdaacda924;hb=6dcb879ba3abb21843503cacc65d1fe0848eb90f;hp=bdc0fc20b7d63acf5161305b7a3139612cfca4be;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php
index bdc0fc20b7..fdd9d635db 100644
--- a/inc/extensions/ext-admins.php
+++ b/inc/extensions/ext-admins.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 04/11/2004 *
- * ================                             Last change: 10/29/2004 *
+ * ===================                          Last change: 10/29/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : ext-admins.php                                   *
@@ -14,11 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -42,16 +41,16 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version of this extension
-setThisExtensionVersion('0.7.2');
+setThisExtensionVersion('0.7.9');
 
-// Version history array (add more with , '0.1.0' and so on)
-setExtensionVersionHistory(array('0.0', '0.1.0', '0.2.0', '0.3.0', '0.3.1', '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.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2'));
+// Version history array (add more with , '0.0.1' and so on)
+setExtensionVersionHistory(array('0.0.0', '0.1.0', '0.2.0', '0.3.0', '0.3.1', '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.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9'));
 
 // Keep this extension always active!
 setExtensionAlwaysActive('Y');
 
 switch (getExtensionMode()) {
-	case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
+	case 'setup': // Do stuff when installation is running
 		// SQL commands to run
 		addAdminMenuSql('admins', NULL, 'Admin-Management','Administratoren anlegen, l&ouml;schen oder Passwort/E-Mail Adresse &auml;ndern.',1);
 		addAdminMenuSql('admins','admins_add','Admin hinzuf&uuml;gen','Neuen Admin-Account anlegen',0);
@@ -61,12 +60,15 @@ switch (getExtensionMode()) {
 	case 'remove': // Do stuff when removing extension
 		// SQL commands to run
 		addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='admins'");
-		addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_admins_acls`");
-		addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_admins_mails`");
-		addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` DROP default_acl");
+		addDropTableSql('admins_acls');
+		addDropTableSql('admins_mails');
+		addExtensionDropTableColumnSql('admins', 'default_acl');
 
 		// Remove filters
-		unregisterFilter('sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', true, getExtensionDryRun());
+		unregisterFilter(__FILE__, __LINE__, 'sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', TRUE, isExtensionDryRun());
+		unregisterFilter(__FILE__, __LINE__, 'do_admin_login_done', 'RESET_ADMINS_LOGIN_FAILURES', TRUE, isExtensionDryRun());
+		unregisterFilter(__FILE__, __LINE__, 'do_admin_login_pass', 'COUNT_ADMINS_LOGIN_FAILURE', TRUE, isExtensionDryRun());
+		unregisterFilter(__FILE__, __LINE__, 'do_admin_login_done', 'REHASH_ADMINS_PASSWORD', TRUE, isExtensionDryRun());
 		break;
 
 	case 'activate': // Do stuff when admin activates this extension
@@ -80,248 +82,19 @@ switch (getExtensionMode()) {
 		break;
 
 	case 'update': // Update an extension
-		switch (getCurrentExtensionVersion()) {
-			case '0.2.0': // SQL queries for v0.2
-				addAdminMenuSql('admins','admins_contact','Admin kontaktieren','Kontaktiert einen Admin per Mail oder Nachricht (nur wenn messaging-Erweiterung installiert ist).',2);
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("F&uuml;gt den Men&uuml;punkt &quot;Admin kontaktieren&quot; hinzu.");
-				break;
-
-			case '0.3.0': // SQL queries for v0.3
-				// Add admin menu
-				addAdminMenuSql('admins','config_admins','ACL einstellen','Richten Sie Zugriffskontrollzeilen f&uuml;r jeden Admin individuell ein, um ihm nur bestimmte Bereiche des Admin-Bereiches zug&auml;nglich zu machen oder zu sperren.',4);
-
-				// Which is the default setting when you create a new admin login?
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD admins_default_acl ENUM('deny','allow') NOT NULL DEFAULT 'deny'");
-
-				// Default is deny everything
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` ADD default_acl ENUM('deny','allow') NOT NULL DEFAULT 'deny'");
-
-				// But allow current admin everything (THIS SHALL BE YOU!)
-				addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admins` SET `default_acl`='allow' WHERE `login`='".getSession('admin_login')."' LIMIT 1");
-				addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_admins_acls`");
-				addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_admins_acls` (
-`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-`admin_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-`action_menu` VARCHAR(255) NOT NULL DEFAULT '',
-`what_menu` VARCHAR(255) NOT NULL DEFAULT '',
-`access_mode` ENUM('deny','allow') NOT NULL DEFAULT 'deny',
-KEY (`admin_id`),
-PRIMARY KEY (`id`)
-) TYPE={?_TABLE_TYPE?}");
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Sogn. ACLs werden hinzugef&uuml;gt: <strong>A</strong>ccess <strong>C</strong>ontrol <strong>L</strong>ines sind zu deutsch Zugriffkontrollzeilen, mit denen Sie einstellen k&ouml;nnen, was welcher Admin machen darf oder nicht. <strong>Nur Sie haben momentan Vollzugriff auf den Adminbereich.</strong>");
-				break;
-
-			case '0.3.1': // SQL queries for v0.3.1
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins_acls` MODIFY id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT");
-				break;
-
-			case '0.4.0': // SQL queries for v0.4.0
-				addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_admins_mails`");
-				addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_admins_mails` (
-id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-admin_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-mail_template VARCHAR(255) NOT NULL,
-KEY (admin_id),
-PRIMARY KEY (id)
-) TYPE={?_TABLE_TYPE?}");
-				addExtensionSql("INSERT INTO  `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins','admins_mails','Admin-Mails','Stellen Sie hier ein, welcher Admin welche Mail erhalten soll. Sie k&ouml;nnen dies (derzeit) jedoch erst, wenn einmal die Mail versendet wurde!',5)");
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Kontrollieren Sie, welche Mails welcher Admin oder alle (admin_id=0) bekommen soll oder im UserLog (admin_id=-1) verzeichnet werden soll. Standartm&auml;ssig wird weiter an alle versendet.");
-				break;
-
-			case '0.4.1': // SQL queries for v0.4.1
-				addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admins_mails` WHERE mail_template LIKE '% %'");
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Admins-Mails-Tabelle geleert.");
-
-			case '0.4.4': // SQL queries for v0.4.4
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("&amp;admin= in &amp;amp;admin= umgewandelt.");
-				break;
-
-			case '0.4.5': // SQL queries for v0.4.5
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Vorbereitet auf Cache-System");
-				break;
-
-			case '0.4.6': // SQL queries for v0.4.6
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Problem mit cache-Erweiterung gefixt. Der Admin-Bereich war permanent gesperrt.");
-				break;
-
-			case '0.4.7': // SQL queries for v0.4.7
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Es wurde die Zeitmarke der Cache-Datei admins.cache mit ber&uuml;cksichtigt.");
-				break;
-
-			case '0.4.8': // SQL queries for v0.4.8
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Fehler beseitigt, wenn error_reporting=E_ALL gesetzt ist.");
-				break;
-
-			case '0.4.9': // SQL queries for v0.4.9
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Fehler beseitigt, wenn error_reporting=E_ALL gesetzt ist.");
-				break;
-
-			case '0.5.0': // SQL queries for v0.5.0
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Fehler beseitigt, wenn error_reporting=E_ALL gesetzt ist.");
-				break;
-
-			case '0.5.1': // SQL queries for v0.5.1
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Cache wird endlich gel&oumlscht, wenn Admin entfernt wird.");
-				break;
-
-			case '0.5.2': // SQL queries for v0.5.2
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("L&ouml;schen von Admin-Accounts repariert und HTML-Code ausgelagert in Templates.");
-				break;
-
-			case '0.5.3': // SQL queries for v0.5.3
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Seit <strong>Patch 340</strong> &uuml;berfl&uuml;ssige HTML-Tags entfernt.");
-				break;
-
-			case '0.5.4': // SQL queries for v0.5.4
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("IP-Nummer und Browserbezeichnung wird in Admin-Mails eingesetzt.");
-				break;
-
-			case '0.5.5': // SQL queries for v0.5.5
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Men&uuml;punkt Admin-Mails korregiert: SQL-Anweisung war fehlerhaft; und HTML-Code in Templates ausgelagert.");
-				break;
-
-			case '0.5.6': // SQL queries for v0.5.6
-				addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `what`='admins_contct' WHERE `what`='admins_contact' LIMIT 1");
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Namenskonflikt zwischen den Erweiterungen <strong>admins</strong> und (kommender) <strong>contact</strong>.");
-				break;
-
-			case '0.5.7': // SQL queries for v0.5.7
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Links wegen <strong>what=admins_contct</strong> ge&auml;ndert.");
-				break;
-
-			case '0.5.8': // SQL queries for v0.5.8
-				addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `what`='admins_contct' WHERE `what`='admins_contact' LIMIT 1");
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Ein Punkt in der Versionsnummernliste verhinderte das 0.5.6-Update.");
-				break;
-
-			case '0.5.9': // SQL queries for v0.5.9
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Sicherheitsupdate: SQL-Anweisungen gesch&uuml;tzt.");
-				break;
-
-			case '0.6.0': // SQL queries for v0.6.0
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Link in &quot;ACL Einstellen&quot; zum Admin-Kontaktformular korregiert.");
-				break;
-
-			case '0.6.1': // SQL queries for v0.6.1
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Speichern von Admin-Accounts klappt wieder.");
-				break;
-
-			case '0.6.2': // SQL queries for v0.6.2
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Bitte verschieben Sie die admins-Templates (Ordner: {?PATH?}/templates/de/emails/) in den neuen Order admins!");
-				break;
-
-			case '0.6.3': // SQL queries for v0.6.3
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Abspeichern von Einstellungen repariert.");
-				break;
-
-			case '0.6.4': // SQL queries for v0.6.4
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Problem mit der Rechtevererbung beseitigt: Geben Sie nun ein Hauptmen&uuml; frei (Allow), dann kann der Admin auch die Untermen&uuml;s erreichen. Zudem k&ouml;nnen Sie gezielte Untermen&uuml;s im freigegeben Hauptmen&uuml; dennoch sperren.");
-				break;
-
-			case '0.6.5': // SQL queries for v0.6.5
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Sicherheitsupdate f&uuml;r die Include-Befehle.");
-				break;
-
-			case '0.6.6': // SQL queries for v0.5.6
-				addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `what`='admins_contct' WHERE `what`='admins_contact' LIMIT 1");
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Namenskonflikt zwischen den Erweiterungen <strong>admins</strong> und (kommender) <strong>contact</strong>.");
-				break;
-
-			case '0.6.7': // SQL queries for v0.6.7
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` ADD la_mode ENUM('global','OLD','NEW') NOT NULL DEFAULT 'global'");
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Namenskonflikt zwischen den Erweiterungen <strong>admins</strong> und (kommender) <strong>contact</strong>. Beseitigung eines Fehlers <strong>HTTP_POSR_VARS</strong> beim &Auml;ndern von Administratoren.");
-				break;
-
-			case '0.6.8': // SQL queries for v0.6.8
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("<strong>setSession()</strong> mit @-Zeichen gegen ungewollte Ausgaben abgesichert.");
-				break;
-
-			case '0.6.9': // SQL queries for v0.6.9
-				addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET title = 'Admin-Management' WHERE action = 'admins' AND (`what`='' OR `what` IS NULL) LIMIT 1");
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Verwaltung nach Management umbenannt.");
-				break;
-
-			case '0.7.0': // SQL queries for v0.7.0
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` ADD `login_failtures` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0");
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` ADD `last_failture` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00'");
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Veraltetes Update.");
-				break;
-
-			case '0.7.1': // SQL queries for v0.7.1
-				// Update depends on sql_patches
-				addExtensionUpdateDependency('sql_patches');
-
-				// Add filters
-				registerFilter('sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', false, true, getExtensionDryRun());
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Filter hinzugef&uuml;gt und ist von <strong>sql_patches</strong> abh&auml;ngig.");
-				break;
-
-			case '0.7.2': // SQL queries for v0.7.2
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` DROP `login_failtures`");
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` DROP `last_failture`");
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` ADD `login_failures` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0");
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` ADD `last_failure` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00'");
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Schreibweise korregiert.");
-				break;
-		} // END - switch
 		break;
 
 	case 'modify': // When the extension got modified
 		break;
 
-	case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305.
+	case 'test': // For testing purposes
 		break;
 
 	case 'init': // Do stuff when extension is initialized
 		break;
 
 	default: // Unknown extension mode
-		DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown extension mode %s detected.", getExtensionMode()));
+		reportBug(__FILE__, __LINE__, sprintf('Unknown extension mode %s in extension %s detected.', getExtensionMode(), getCurrentExtensionName()));
 		break;
 } // END - switch