JuKu / JuKuCMS

system/core/classes/phputils.php

Indentation +145 added lines, -145 removed lines

@@ -11,176 +11,176 @@
     }
 
     public static function isModRewriteAvailable () {
-    	if (function_exists("apache_get_modules")) {
-    		if (in_array('mod_rewrite',apache_get_modules())) {
-    			return true;
-			}
+        if (function_exists("apache_get_modules")) {
+            if (in_array('mod_rewrite',apache_get_modules())) {
+                return true;
+            }
 
-			return false;
-		}
+            return false;
+        }
 
-		return false;
-	}
-
-	public static function startsWith ($haystack, $needle) : bool {
-    	//https://stackoverflow.com/questions/834303/startswith-and-endswith-functions-in-php
+        return false;
+    }
 
-		$length = strlen($needle);
-		return (substr($haystack, 0, $length) === $needle);
-	}
+    public static function startsWith ($haystack, $needle) : bool {
+        //https://stackoverflow.com/questions/834303/startswith-and-endswith-functions-in-php
 
-	public static function endsWith ($haystack, $needle) : bool {
-		$length = strlen($needle);
+        $length = strlen($needle);
+        return (substr($haystack, 0, $length) === $needle);
+    }
 
-		return $length === 0 || (substr($haystack, -$length) === $needle);
-	}
+    public static function endsWith ($haystack, $needle) : bool {
+        $length = strlen($needle);
 
-	/**
-	 * get IP address of client browser
-	 *
-	 * @return IPv4 / IPv6 address (up to 45 characters)
-	 */
-	public static function getClientIP () : string {
-    	//https://stackoverflow.com/questions/3003145/how-to-get-the-client-ip-address-in-php
+        return $length === 0 || (substr($haystack, -$length) === $needle);
+    }
 
-    	$ip = "";
+    /**
+     * get IP address of client browser
+     *
+     * @return IPv4 / IPv6 address (up to 45 characters)
+     */
+    public static function getClientIP () : string {
+        //https://stackoverflow.com/questions/3003145/how-to-get-the-client-ip-address-in-php
+
+        $ip = "";
+
+        if (isset($_SERVER['HTTP_CLIENT_IP']) && !empty($_SERVER['HTTP_CLIENT_IP'])) {
+            $ip = $_SERVER['HTTP_CLIENT_IP'];
+        } elseif (isset($_SERVER['HTTP_X_FORWARDED_FOR']) && !empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+            $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+        } else {
+            $ip = $_SERVER['REMOTE_ADDR'];
+        }
+
+        return $ip;
+    }
 
-		if (isset($_SERVER['HTTP_CLIENT_IP']) && !empty($_SERVER['HTTP_CLIENT_IP'])) {
-			$ip = $_SERVER['HTTP_CLIENT_IP'];
-		} elseif (isset($_SERVER['HTTP_X_FORWARDED_FOR']) && !empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-			$ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
-		} else {
-			$ip = $_SERVER['REMOTE_ADDR'];
-		}
+    public static function strEqs (string $str1, string $str2) : bool {
+        return strcmp($str1, $str2) === 0;
+    }
 
-		return $ip;
-	}
-
-	public static function strEqs (string $str1, string $str2) : bool {
-		return strcmp($str1, $str2) === 0;
-	}
-
-	/**
-	 * Generate a random string, using a cryptographically secure
-	 * pseudorandom number generator (random_int)
-	 *
-	 * For PHP 7, random_int is a PHP core function
-	 * For PHP 5.x, depends on https://github.com/paragonie/random_compat
-	 *
-	 * @param int $length      How many characters do we want?
-	 * @param string $keyspace A string of all possible characters
-	 *                         to select from
-	 *
-	 * @link https://stackoverflow.com/questions/4356289/php-random-string-generator/31107425#31107425
-	 *
-	 * @return string
-	 */
-	public static function randomString(int $length, string $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ') : string {
-		$str = '';
-		$max = mb_strlen($keyspace, '8bit') - 1;
-
-		for ($i = 0; $i < $length; ++$i) {
-			$str .= $keyspace[random_int(0, $max)];
-		}
+    /**
+     * Generate a random string, using a cryptographically secure
+     * pseudorandom number generator (random_int)
+     *
+     * For PHP 7, random_int is a PHP core function
+     * For PHP 5.x, depends on https://github.com/paragonie/random_compat
+     *
+     * @param int $length      How many characters do we want?
+     * @param string $keyspace A string of all possible characters
+     *                         to select from
+     *
+     * @link https://stackoverflow.com/questions/4356289/php-random-string-generator/31107425#31107425
+     *
+     * @return string
+     */
+    public static function randomString(int $length, string $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ') : string {
+        $str = '';
+        $max = mb_strlen($keyspace, '8bit') - 1;
+
+        for ($i = 0; $i < $length; ++$i) {
+            $str .= $keyspace[random_int(0, $max)];
+        }
+
+        return $str;
+    }
 
-		return $str;
-	}
+    public static function getHostname () : string {
+        if (function_exists("gethostname")) {
+            return gethostname();
+        } else {
+            //Or, an option that also works before PHP 5.3
+            return php_uname('n');
+        }
+    }
 
-	public static function getHostname () : string {
-		if (function_exists("gethostname")) {
-			return gethostname();
-		} else {
-			//Or, an option that also works before PHP 5.3
-			return php_uname('n');
-		}
-	}
-
-	public static function sendPOSTRequest (string $url, array $data = array()) {
-		//check, if allow_url_fopen is enabled
-		if (PHPUtils::isUrlfopenEnabled()) {
-			// use key 'http' even if you send the request to https://...
-			$options = array(
-				'http' => array(
-					'header'  => "Content-type: application/x-www-form-urlencoded\r\n",
-					'method'  => 'POST',
-					'content' => http_build_query($data)
-				)
-			);
-			$context  = stream_context_create($options);
-			$result = file_get_contents($url, false, $context);
-
-			if ($result === FALSE) {
-				return false;
-			}
-
-			return $result;
-		} else {
-			//try to use curl instead
-
-			//https://stackoverflow.com/questions/2138527/php-curl-http-post-sample-code?utm_medium=organic&utm_source=google_rich_qa&utm_campaign=google_rich_qa
-
-			//create a new curl session
-			$ch = curl_init();
-
-			curl_setopt($ch, CURLOPT_URL, $url);
-			curl_setopt($ch, CURLOPT_POST, 1);
-			curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($data));//"postvar1=value1&postvar2=value2&postvar3=value3"
-
-			//receive server response
-			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-			$result = curl_exec ($ch);
-
-			//close curl session
-			curl_close ($ch);
-
-			return $result;
-		}
-	}
+    public static function sendPOSTRequest (string $url, array $data = array()) {
+        //check, if allow_url_fopen is enabled
+        if (PHPUtils::isUrlfopenEnabled()) {
+            // use key 'http' even if you send the request to https://...
+            $options = array(
+                'http' => array(
+                    'header'  => "Content-type: application/x-www-form-urlencoded\r\n",
+                    'method'  => 'POST',
+                    'content' => http_build_query($data)
+                )
+            );
+            $context  = stream_context_create($options);
+            $result = file_get_contents($url, false, $context);
+
+            if ($result === FALSE) {
+                return false;
+            }
+
+            return $result;
+        } else {
+            //try to use curl instead
+
+            //https://stackoverflow.com/questions/2138527/php-curl-http-post-sample-code?utm_medium=organic&utm_source=google_rich_qa&utm_campaign=google_rich_qa
+
+            //create a new curl session
+            $ch = curl_init();
+
+            curl_setopt($ch, CURLOPT_URL, $url);
+            curl_setopt($ch, CURLOPT_POST, 1);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($data));//"postvar1=value1&postvar2=value2&postvar3=value3"
+
+            //receive server response
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+            $result = curl_exec ($ch);
+
+            //close curl session
+            curl_close ($ch);
+
+            return $result;
+        }
+    }
 
-	public static function isUrlfopenEnabled () : bool {
-		$res = ini_get("allow_url_fopen");
+    public static function isUrlfopenEnabled () : bool {
+        $res = ini_get("allow_url_fopen");
 
-		if ($res) {
-			return true;
-		} else {
-			return false;
-		}
-	}
+        if ($res) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 
-	public static function isCurlAvailable () : bool {
-		/*if  (in_array  ('curl', get_loaded_extensions())) {
+    public static function isCurlAvailable () : bool {
+        /*if  (in_array  ('curl', get_loaded_extensions())) {
 			return true;
 		}
 		else {
 			return false;
 		}*/
 
-		return function_exists('curl_version');
-	}
+        return function_exists('curl_version');
+    }
 
-	public static function isGettextAvailable () : bool {
-		return function_exists("gettext");
-	}
+    public static function isGettextAvailable () : bool {
+        return function_exists("gettext");
+    }
 
-	public static function clearGetTextCache () {
-		//clear stats cache, often this clears also gettext cache
-		clearstatcache();
-	}
+    public static function clearGetTextCache () {
+        //clear stats cache, often this clears also gettext cache
+        clearstatcache();
+    }
 
-	public static function checkSessionStarted (bool $throw_exception = true) : bool {
-		if (session_status() !== PHP_SESSION_ACTIVE) {
-			if ($throw_exception) {
-				throw new IllegalStateException("session wasnt started yet.");
-			}
+    public static function checkSessionStarted (bool $throw_exception = true) : bool {
+        if (session_status() !== PHP_SESSION_ACTIVE) {
+            if ($throw_exception) {
+                throw new IllegalStateException("session wasnt started yet.");
+            }
 
-			return false;
-		}
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	public static function containsStr (string $haystack, string $needle) : bool {
-		return strpos($haystack, $needle) !== FALSE;
-	}
+    public static function containsStr (string $haystack, string $needle) : bool {
+        return strpos($haystack, $needle) !== FALSE;
+    }
 
 }

Spacing +20 added lines, -20 removed lines

@@ -2,17 +2,17 @@ 
 
 class PHPUtils {
 
-    public static function isMemcacheAvailable () {
+    public static function isMemcacheAvailable() {
         return class_exists('Memcache');
     }
 
-    public static function isMemcachedAvailable () {
+    public static function isMemcachedAvailable() {
         return class_exists('Memcached');
     }
 
-    public static function isModRewriteAvailable () {
+    public static function isModRewriteAvailable() {
     	if (function_exists("apache_get_modules")) {
-    		if (in_array('mod_rewrite',apache_get_modules())) {
+    		if (in_array('mod_rewrite', apache_get_modules())) {
     			return true;
 			}
 
@@ -22,14 +22,14 @@ 
 		return false;
 	}
 
-	public static function startsWith ($haystack, $needle) : bool {
+	public static function startsWith($haystack, $needle) : bool {
     	//https://stackoverflow.com/questions/834303/startswith-and-endswith-functions-in-php
 
 		$length = strlen($needle);
 		return (substr($haystack, 0, $length) === $needle);
 	}
 
-	public static function endsWith ($haystack, $needle) : bool {
+	public static function endsWith($haystack, $needle) : bool {
 		$length = strlen($needle);
 
 		return $length === 0 || (substr($haystack, -$length) === $needle);
@@ -40,7 +40,7 @@ 
 	 *
 	 * @return IPv4 / IPv6 address (up to 45 characters)
 	 */
-	public static function getClientIP () : string {
+	public static function getClientIP() : string {
     	//https://stackoverflow.com/questions/3003145/how-to-get-the-client-ip-address-in-php
 
     	$ip = "";
@@ -56,7 +56,7 @@ 
 		return $ip;
 	}
 
-	public static function strEqs (string $str1, string $str2) : bool {
+	public static function strEqs(string $str1, string $str2) : bool {
 		return strcmp($str1, $str2) === 0;
 	}
 
@@ -86,7 +86,7 @@ 
 		return $str;
 	}
 
-	public static function getHostname () : string {
+	public static function getHostname() : string {
 		if (function_exists("gethostname")) {
 			return gethostname();
 		} else {
@@ -95,7 +95,7 @@ 
 		}
 	}
 
-	public static function sendPOSTRequest (string $url, array $data = array()) {
+	public static function sendPOSTRequest(string $url, array $data = array()) {
 		//check, if allow_url_fopen is enabled
 		if (PHPUtils::isUrlfopenEnabled()) {
 			// use key 'http' even if you send the request to https://...
@@ -106,7 +106,7 @@ 
 					'content' => http_build_query($data)
 				)
 			);
-			$context  = stream_context_create($options);
+			$context = stream_context_create($options);
 			$result = file_get_contents($url, false, $context);
 
 			if ($result === FALSE) {
@@ -124,20 +124,20 @@ 
 
 			curl_setopt($ch, CURLOPT_URL, $url);
 			curl_setopt($ch, CURLOPT_POST, 1);
-			curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($data));//"postvar1=value1&postvar2=value2&postvar3=value3"
+			curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($data)); //"postvar1=value1&postvar2=value2&postvar3=value3"
 
 			//receive server response
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-			$result = curl_exec ($ch);
+			$result = curl_exec($ch);
 
 			//close curl session
-			curl_close ($ch);
+			curl_close($ch);
 
 			return $result;
 		}
 	}
 
-	public static function isUrlfopenEnabled () : bool {
+	public static function isUrlfopenEnabled() : bool {
 		$res = ini_get("allow_url_fopen");
 
 		if ($res) {
@@ -147,7 +147,7 @@ 
 		}
 	}
 
-	public static function isCurlAvailable () : bool {
+	public static function isCurlAvailable() : bool {
 		/*if  (in_array  ('curl', get_loaded_extensions())) {
 			return true;
 		}
@@ -158,16 +158,16 @@ 
 		return function_exists('curl_version');
 	}
 
-	public static function isGettextAvailable () : bool {
+	public static function isGettextAvailable() : bool {
 		return function_exists("gettext");
 	}
 
-	public static function clearGetTextCache () {
+	public static function clearGetTextCache() {
 		//clear stats cache, often this clears also gettext cache
 		clearstatcache();
 	}
 
-	public static function checkSessionStarted (bool $throw_exception = true) : bool {
+	public static function checkSessionStarted(bool $throw_exception = true) : bool {
 		if (session_status() !== PHP_SESSION_ACTIVE) {
 			if ($throw_exception) {
 				throw new IllegalStateException("session wasnt started yet.");
@@ -179,7 +179,7 @@ 
 		return true;
 	}
 
-	public static function containsStr (string $haystack, string $needle) : bool {
+	public static function containsStr(string $haystack, string $needle) : bool {
 		return strpos($haystack, $needle) !== FALSE;
 	}
 

system/core/classes/classloader.php

Indentation +51 added lines, -51 removed lines

@@ -107,47 +107,47 @@ 
         require(ROOT_PATH . "system/core/classes/" . strtolower($classname) . ".php");
         return null;
     } else if (file_exists(ROOT_PATH . "system/core/exception/" . strtolower($classname) . ".php")) {
-		require(ROOT_PATH . "system/core/exception/" . strtolower($classname) . ".php");
-		return null;
-	} else if (file_exists(ROOT_PATH . "system/core/driver/" . strtolower($classname) . ".php")) {
-		require(ROOT_PATH . "system/core/driver/" . strtolower($classname) . ".php");
-		return null;
-	}
-
-	//check, if class belongs to dwoo template engine
+        require(ROOT_PATH . "system/core/exception/" . strtolower($classname) . ".php");
+        return null;
+    } else if (file_exists(ROOT_PATH . "system/core/driver/" . strtolower($classname) . ".php")) {
+        require(ROOT_PATH . "system/core/driver/" . strtolower($classname) . ".php");
+        return null;
+    }
+
+    //check, if class belongs to dwoo template engine
     if (PHPUtils::startsWith($classname, "Dwoo")) {
         if (class_exists("DwooAutoloader", true)) {
             DwooAutoloader::loadClass($classname);
             return;
         } else {
-			echo "Could not load Dwoo template engine class " . $classname . "!";
+            echo "Could not load Dwoo template engine class " . $classname . "!";
         }
     }
 
     //check, if we have to use namespace classloading
-	if (PHPUtils::containsStr($classname, "\\")) {
-    	//we have to use namespace classloading
-		if (PHPUtils::startsWith($classname, "\\")) {
-			//use normal class loading
-			$classname = substr($classname, 1);
-		} else {
-			$array = explode("_", $classname);
-
-			if ($array[0] === "Plugin") {
-				//load plugin class
-				$path = PLUGIN_PATH . $array[1] . "/" . str_replace("\\", "/", $array[2]) . ".php";
-
-				if (file_exists($path)) {
-					require($path);
-				} else {
-					$expected_str = (DEBUG_MODE ? " (expected path: " . $path . ")" : "");
-					echo "Could not load plugin-class with namespace " . $classname . $expected_str . "!";
-				}
-			}
-
-			return;
-		}
-	}
+    if (PHPUtils::containsStr($classname, "\\")) {
+        //we have to use namespace classloading
+        if (PHPUtils::startsWith($classname, "\\")) {
+            //use normal class loading
+            $classname = substr($classname, 1);
+        } else {
+            $array = explode("_", $classname);
+
+            if ($array[0] === "Plugin") {
+                //load plugin class
+                $path = PLUGIN_PATH . $array[1] . "/" . str_replace("\\", "/", $array[2]) . ".php";
+
+                if (file_exists($path)) {
+                    require($path);
+                } else {
+                    $expected_str = (DEBUG_MODE ? " (expected path: " . $path . ")" : "");
+                    echo "Could not load plugin-class with namespace " . $classname . $expected_str . "!";
+                }
+            }
+
+            return;
+        }
+    }
 
     $array = explode("_", strtolower($classname));
 
@@ -170,32 +170,32 @@ 
         }
 
     } else if (sizeof($array) == 2) {
-		if ($array[0] == "validator") {
-			if (file_exists(ROOT_PATH . "system/core/validator/" . $array[1] . ".php")) {
-				require(ROOT_PATH . "system/core/validator/" . $array[1] . ".php");
-			} else {
-				echo "Could not load validator class " . $classname . "!";
-			}
-		} else if ($array[0] == "datatype") {
-			if (file_exists(ROOT_PATH . "system/core/datatype/" . $array[1] . ".php")) {
-				require(ROOT_PATH . "system/core/datatype/" . $array[1] . ".php");
-			} else {
-				echo "Could not load datatype class " . $classname . "!";
-			}
-		} else if (strpos($classname, "Plugin")) {
-			//dwoo tries several times to load a class - with and without namespace, so we hide this error message
-		} else {
-			echo "Could not load class " . $classname . ", unknown prefix '" . $array[0] . "'!";
+        if ($array[0] == "validator") {
+            if (file_exists(ROOT_PATH . "system/core/validator/" . $array[1] . ".php")) {
+                require(ROOT_PATH . "system/core/validator/" . $array[1] . ".php");
+            } else {
+                echo "Could not load validator class " . $classname . "!";
+            }
+        } else if ($array[0] == "datatype") {
+            if (file_exists(ROOT_PATH . "system/core/datatype/" . $array[1] . ".php")) {
+                require(ROOT_PATH . "system/core/datatype/" . $array[1] . ".php");
+            } else {
+                echo "Could not load datatype class " . $classname . "!";
+            }
+        } else if (strpos($classname, "Plugin")) {
+            //dwoo tries several times to load a class - with and without namespace, so we hide this error message
+        } else {
+            echo "Could not load class " . $classname . ", unknown prefix '" . $array[0] . "'!";
         }
-	} else if (sizeOf($array) == 1) {
+    } else if (sizeOf($array) == 1) {
 
         if (file_exists(ROOT_PATH . "system/classes/" . strtolower($classname) . ".php")) {
             include ROOT_PATH . "system/classes/" . strtolower($classname) . ".php";
         } else if (file_exists(ROOT_PATH . "system/libs/smarty/sysplugins/" . strtolower($classname) . "php")) {
             require ROOT_PATH . "system/libs/smarty/sysplugins/" . strtolower($classname) . ".php";
         } else if (strpos($classname, "Plugin") !== FALSE) {
-			//dwoo tries several times to load a class - with and without namespace, so we hide this error message
-		} else {
+            //dwoo tries several times to load a class - with and without namespace, so we hide this error message
+        } else {
             echo "Could not load class '" . $classname . "'' (array size 1)!";
         }