JuKu / JuKuCMS

system/core/validator/password.php

Indentation +31 added lines, -31 removed lines

@@ -27,44 +27,44 @@
 
 class Validator_Password implements Validator_Base {
 
-	public function isValide($value): bool {
-		$valide = true;
+    public function isValide($value): bool {
+        $valide = true;
 
-		//throw event, so plugins like pwned can interact
-		Events::throwEvent("validate_password", array(
-			'password' => &$value,
-			'valide' => &$valide
-		));
+        //throw event, so plugins like pwned can interact
+        Events::throwEvent("validate_password", array(
+            'password' => &$value,
+            'valide' => &$valide
+        ));
 
-		if (!$valide) {
-			return false;
-		}
+        if (!$valide) {
+            return false;
+        }
 
-		if (strlen($value) < Settings::get("password_min_length", 6)) {
-			return false;
-		}
+        if (strlen($value) < Settings::get("password_min_length", 6)) {
+            return false;
+        }
 
-		if (strlen($value) > Settings::get("password_max_length", 64)) {
-			//more than 64 characters arent supported
-			return false;
-		}
+        if (strlen($value) > Settings::get("password_max_length", 64)) {
+            //more than 64 characters arent supported
+            return false;
+        }
 
-		//everything is allowed
-		return true;
-	}
+        //everything is allowed
+        return true;
+    }
 
-	public function validate($value) {
-		if ($this->isValide($value)) {
-			return $value;
-		} else {
-			throw new SecurityException("password is not valide!");
-		}
-	}
+    public function validate($value) {
+        if ($this->isValide($value)) {
+            return $value;
+        } else {
+            throw new SecurityException("password is not valide!");
+        }
+    }
 
-	public static function get (string $value) : string {
-		$obj = new Validator_Password();
-		return $obj->validate($value);
-	}
+    public static function get (string $value) : string {
+        $obj = new Validator_Password();
+        return $obj->validate($value);
+    }
 
 }
 

system/packages/com.jukusoft.cms.permissions/classes/permissions.php

Indentation +112 added lines, -112 removed lines

@@ -27,126 +27,126 @@
 
 class Permissions {
 
-	public static function createOrUpdateCategory (string $category, string $title, int $order = 100, string $area = "global") {
-		//validate values
-		$category = Validator_AlphaNumeric::get($category);
-		$title = Validator_AlphaNumeric::get($category);
-		$area = Validator_AlphaNumeric::get($area);
-		$order = intval($order);
-
-		Database::getInstance()->execute("INSERT INTO `{praefix}permission_category` (
+    public static function createOrUpdateCategory (string $category, string $title, int $order = 100, string $area = "global") {
+        //validate values
+        $category = Validator_AlphaNumeric::get($category);
+        $title = Validator_AlphaNumeric::get($category);
+        $area = Validator_AlphaNumeric::get($area);
+        $order = intval($order);
+
+        Database::getInstance()->execute("INSERT INTO `{praefix}permission_category` (
 			`category`, `title`, `area`, `show`, `order`, `activated`
 		) VALUES (
 			:category, :title, :area, '1', :order, '1'
 		) ON DUPLICATE KEY UPDATE `title` = :title, `area` = :area, `order` = :order, `activated` = '1'; ", array(
-			'category' => $category,
-			'title' => $title,
-			'area' => $area,
-			'order' => $order
-		));
-
-		//clear cache
-		Cache::clear("permissions", "categories");
-	}
-
-	public static function deleteCategory (string $category) {
-		//validate value
-		$category = Validator_AlphaNumeric::get($category);
-
-		//delete from database
-		Database::getInstance()->execute("DELETE FROM `{praefix}permission_category` WHERE `category` = :category; ", array('category' => $category));
-
-		//clear cache
-		Cache::clear("permissions", "categories");
-	}
-
-	public static function createPermission (string $token, string $title, string $description, string $category = "general", string $owner = "system", int $order = 100) {
-		//validate values
-		$token = Validator_Token::get($token);
-		$title = Validator_String::get($title);
-		$description = Validator_String::get($description);
-		$category = Validator_Filename::get($category);
-		$owner = Validator_AlphaNumeric::get($owner);
-		$order = intval($order);
-
-		Database::getInstance()->execute("INSERT INTO `{praefix}permissions` (
+            'category' => $category,
+            'title' => $title,
+            'area' => $area,
+            'order' => $order
+        ));
+
+        //clear cache
+        Cache::clear("permissions", "categories");
+    }
+
+    public static function deleteCategory (string $category) {
+        //validate value
+        $category = Validator_AlphaNumeric::get($category);
+
+        //delete from database
+        Database::getInstance()->execute("DELETE FROM `{praefix}permission_category` WHERE `category` = :category; ", array('category' => $category));
+
+        //clear cache
+        Cache::clear("permissions", "categories");
+    }
+
+    public static function createPermission (string $token, string $title, string $description, string $category = "general", string $owner = "system", int $order = 100) {
+        //validate values
+        $token = Validator_Token::get($token);
+        $title = Validator_String::get($title);
+        $description = Validator_String::get($description);
+        $category = Validator_Filename::get($category);
+        $owner = Validator_AlphaNumeric::get($owner);
+        $order = intval($order);
+
+        Database::getInstance()->execute("INSERT INTO `{praefix}permissions` (
 			`token`, `title`, `description`, `category`, `owner`, `show`, `order`, `activated`
 		) VALUES (
 			:token, :title, :description, :category, :owner, '1', :order, '1'
 		) ON DUPLICATE KEY UPDATE `title` = :title, `description` = :description, `category` = :category, `owner` = :owner, `order` = :order, `activated` = '1'; ", array(
-			'token' => $token,
-			'title' => $title,
-			'description' => $description,
-			'category' => $category,
-			'owner' => $owner,
-			'order' => $order
-		));
-
-		//clear cache
-		Cache::clear("permissions", "permission_list");
-	}
-
-	public static function deletePermission (string $token) {
-		//validate value
-		$token = Validator_Token::get($token);
-
-		//delete from database
-		Database::getInstance()->execute("DELETE FROM `{praefix}permissions` WHERE `token` = :token; ", array('token' => $token));
-
-		//cleanup group and user rights table
-		self::deletePermissionsInGroupAndUserTable($token);
-
-		//clear cache
-		Cache::clear("permissions", "permission_list");
-	}
-
-	public static function deletePermissionsByOwner (string $owner) {
-		//cleanup group and user permissions with this specific tokens
-		Database::getInstance()->execute("DELETE `{praefix}group_rights` FROM `{praefix}group_rights` INNER JOIN `{praefix}permissions` ON `{praefix}permissions`.`token` = `{praefix}group_rights`.`token` WHERE `{praefix}permissions`.`owner` = :owner; ", array(
-			'owner' => $owner
-		));
-
-		//cleanup group and user permissions with this specific tokens
-		Database::getInstance()->execute("DELETE `{praefix}user_rights` FROM `{praefix}user_rights` INNER JOIN `{praefix}permissions` ON `{praefix}permissions`.`token` = `{praefix}user_rights`.`token` WHERE `{praefix}permissions`.`owner` = :owner; ", array(
-			'owner' => $owner
-		));
-
-		//delete from database
-		Database::getInstance()->execute("DELETE FROM `{praefix}permissions` WHERE `owner` = :owner; ", array('owner' => $owner));
-
-		//clear cache
-		Cache::clear("permissions", "permission_list");
-	}
-
-	protected static function deletePermissionsInGroupAndUserTable (string $token) {
-		//delete permission in groups table
-		Database::getInstance()->execute("DELETE FROM `{praefix}group_rights` WHERE `token` = :token; ", array('token' => $token));
-
-		//delete permission in user table
-		Database::getInstance()->execute("DELETE FROM `{praefix}user_rights` WHERE `token` = :token; ", array('token' => $token));
-	}
-
-	public static function listPermissions (string $category = "") : array {
-		$suffix = "";
-
-		if ($category != "") {
-			$suffix = "_" . Validator_AlphaNumeric::get($category);
-		}
-
-		if (Cache::contains("permissions", "permission_list" . $suffix)) {
-			return Cache::get("permissions", "permission_list" . $suffix);
-		} else {
-			if ($category == "") {
-				$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}permissions` WHERE `activated` = '1' ORDER BY `order`; ");
-			} else {
-				$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}permissions` WHERE `category` = :category, AND `activated` = '1' ORDER BY `order`; ", array('category' => $category));
-			}
-
-			Cache::put("permissions", "permission_list" . $suffix, $rows);
-
-			return $rows;
-		}
-	}
+            'token' => $token,
+            'title' => $title,
+            'description' => $description,
+            'category' => $category,
+            'owner' => $owner,
+            'order' => $order
+        ));
+
+        //clear cache
+        Cache::clear("permissions", "permission_list");
+    }
+
+    public static function deletePermission (string $token) {
+        //validate value
+        $token = Validator_Token::get($token);
+
+        //delete from database
+        Database::getInstance()->execute("DELETE FROM `{praefix}permissions` WHERE `token` = :token; ", array('token' => $token));
+
+        //cleanup group and user rights table
+        self::deletePermissionsInGroupAndUserTable($token);
+
+        //clear cache
+        Cache::clear("permissions", "permission_list");
+    }
+
+    public static function deletePermissionsByOwner (string $owner) {
+        //cleanup group and user permissions with this specific tokens
+        Database::getInstance()->execute("DELETE `{praefix}group_rights` FROM `{praefix}group_rights` INNER JOIN `{praefix}permissions` ON `{praefix}permissions`.`token` = `{praefix}group_rights`.`token` WHERE `{praefix}permissions`.`owner` = :owner; ", array(
+            'owner' => $owner
+        ));
+
+        //cleanup group and user permissions with this specific tokens
+        Database::getInstance()->execute("DELETE `{praefix}user_rights` FROM `{praefix}user_rights` INNER JOIN `{praefix}permissions` ON `{praefix}permissions`.`token` = `{praefix}user_rights`.`token` WHERE `{praefix}permissions`.`owner` = :owner; ", array(
+            'owner' => $owner
+        ));
+
+        //delete from database
+        Database::getInstance()->execute("DELETE FROM `{praefix}permissions` WHERE `owner` = :owner; ", array('owner' => $owner));
+
+        //clear cache
+        Cache::clear("permissions", "permission_list");
+    }
+
+    protected static function deletePermissionsInGroupAndUserTable (string $token) {
+        //delete permission in groups table
+        Database::getInstance()->execute("DELETE FROM `{praefix}group_rights` WHERE `token` = :token; ", array('token' => $token));
+
+        //delete permission in user table
+        Database::getInstance()->execute("DELETE FROM `{praefix}user_rights` WHERE `token` = :token; ", array('token' => $token));
+    }
+
+    public static function listPermissions (string $category = "") : array {
+        $suffix = "";
+
+        if ($category != "") {
+            $suffix = "_" . Validator_AlphaNumeric::get($category);
+        }
+
+        if (Cache::contains("permissions", "permission_list" . $suffix)) {
+            return Cache::get("permissions", "permission_list" . $suffix);
+        } else {
+            if ($category == "") {
+                $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}permissions` WHERE `activated` = '1' ORDER BY `order`; ");
+            } else {
+                $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}permissions` WHERE `category` = :category, AND `activated` = '1' ORDER BY `order`; ", array('category' => $category));
+            }
+
+            Cache::put("permissions", "permission_list" . $suffix, $rows);
+
+            return $rows;
+        }
+    }
 
 }
 

system/packages/com.jukusoft.cms.plugin/extensions/filepermissionsinstaller.php

Indentation +35 added lines, -35 removed lines

@@ -27,52 +27,52 @@
 
 class FilePermissionsInstaller extends PluginInstaller_Plugin {
 
-	public function install(Plugin $plugin, array $install_json): bool {
-		if (isset($install_json['chmod'])) {
-			$files = $install_json['chmod'];
+    public function install(Plugin $plugin, array $install_json): bool {
+        if (isset($install_json['chmod'])) {
+            $files = $install_json['chmod'];
 
-			foreach ($files as $file=>$chmod_value) {
-				if (strpos($file, "..") !== FALSE) {
-					throw new IllegalArgumentException("Its not allowed that chmod file path in install.json of plugin '" . $plugin->getName() . "' contains '..' in path.");
-				}
+            foreach ($files as $file=>$chmod_value) {
+                if (strpos($file, "..") !== FALSE) {
+                    throw new IllegalArgumentException("Its not allowed that chmod file path in install.json of plugin '" . $plugin->getName() . "' contains '..' in path.");
+                }
 
-				$file_path = ROOT_PATH . $file;
+                $file_path = ROOT_PATH . $file;
 
-				if (!file_exists($file_path)) {
-					//create directory
-					throw new IllegalStateException("directory '" . htmlentities($file_path) . "' doesnt exists.");
+                if (!file_exists($file_path)) {
+                    //create directory
+                    throw new IllegalStateException("directory '" . htmlentities($file_path) . "' doesnt exists.");
 
-					//TODO: remove this line later
-					//mkdir($file_path);
-				}
+                    //TODO: remove this line later
+                    //mkdir($file_path);
+                }
 
-				if (strlen($chmod_value) != 3) {
-					throw new IllegalArgumentException("Exception in install.json of plugin '" . $plugin->getName() . "': chmod value has to be a length of 3 characters (like 755).");
-				}
+                if (strlen($chmod_value) != 3) {
+                    throw new IllegalArgumentException("Exception in install.json of plugin '" . $plugin->getName() . "': chmod value has to be a length of 3 characters (like 755).");
+                }
 
-				$chmod_value = "0" . $chmod_value;
+                $chmod_value = "0" . $chmod_value;
 
-				if(!chmod($file_path, $chmod_value)) {
-					throw new IllegalStateException("Cannot change file permissions of directory '". $file_path . "' (plugin: " . $plugin->getName() . ".");
-				}
-			}
-		}
+                if(!chmod($file_path, $chmod_value)) {
+                    throw new IllegalStateException("Cannot change file permissions of directory '". $file_path . "' (plugin: " . $plugin->getName() . ".");
+                }
+            }
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	public function uninstall(Plugin $plugin, array $install_json): bool {
-		//dont do anything
-		return true;
-	}
+    public function uninstall(Plugin $plugin, array $install_json): bool {
+        //dont do anything
+        return true;
+    }
 
-	public function upgrade(Plugin $plugin, array $install_json): bool {
-		return $this->install($plugin, $install_json);
-	}
+    public function upgrade(Plugin $plugin, array $install_json): bool {
+        return $this->install($plugin, $install_json);
+    }
 
-	public function getPriority () : int {
-		return 5;
-	}
+    public function getPriority () : int {
+        return 5;
+    }
 
 }
 

system/packages/com.jukusoft.cms.tools/classes/sendmailpage.php

Indentation +80 added lines, -80 removed lines

@@ -27,20 +27,20 @@ 
 
 class SendMailPage extends PageType {
 
-	public function getAdditionalHeaderCode(): string {
-		$base_url = DomainUtils::getBaseURL() . "/";
+    public function getAdditionalHeaderCode(): string {
+        $base_url = DomainUtils::getBaseURL() . "/";
 
-		return "<!-- iCheck -->
+        return "<!-- iCheck -->
   				<link rel=\"stylesheet\" href=\"" . $base_url . "styles/admin/plugins/iCheck/flat/blue.css\">
 		
 				<!-- bootstrap wysihtml5 - text editor -->
   				<link rel=\"stylesheet\" href=\"" . $base_url . "styles/admin/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css\">";
-	}
+    }
 
-	public function getFooterScripts(): string {
-		$base_url = DomainUtils::getBaseURL() . "/";
+    public function getFooterScripts(): string {
+        $base_url = DomainUtils::getBaseURL() . "/";
 
-		return "<!-- iCheck -->
+        return "<!-- iCheck -->
 				<script src=\"" . $base_url . "styles/admin/plugins/iCheck/icheck.min.js\"></script>
 				<!-- Bootstrap WYSIHTML5 -->
 				<script src=\"" . $base_url . "styles/admin/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js\"></script>
@@ -59,79 +59,79 @@ 
 					});
 				  });
 				</script>";
-	}
-
-	public function getContent(): string {
-		$template = new DwooTemplate("pages/sendmail");
-
-		$template->assign("form_action", DomainUtils::generateURL("admin/sendmail"));
-		$template->assign("content", "");
-
-		if (isset($_REQUEST['submit'])) {
-			//first, check csrf token
-			if (!Security::checkCSRFToken()) {
-				$template->assign("error_message", "Wrong CSRF token!");
-
-				if (isset($_POST['content'])) {
-					$template->assign("content", $_POST['content']);
-				}
-			} else {
-				$required_fields = array("to_mail", "subject", "content");
-
-				foreach ($required_fields as $field) {
-					if (!isset($_POST[$field]) || empty($_POST[$field])) {
-						$template->assign("error_message", "Please complete form!");
-
-						if (isset($_POST['content'])) {
-							$template->assign("content", $_POST['content']);
-						}
-
-						return $template->getCode();
-					}
-				}
-
-				//form is complete
-
-				//get values
-				$to_mail = $_POST['to_mail'];
-				$subject = $_POST['subject'];
-				$content = $_POST['content'];
-
-				//check, if mail is valide
-				if (!(new Validator_Mail())->isValide($to_mail)) {
-					$template->assign("error_message", "Mail is not valide!");
-
-					if (isset($_POST['content'])) {
-						$template->assign("content", $_POST['content']);
-					}
-				} else if (!(new Validator_String())->isValide($subject)) {
-					$template->assign("error_message", "Subject is not valide!");
-
-					if (isset($_POST['content'])) {
-						$template->assign("content", $_POST['content']);
-					}
-				} else {
-					//parameters are valide, send mail
-
-					if (MailApi::sendHTMLMail($to_mail, $subject, $content)) {
-						$template->assign("success_message", "Mail sended successfully!");
-					} else {
-						$template->assign("error_message", "Sending of mail failed!");
-
-						if (isset($_POST['content'])) {
-							$template->assign("content", $_POST['content']);
-						}
-					}
-				}
-			}
-		}
-
-		return $template->getCode();
-	}
-
-	public function listRequiredPermissions(): array {
-		return array("can_send_board_mails");
-	}
+    }
+
+    public function getContent(): string {
+        $template = new DwooTemplate("pages/sendmail");
+
+        $template->assign("form_action", DomainUtils::generateURL("admin/sendmail"));
+        $template->assign("content", "");
+
+        if (isset($_REQUEST['submit'])) {
+            //first, check csrf token
+            if (!Security::checkCSRFToken()) {
+                $template->assign("error_message", "Wrong CSRF token!");
+
+                if (isset($_POST['content'])) {
+                    $template->assign("content", $_POST['content']);
+                }
+            } else {
+                $required_fields = array("to_mail", "subject", "content");
+
+                foreach ($required_fields as $field) {
+                    if (!isset($_POST[$field]) || empty($_POST[$field])) {
+                        $template->assign("error_message", "Please complete form!");
+
+                        if (isset($_POST['content'])) {
+                            $template->assign("content", $_POST['content']);
+                        }
+
+                        return $template->getCode();
+                    }
+                }
+
+                //form is complete
+
+                //get values
+                $to_mail = $_POST['to_mail'];
+                $subject = $_POST['subject'];
+                $content = $_POST['content'];
+
+                //check, if mail is valide
+                if (!(new Validator_Mail())->isValide($to_mail)) {
+                    $template->assign("error_message", "Mail is not valide!");
+
+                    if (isset($_POST['content'])) {
+                        $template->assign("content", $_POST['content']);
+                    }
+                } else if (!(new Validator_String())->isValide($subject)) {
+                    $template->assign("error_message", "Subject is not valide!");
+
+                    if (isset($_POST['content'])) {
+                        $template->assign("content", $_POST['content']);
+                    }
+                } else {
+                    //parameters are valide, send mail
+
+                    if (MailApi::sendHTMLMail($to_mail, $subject, $content)) {
+                        $template->assign("success_message", "Mail sended successfully!");
+                    } else {
+                        $template->assign("error_message", "Sending of mail failed!");
+
+                        if (isset($_POST['content'])) {
+                            $template->assign("content", $_POST['content']);
+                        }
+                    }
+                }
+            }
+        }
+
+        return $template->getCode();
+    }
+
+    public function listRequiredPermissions(): array {
+        return array("can_send_board_mails");
+    }
 
 }
 

system/packages/com.jukusoft.cms.tools/classes/clearcachepage.php

Indentation +6 added lines, -6 removed lines

@@ -27,15 +27,15 @@
 
 class ClearCachePage extends PageType {
 
-	public function getContent(): string {
-		Registry::singleton()->setSetting("clear_cache", true);
+    public function getContent(): string {
+        Registry::singleton()->setSetting("clear_cache", true);
 
-		$template = new DwooTemplate("pages/clearcache");
+        $template = new DwooTemplate("pages/clearcache");
 
-		$template->assign("success_message", "Cache cleared successfully!");
+        $template->assign("success_message", "Cache cleared successfully!");
 
-		return $template->getCode();
-	}
+        return $template->getCode();
+    }
 
 }
 

plugins/calender/install/install.php

Indentation +2 added lines, -2 removed lines

@@ -17,8 +17,8 @@
  */
 
 if (!defined("PLUGIN_INSTALLER")) {
-	echo "You cannot access this file directly!";
-	exit;
+    echo "You cannot access this file directly!";
+    exit;
 }
 
 /**

plugins/calender/install/uninstall.php

Indentation +2 added lines, -2 removed lines

@@ -26,8 +26,8 @@
  */
 
 if (!defined("PLUGIN_INSTALLER")) {
-	echo "You cannot access this file directly!";
-	exit;
+    echo "You cannot access this file directly!";
+    exit;
 }
 
 //delete plugin tables

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;
+    }
 
 }

system/packages/com.jukusoft.cms.plugin/extensions/apimethodinstaller.php

Indentation +28 added lines, -28 removed lines

@@ -27,34 +27,34 @@
 
 class ApiMethodInstaller extends PluginInstaller_Plugin {
 
-	public function install(Plugin $plugin, array $install_json): bool {
-		if (isset($install_json['api_methods'])) {
-			foreach ($install_json['api_methods'] as $array) {
-				$api_method = $array['api_method'];
-				$classname = $array['class'];
-				$method = $array['method'];
-
-				//add api method
-				ApiMethod::addMethod($api_method, $classname, $method, "plugin_" . $plugin->getName());
-			}
-		}
-
-		return true;
-	}
-
-	public function uninstall(Plugin $plugin, array $install_json): bool {
-		ApiMethod::deleteMethodsByOwner("plugin_" . $plugin->getName());
-
-		return true;
-	}
-
-	public function upgrade(Plugin $plugin, array $install_json): bool {
-		//remove api methods first
-		$this->uninstall($plugin, $install_json);
-
-		//install api methods
-		return $this->install($plugin, $install_json);
-	}
+    public function install(Plugin $plugin, array $install_json): bool {
+        if (isset($install_json['api_methods'])) {
+            foreach ($install_json['api_methods'] as $array) {
+                $api_method = $array['api_method'];
+                $classname = $array['class'];
+                $method = $array['method'];
+
+                //add api method
+                ApiMethod::addMethod($api_method, $classname, $method, "plugin_" . $plugin->getName());
+            }
+        }
+
+        return true;
+    }
+
+    public function uninstall(Plugin $plugin, array $install_json): bool {
+        ApiMethod::deleteMethodsByOwner("plugin_" . $plugin->getName());
+
+        return true;
+    }
+
+    public function upgrade(Plugin $plugin, array $install_json): bool {
+        //remove api methods first
+        $this->uninstall($plugin, $install_json);
+
+        //install api methods
+        return $this->install($plugin, $install_json);
+    }
 
 }