Removed deprecated code, inc/.secret/ is now obsolete and its files are located in...

diff --git a/.gitattributes b/.gitattributes
index c14e589a676ccb9573684e1414489833c090a659..8f4702e716730b3d32b7f59924f5acd757a878d5 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -89,7 +89,6 @@ img/politician-stop/politiker-stopp_150x24.png -text
 img/uberwach/uberwach-button-gruen.gif -text
 img/uberwach/uberwach-kamera-gruen.gif -text
 inc/.htaccess -text
-inc/.secret/.htaccess -text
 inc/autopurge/.htaccess -text
 inc/autopurge/purge- -text
 inc/autopurge/purge-general.php -text

diff --git a/inc/.secret/.htaccess b/inc/.secret/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/inc/.secret/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index 43d87e3bad540821c9cd574527c95e6bea7238f9..138f723c1d053ad4807b114f3ffcbdcec4e94dff 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -772,7 +772,7 @@ INDEX (`ip`)
                // Test again
                if ((isExtensionInstalledAndNewer('sql_patches', '0.3.6')) && (getFileHash() != '') && (getMasterSalt() != '') && (getPassScramble() != '')) {
                        // File hash fas generated so we can also file the secret file... hopefully.
-                       $hashFile = sprintf("%sinc/.secret/.%s", getPath(), getFileHash());
+                       $hashFile = sprintf("%sinc/cache/.%s", getPath(), getFileHash());
                        if (isFileReadable($hashFile)) {
                                // Read file
                                setConfigEntry('secret_key', readFromFile($hashFile));

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 4853da16b7023890ae3083769503b693e3bd3377..1173c4b3b21b767bce99d00863c521b3b0962726 100644 (file)
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -70,7 +70,7 @@ if (getMasterSalt() == '') {
 if (getFileHash() == '') {
        // Create filename from hashed random string
        $fileHash = sha1(generatePassword(mt_rand(128, 256)));
-       $FQFN = sprintf("%sinc/.secret/.%s",
+       $FQFN = sprintf("%sinc/cache/.%s",
                getPath(),
                $fileHash
        );
@@ -83,25 +83,6 @@ if (getFileHash() == '') {
 
        // Is the file there?
        if (isFileReadable($FQFN)) {
-               //* DEBUG: */ removeFile($FQFN);
-               //* DEBUG: */ $test = hexdec(getSession('u_hash')) / hexdec($secretKey);
-               //* DEBUG: */ $test = generateHash(str_replace('.', '', $test));
-               //* DEBUG: */ die("Secret-Key: ".$secretKey."<br />Cookie: ".getSession('u_hash')."<br />Test: ".$test);
-
-               // Write $fileHash to database
-               updateConfiguration('file_hash', $fileHash);
-
-               // Generate FQFN for .htaccess file
-               $FQFN = sprintf("%sinc/.secret/.htaccess",
-                       getPath()
-               );
-
-               // Is the .htaccess file there?
-               if (!isFileReadable($FQFN)) {
-                       // Also create .htaccess file
-                       writeToFile($FQFN, "Deny from all\n");
-               } // END - if
-
                // Also update configuration
                setConfigEntry('secret_key', $secretKey);