Double quotes to single converted, TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 964a51b992844131fc7bfbf847631b189097155e..b2881bb88d11c3bf10673d6eb179f65ce2234db0 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -17,26 +17,26 @@
 ./inc/extensions-functions.php:376:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 ./inc/extensions-functions.php:489:            // @TODO Extension is loaded, what next?
 ./inc/filters.php:465:                 // @TODO This whole if-block is very static
-./inc/functions.php:1034:      // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
+./inc/functions.php:1033:      // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
 ./inc/functions.php:241:       // @TODO Remove this sanity-check if all is fine
-./inc/functions.php:2432:// @TODO Please describe this function
+./inc/functions.php:2431:// @TODO Please describe this function
+./inc/functions.php:2449:      searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time);
 ./inc/functions.php:244:       // @TODO Try to rewrite all $DATA to $content
-./inc/functions.php:2450:      searchDirsRecursive($next_dir, $last_changed); // @TODO small change to API to $last_changed = searchDirsRecursive($next_dir, $time);
-./inc/functions.php:2564:              // @TODO Add a little more infos here
-./inc/functions.php:2587:      // @TODO This cannot be rewritten to app_die(), try to find a solution for this.
-./inc/functions.php:2667:                      // @TODO Rewrite this old lost code to a template
-./inc/functions.php:2756:                      // @TODO Are these convertions still required?
-./inc/functions.php:2774:// @TODO Rewrite this function to use readFromFile() and writeToFile()
-./inc/functions.php:3652:// @TODO Lame description for this function
-./inc/functions.php:3674:                      // @TODO Move this in a filter
-./inc/functions.php:3792:      // @TODO This is still very static, rewrite it somehow
+./inc/functions.php:2563:              // @TODO Add a little more infos here
+./inc/functions.php:2586:      // @TODO This cannot be rewritten to app_die(), try to find a solution for this.
+./inc/functions.php:2666:                      // @TODO Rewrite this old lost code to a template
+./inc/functions.php:2755:                      // @TODO Are these convertions still required?
+./inc/functions.php:2773:// @TODO Rewrite this function to use readFromFile() and writeToFile()
+./inc/functions.php:3651:// @TODO Lame description for this function
+./inc/functions.php:3673:                      // @TODO Move this in a filter
+./inc/functions.php:3791:      // @TODO This is still very static, rewrite it somehow
 ./inc/functions.php:456:       // @TODO Do only use $content, not $DATA or raw variables
 ./inc/functions.php:526:               // @TODO Extension 'msg' does not exist
 ./inc/functions.php:595:// @TODO Rewrite this to an extension 'smtp'
-./inc/functions.php:999:// @TODO $simple is deprecated
+./inc/functions.php:998:// @TODO $simple is deprecated
 ./inc/install-functions.php:62:        // @TODO DEACTIVATED: changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);
-./inc/language/de.php:1146:// @TODO Rewrite these two constants
-./inc/language/de.php:1162:// @TODO Rewrite these five constants
+./inc/language/de.php:1147:// @TODO Rewrite these two constants
+./inc/language/de.php:1163:// @TODO Rewrite these five constants
 ./inc/language/de.php:847:// @TODO Are these constants longer used?
 ./inc/language-functions.php:228:      // @TODO These are all valid languages, again hard-coded
 ./inc/language-functions.php:45:// @TODO Rewrite all language constants to this function.
@@ -92,7 +92,7 @@
 ./inc/modules/admin/what-config_register.php:67:       // @TODO Move this HTML code into a template
 ./inc/modules/admin/what-edit_user.php:20: * @TODO Add support for ext-country                                    *
 ./inc/modules/admin/what-email_stats.php:47:// @TODO Unused at the moment
-./inc/modules/admin/what-extensions.php:344:                                           // @TODO Rewrite this to a filter
+./inc/modules/admin/what-extensions.php:347:                                           // @TODO Rewrite this to a filter
 ./inc/modules/admin/what-guest_add.php:136:                            // @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-guest_add.php:68:             // @TODO Cant this be rewritten?
 ./inc/modules/admin/what-guest_add.php:84:             // @TODO This can be somehow rewritten to a function
@@ -157,7 +157,7 @@
 ./inc/modules/member/what-transfer.php:316:                    // @TODO This should be somehow rewritten to $row = SQL_FETCHARRAY(), see switch() block above for SQL queries
 ./inc/modules/member/what-transfer.php:322:                            // @TODO Rewrite: tid->trans_id,stamp->time_trans
 ./inc/modules/member/what-transfer.php:99:                     // @TODO Rewrite this to a filter
-./inc/modules/member/what-unconfirmed.php:144: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+./inc/modules/member/what-unconfirmed.php:142: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
 ./inc/modules/order.php:75:            // @TODO Unused: 2,4
 ./inc/monthly/monthly_bonus.php:68:    // @TODO Rewrite this to a filter
 ./inc/mysql-manager.php:1546:                  // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
@@ -211,9 +211,7 @@ Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : form in templates/de/html/member/member_cats_footer.tpl, line: 8 in 
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/member/member_content_right.tpl, line: 1 in 
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/member/member_content_right.tpl, line: 5 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/member/member_welcome_footer.tpl, line: 1 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/member/member_welcome_footer.tpl, line: 2 in 
-Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_welcome_footer.tpl, line: 3 in 
+Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_welcome_footer.tpl, line: 1 in 
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_footer.tpl, line: 6 in 
 Warning: DOMDocument::loadHTMLFile(): Document is empty in templates/de/html/header.tpl, line: 1 in /home
 Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/page_footer.tpl, line: 1 in /home

diff --git a/inc/functions.php b/inc/functions.php
index 6ce5dc651f70e4c31d3ea0286cb3f5b0d4f67f7a..9376897615ada0f47bc33ea0f0338f1ab99f4706 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1823,19 +1823,19 @@ function sendRawRequest ($host, $request) {
        // Do we use proxy?
        if ($useProxy === true) {
                // Generate CONNECT request header
-               $proxyTunnel  = "CONNECT " . $host . ":80 HTTP/1.1" . getConfig('HTTP_EOL');
-               $proxyTunnel .= "Host: " . $host . getConfig('HTTP_EOL');
+               $proxyTunnel  = 'CONNECT ' . $host . ':80 HTTP/1.1' . getConfig('HTTP_EOL');
+               $proxyTunnel .= 'Host: ' . $host . getConfig('HTTP_EOL');
 
                // Use login data to proxy? (username at least!)
                if (getConfig('proxy_username') != '') {
                        // Add it as well
                        $encodedAuth = base64_encode(compileRawCode(getConfig('proxy_username')) . getConfig('ENCRYPT_SEPERATOR') . compileRawCode(getConfig('proxy_password')));
-                       $proxyTunnel .= "Proxy-Authorization: Basic " . $encodedAuth . getConfig('HTTP_EOL');
+                       $proxyTunnel .= 'Proxy-Authorization: Basic ' . $encodedAuth . getConfig('HTTP_EOL');
                } // END - if
 
                // Add last new-line
                $proxyTunnel .= getConfig('HTTP_EOL');
-               //* DEBUG: */ print("<strong>proxyTunnel=</strong><pre>" . $proxyTunnel."</pre>");
+               //* DEBUG: */ print('<strong>proxyTunnel=</strong><pre>' . $proxyTunnel.'</pre>');
 
                // Write request
                fputs($fp, $proxyTunnel);
@@ -1882,7 +1882,7 @@ function sendRawRequest ($host, $request) {
                }
        } // END - foreach
 
-       //* DEBUG: */ print("<strong>Response:</strong><pre>".print_r($response, true)."</pre>");
+       //* DEBUG: */ print('<strong>Response:</strong><pre>'.print_r($response, true).'</pre>');
 
        // Proxy agent found?
        if ((substr(strtolower($response[0]), 0, 11) == 'proxy-agent') && ($useProxy === true)) {
@@ -1946,11 +1946,11 @@ function generateMemberAdminActionLinks ($userid, $status = '') {
        $targetArray = array('del_user', 'edit_user', 'lock_user', 'add_points', 'sub_points');
 
        // Begin of navigation links
-       $OUT = "[&nbsp;";
+       $OUT = '[&nbsp;';
 
        foreach ($targetArray as $tar) {
-               $OUT .= "<span class=\"admin_user_link\"><a href=\"{%url=modules.php?module=admin&amp;what=" . $tar . "&amp;userid=" . $userid . "%}\" title=\"{--ADMIN_LINK_";
-               //* DEBUG: */ outputHtml("*" . $tar.'/' . $status."*<br />");
+               $OUT .= '<span class="admin_user_link"><a href="{%url=modules.php?module=admin&amp;what=' . $tar . '&amp;userid=' . $userid . '%}" title="{--ADMIN_LINK_';
+               //* DEBUG: */ outputHtml('*' . $tar.'/' . $status.'*<br />');
                if (($tar == 'lock_user') && ($status == 'LOCKED')) {
                        // Locked accounts shall be unlocked
                        $OUT .= 'UNLOCK_USER';
@@ -1958,7 +1958,7 @@ function generateMemberAdminActionLinks ($userid, $status = '') {
                        // All other status is fine
                        $OUT .= strtoupper($tar);
                }
-               $OUT .= "_TITLE--}\">{--ADMIN_";
+               $OUT .= '_TITLE--}">{--ADMIN_';
                if (($tar == 'lock_user') && ($status == 'LOCKED')) {
                        // Locked accounts shall be unlocked
                        $OUT .= 'UNLOCK_USER';
@@ -1966,7 +1966,7 @@ function generateMemberAdminActionLinks ($userid, $status = '') {
                        // All other status is fine
                        $OUT .= strtoupper($tar);
                }
-               $OUT .= "--}</a></span>&nbsp;|&nbsp;";
+               $OUT .= '--}</a></span>&nbsp;|&nbsp;';
        }
 
        // Finish navigation link
@@ -2030,15 +2030,15 @@ function generateHash ($plainText, $salt = '') {
 
                // Generate SHA1 sum from modula of number and the prime number
                $sha1 = sha1(($a % getConfig('_PRIME')) . $server . getConfig('ENCRYPT_SEPERATOR') . $keys . getConfig('ENCRYPT_SEPERATOR') . $data . getConfig('ENCRYPT_SEPERATOR') . getConfig('DATE_KEY') . getConfig('ENCRYPT_SEPERATOR') . $a);
-               //* DEBUG: */ outputHtml("SHA1=" . $sha1." (".strlen($sha1).")<br />");
+               //* DEBUG: */ outputHtml('SHA1=' . $sha1.' ('.strlen($sha1).')<br />');
                $sha1 = scrambleString($sha1);
-               //* DEBUG: */ outputHtml("Scrambled=" . $sha1." (".strlen($sha1).")<br />");
+               //* DEBUG: */ outputHtml('Scrambled=' . $sha1.' ('.strlen($sha1).')<br />');
                //* DEBUG: */ $sha1b = descrambleString($sha1);
-               //* DEBUG: */ outputHtml("Descrambled=" . $sha1b." (".strlen($sha1b).")<br />");
+               //* DEBUG: */ outputHtml('Descrambled=' . $sha1b.' ('.strlen($sha1b).')<br />');
 
                // Generate the password salt string
                $salt = substr($sha1, 0, getConfig('salt_length'));
-               //* DEBUG: */ outputHtml($salt." (".strlen($salt).")<br />");
+               //* DEBUG: */ outputHtml($salt.' ('.strlen($salt).')<br />');
        } else {
                // Use given salt
                //* DEBUG: */ print 'salt=' . $salt . '<br />';
@@ -2074,7 +2074,7 @@ function scrambleString($str) {
        }
 
        // Scramble string here
-       //* DEBUG: */ outputHtml("***Original=" . $str."***<br />");
+       //* DEBUG: */ outputHtml('***Original=' . $str.'***<br />');
        for ($idx = '0'; $idx < strlen($str); $idx++) {
                // Get char on scrambled position
                $char = substr($str, $scrambleNums[$idx], 1);
@@ -2084,7 +2084,7 @@ function scrambleString($str) {
        } // END - for
 
        // Return scrambled string
-       //* DEBUG: */ outputHtml("***Scrambled=" . $scrambled."***<br />");
+       //* DEBUG: */ outputHtml('***Scrambled=' . $scrambled.'***<br />');
        return $scrambled;
 }
 
@@ -2101,14 +2101,14 @@ function descrambleString($str) {
 
        // Begin descrambling
        $orig = str_repeat(' ', 40);
-       //* DEBUG: */ outputHtml("+++Scrambled=" . $str."+++<br />");
+       //* DEBUG: */ outputHtml('+++Scrambled=' . $str.'+++<br />');
        for ($idx = '0'; $idx < 40; $idx++) {
                $char = substr($str, $idx, 1);
                $orig = substr_replace($orig, $char, $scrambleNums[$idx], 1);
        } // END - for
 
        // Return scrambled string
-       //* DEBUG: */ outputHtml("+++Original=" . $orig."+++<br />");
+       //* DEBUG: */ outputHtml('+++Original=' . $orig.'+++<br />');
        return $orig;
 }