More misc fixes and rewrites (sorry, lame description)

[mailer.git] / inc / gen_sql_patches.php

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 5cc162891c6a56c53b5d177244909077c14f81fd..e2b45f2eab75893a31c0360bc290e53ec3ae87a9 100644 (file)
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -10,7 +10,7 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Patcht das Passwort-System nach DB-Update        *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
+ * $Revision::                                                        $ *
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
@@ -38,21 +38,21 @@
 
 // Some security stuff...
 if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
 // Check for version of sql_patches
-if (GET_EXT_VERSION("sql_patches") < "0.3.6") return false;
+if (GET_EXT_VERSION('sql_patches') < '0.3.6') return false;
 
 // Check if there is no scrambling string
-if (getConfig('pass_scramble') == "") {
+if (getConfig('pass_scramble') == '') {
        // Generate 40 chars long scramble string
        $scrambleString = genScrambleString(40);
 
        // ... and store it there for future usage
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_config` SET pass_scramble='%s' WHERE config=0 LIMIT 1",
-               array($scrambleString), __FILE__, __LINE__);
+       array($scrambleString), __FILE__, __LINE__);
 
        // Also remember it in config
        setConfigEntry('pass_scramble', $scrambleString);
@@ -60,57 +60,57 @@ if (getConfig('pass_scramble') == "") {
 } // END - if
 
 // Check if there is no master salt string
-if (getConfig('master_salt') == "") {
+if (getConfig('master_salt') == '') {
        // Generate the master salt which is the first chars minus 40 chars of this random hash
        // We do an extra scrambling here...
-       $masterSalt = scrambleString(substr(sha1(GEN_PASS(mt_rand(128, 256))), 0, -40));
+       $masterSalt = scrambleString(substr(sha1(generatePassword(mt_rand(128, 256))), 0, -40));
 
        // ... and store it there for future usage
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_config` SET master_salt='%s' WHERE config=0 LIMIT 1",
-               array($masterSalt), __FILE__, __LINE__);
+       array($masterSalt), __FILE__, __LINE__);
 
        // Also remember it in config
        setConfigEntry('master_salt', $masterSalt);
        unset($masterSalt);
 } // END - if
 
-if (getConfig('file_hash') == "") {
+if (getConfig('file_hash') == '') {
        // Create filename from hashed random string
-       $fileHash = sha1(GEN_PASS(mt_rand(128, 256)));
+       $fileHash = sha1(generatePassword(mt_rand(128, 256)));
        $FQFN = sprintf("%sinc/.secret/.%s",
-               constant('PATH'),
-               $fileHash
+       constant('PATH'),
+       $fileHash
        );
 
        // Count of chars to be taken from back of the string
        $nums = mt_rand(40, 45);
 
        // Generate secret key from a randomized string
-       $secretKey = substr(sha1(GEN_PASS(mt_rand(128, 256))), -$nums);
+       $secretKey = substr(sha1(generatePassword(mt_rand(128, 256))), -$nums);
 
        // File hash was never created
-       WRITE_FILE($FQFN, $secretKey);
+       writeToFile($FQFN, $secretKey);
 
        // Is the file there?
-       if (FILE_READABLE($FQFN)) {
-               //* DEBUG: */ unlink($FQFN);
-               //* DEBUG: */ $test = hexdec(get_session('u_hash')) / hexdec($secretKey);
-               //* DEBUG: */ $test = generateHash(str_replace('.', "", $test));
-               //* DEBUG: */ die("Secret-Key: ".$secretKey."<br />Cookie: ".get_session('u_hash')."<br />Test: ".$test);
+       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
                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_config` SET file_hash='%s' WHERE config=0 LIMIT 1",
-                       array($fileHash), __FILE__, __LINE__);
+               array($fileHash), __FILE__, __LINE__);
 
                // Generate FQFN for .htaccess file
                $FQFN = sprintf("%sinc/.secret/.htaccess",
-                       constant('PATH')
+               constant('PATH')
                );
 
                // Is the .htaccess file there?
-               if (!FILE_READABLE($FQFN)) {
+               if (!isFileReadable($FQFN)) {
                        // Also create .htaccess file
-                       WRITE_FILE($FQFN, "Deny from all\n");
+                       writeToFile($FQFN, "Deny from all\n");
                } // END - if
 
                // Also update configuration