Continued:

- prevented more local variables and if/else blocks
- updated TODOs.txt

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/docs/TODOs.txt b/docs/TODOs.txt
index 4da253502256ac12f6b3778b882d0ceaf2063325..0387416507466be5017fa23e8ea64d2a405fc9a5 100644 (file)
--- a/docs/TODOs.txt
+++ b/docs/TODOs.txt
@@ -1,5 +1,5 @@
 ### WARNING: THIS FILE IS AUTO-GENERATED BY ./todo-builder.sh ###
 ### DO NOT EDIT THIS FILE. ###
-./libs/lib_detector.php:124:           // @TODO Misc/unsorted
-./libs/lib_general.php:407:    // @TODO Why can't domain be set to value from crackerTrackerServerName() ?
+./libs/lib_detector.php:160:           // @TODO Misc/unsorted
+./libs/lib_general.php:488:    // @TODO Why can't domain be set to value from crackerTrackerServerName() ?
 ### ### DEPRECATION FOLLOWS: ### ###

diff --git a/libs/lib_general.php b/libs/lib_general.php
index 55a0fde12b6ad8b95fcdba8d5da2d5ae2f656c73..d6e1a87900ce077b9bcbb0faec7cfca0dfd8ff14 100644 (file)
--- a/libs/lib_general.php
+++ b/libs/lib_general.php
@@ -498,20 +498,13 @@ function ifCrackerTrackerCookieIsSet () {
 
 // Redirects to the same URL
 function crackerTrackerRedirectSameUrl () {
-       // Construct the url
-       $url = '://' . crackerTrackerServerName() . crackerTrackerScriptName() . '?' . crackerTrackerQueryString();
-
-       // Do we have SSL?
-       if (crackerTrackerSecured()) {
-               // HTTPS
-               $url = 'https' . $url;
-       } else {
-               // HTTP
-               $url = 'http' . $url;
-       }
-
-       // And redirect
-       crackerTrackerSendRawRedirect($url);
+       // Construct and redirect to same URL
+       crackerTrackerSendRawRedirect(sprintf('%s://%s%s?%s',
+               (crackerTrackerSecured() ? 'https' : 'http'),
+               crackerTrackerServerName(),
+               crackerTrackerScriptName(),
+               crackerTrackerQueryString()
+       ));
 }
 
 /**
@@ -522,7 +515,6 @@ function crackerTrackerRedirectSameUrl () {
  *
  * @link    http://support.microsoft.com/kb/q176113/
  * @author  Andreas Gohr <andi@splitbrain.org>
- * @access  private
  */
 function crackerTrackerSendRawRedirect ($url) {
        // Better remove any data by ctracker