Removed duplicate code which has already been moved to a filter

[mailer.git] / inc / extensions / ext-sql_patches.php

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index c94e143f07b4e5d1760e571b62c46e3bac3c2a3a..d0e26dd18ccf9e56d3a37e9e3a79f4a2d98cec89 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -935,15 +935,18 @@ INDEX (`history_last_used` DESC)",
                                break;
 
                        case '0.9.1': // SQL queries for v0.9.1
+                               // Add admin menu
                                addAdminMenuSql('misc', 'list_server_name', 'Verkehrte Domains auflisten', 'Listet alle als verkehrt erkannten Domains auf.', 4);
+
+                               // Create table
                                addCreateTableSql('server_name_log', "
 `server_name_id` BIGINT (20) NOT NULL AUTO_INCREMENT,
 `server_name` VARCHAR (255) NOT NULL DEFAULT 'invalid',
-`server_name_added` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 `server_name_remote_addr` VARCHAR (15) NOT NULL DEFAULT '0.0.0.0',
 `server_name_ua` TINYTEXT NULL DEFAULT NULL,
 `server_name_referrer` TINYTEXT NULL DEFAULT NULL,
-`server_name_counter` BIGINT (20) NOT NULL DEFAULT 0,
+`server_name_added` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+`server_name_counter` BIGINT (20) NOT NULL DEFAULT 1,
 PRIMARY KEY (`server_name_id`)
 ", 'Logging of wrong SERVER_NAME');
 
@@ -970,41 +973,6 @@ PRIMARY KEY (`server_name_id`)
                break;
 
        case 'init': // Do stuff when extension is initialized
-               // Transfer POINTS word
-               if (isExtensionInstalledAndNewer('sql_patches', '0.0.3')) {
-                       // Okay, recent enough, so transfer the word for POINTS
-                       setConfigEntry('POINTS', getPointsWord());
-               } // END - if
-
-               // Init key
-               setConfigEntry('secret_key', '');
-
-               // Is the version recent enought for secret keys?
-               if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) {
-                       // Read key from secret file
-                       if ((getFileHash() == '') || (getMasterSalt() == '') || (getPassScramble() == '')) {
-                               // Maybe need setup of secret key!
-                               loadIncludeOnce('inc/gen_sql_patches.php');
-                       } // END - if
-
-                       // Test again
-                       if ((getFileHash() != '') && (getMasterSalt() != '') && (getPassScramble() != '')) {
-                               // File hash fas generated so we can also file the secret file... hopefully.
-                               $hashFile = sprintf("%s%s.%s.cache", getPath(), getCachePath(), getFileHash());
-
-                               // Is the secret key file readable?
-                               if (isFileReadable($hashFile)) {
-                                       // Read file
-                                       setConfigEntry('secret_key', readFromFile($hashFile));
-                               } else {
-                                       // Remove it from database
-                                       updateConfiguration('file_hash', '');
-
-                                       // Cannot read secret file!
-                                       reportBug(__FILE__, __LINE__, 'Cannot read secret file! Please try to reload.');
-                               }
-                       } // END - if
-               } // END - if
                break;
 
        default: // Unknown extension mode