JuKu / JuKuCMS

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

Spacing +3 added lines, -3 removed lines

@@ -52,8 +52,8 @@ 
 
 				$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() . ".");
 				}
 			}
 		}
@@ -68,7 +68,7 @@ 
 		return $this->install($plugin, $install_json);
 	}
 
-	public function getPriority () : int {
+	public function getPriority() : int {
 		return 5;
 	}
 

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;
 }
 
 /**

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 $table->addVarchar("image", 600, true, "none");
 $table->addInt("all_day", 10, true, false, 0);
 $table->addTimestamp("from_date", true, "0000-00-00 00:00:00");
-$table->addTimestamp("to_date",true, "0000-00-00 00:00:00");
+$table->addTimestamp("to_date", true, "0000-00-00 00:00:00");
 $table->addVarchar("location", 600, true, "");
 $table->addVarchar("color", 255, true, "none");
 $table->addInt("activated", 10, true, false, 1);

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

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

system/packages/com.jukusoft.cms.apimethods/classes/apimethod.php

Spacing +7 added lines, -7 removed lines

@@ -21,11 +21,11 @@ 
 	protected $apimethods = array();
 	protected $method = array();
 
-	public function __construct () {
+	public function __construct() {
 		//
 	}
 
-	public function loadApiMethods () {
+	public function loadApiMethods() {
 
 		if (Cache::contains("apimethods", "apimethods")) {
 			$this->apimethods = Cache::get("apimethods", "apimethods");
@@ -42,7 +42,7 @@ 
 
 	}
 
-	public function loadMethod ($method) : bool {
+	public function loadMethod($method) : bool {
 		if (isset($this->apimethods[$method])) {
 			$this->method = $this->apimethods[$method];
 
@@ -52,7 +52,7 @@ 
 		return false;
 	}
 
-	public function executeApiMethod () {
+	public function executeApiMethod() {
 
 		if (!$this->method) {
 			exit;
@@ -81,7 +81,7 @@ 
 		}
 	}
 
-	public static function addMethod (string $api_method, string $class_name, string $method, string $owner = "system", string $response_type = "") {
+	public static function addMethod(string $api_method, string $class_name, string $method, string $owner = "system", string $response_type = "") {
 		//add method to database
 		Database::getInstance()->execute("INSERT INTO `{praefix}api_methods` (
 			`api_method`, `classname`, `method`, `response_type`, `owner`, `activated`
@@ -99,7 +99,7 @@ 
 		Cache::clear("apimethods");
 	}
 
-	public static function deleteMethod (string $api_method) {
+	public static function deleteMethod(string $api_method) {
 		//delete from database
 		Database::getInstance()->execute("DELETE FROM `{praefix}api_methods` WHERE `api_method` = :api_method; ", array(
 			'api_method' => $api_method
@@ -109,7 +109,7 @@ 
 		Cache::clear("apimethods");
 	}
 
-	public static function deleteMethodsByOwner (string $owner) {
+	public static function deleteMethodsByOwner(string $owner) {
 		//delete from database
 		Database::getInstance()->execute("DELETE FROM `{praefix}api_methods` WHERE `owner` = :owner; ", array(
 			'owner' => $owner

Indentation +78 added lines, -78 removed lines

@@ -18,106 +18,106 @@
 
 class ApiMethod {
 
-	protected $apimethods = array();
-	protected $method = array();
+    protected $apimethods = array();
+    protected $method = array();
 
-	public function __construct () {
-		//
-	}
+    public function __construct () {
+        //
+    }
 
-	public function loadApiMethods () {
+    public function loadApiMethods () {
 
-		if (Cache::contains("apimethods", "apimethods")) {
-			$this->apimethods = Cache::get("apimethods", "apimethods");
-		} else {
-			$rows = (Array) DataBase::getInstance()->listRows("SELECT * FROM `{praefix}api_methods` WHERE `activated` = '1'; ");
+        if (Cache::contains("apimethods", "apimethods")) {
+            $this->apimethods = Cache::get("apimethods", "apimethods");
+        } else {
+            $rows = (Array) DataBase::getInstance()->listRows("SELECT * FROM `{praefix}api_methods` WHERE `activated` = '1'; ");
 
-			foreach ($rows as $row) {
-				$row = (Array) $row;
-				$this->apimethods[$row['api_method']] = $row;
-			}
+            foreach ($rows as $row) {
+                $row = (Array) $row;
+                $this->apimethods[$row['api_method']] = $row;
+            }
 
-			Cache::put("apimethods", "apimethods", $this->apimethods);
-		}
+            Cache::put("apimethods", "apimethods", $this->apimethods);
+        }
 
-	}
+    }
 
-	public function loadMethod ($method) : bool {
-		if (isset($this->apimethods[$method])) {
-			$this->method = $this->apimethods[$method];
+    public function loadMethod ($method) : bool {
+        if (isset($this->apimethods[$method])) {
+            $this->method = $this->apimethods[$method];
 
-			return true;
-		}
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	public function executeApiMethod () {
+    public function executeApiMethod () {
 
-		if (!$this->method) {
-			exit;
-		}
+        if (!$this->method) {
+            exit;
+        }
 
-		if ($this->method['response_type'] != "specific") {
-			header("Content-Type: " . $this->method['response_type']);
-		}
+        if ($this->method['response_type'] != "specific") {
+            header("Content-Type: " . $this->method['response_type']);
+        }
 
-		$classname = $this->method['classname'];
-		$method = $this->method['method'];
+        $classname = $this->method['classname'];
+        $method = $this->method['method'];
 
-		$args = array();
-		Events::throwEvent("apimethods", array('method' => $this->method, 'args' => &$args));
+        $args = array();
+        Events::throwEvent("apimethods", array('method' => $this->method, 'args' => &$args));
 
-		$result = call_user_func(array($classname, $method), $args);
+        $result = call_user_func(array($classname, $method), $args);
 
-		if (is_array($result)) {
-			if (!isset($result['status'])) {
-				$result['status'] = 200;
-			}
+        if (is_array($result)) {
+            if (!isset($result['status'])) {
+                $result['status'] = 200;
+            }
 
-			echo json_encode($result);
-		} else {
-			echo $result;
-		}
-	}
+            echo json_encode($result);
+        } else {
+            echo $result;
+        }
+    }
 
-	public static function addMethod (string $api_method, string $class_name, string $method, string $owner = "system", string $response_type = "") {
-		//add method to database
-		Database::getInstance()->execute("INSERT INTO `{praefix}api_methods` (
+    public static function addMethod (string $api_method, string $class_name, string $method, string $owner = "system", string $response_type = "") {
+        //add method to database
+        Database::getInstance()->execute("INSERT INTO `{praefix}api_methods` (
 			`api_method`, `classname`, `method`, `response_type`, `owner`, `activated`
 		) VALUES (
 			:api_method, :class_name, :method, :response_type, :owner, '1'
 		) ON DUPLICATE KEY UPDATE `classname` = :class_name, `method` = :method, `response_type` = :response_type, `owner` = :owner, `activated` = '1'; ", array(
-			'api_method' => $api_method,
-			'class_name' => $class_name,
-			'method' => $method,
-			'response_type' => $response_type,
-			'owner' => $owner
-		));
-
-		//clear cache
-		Cache::clear("apimethods");
-	}
-
-	public static function deleteMethod (string $api_method) {
-		//delete from database
-		Database::getInstance()->execute("DELETE FROM `{praefix}api_methods` WHERE `api_method` = :api_method; ", array(
-			'api_method' => $api_method
-		));
-
-		//clear cache
-		Cache::clear("apimethods");
-	}
-
-	public static function deleteMethodsByOwner (string $owner) {
-		//delete from database
-		Database::getInstance()->execute("DELETE FROM `{praefix}api_methods` WHERE `owner` = :owner; ", array(
-			'owner' => $owner
-		));
-
-		//clear cache
-		Cache::clear("apimethods");
-	}
+            'api_method' => $api_method,
+            'class_name' => $class_name,
+            'method' => $method,
+            'response_type' => $response_type,
+            'owner' => $owner
+        ));
+
+        //clear cache
+        Cache::clear("apimethods");
+    }
+
+    public static function deleteMethod (string $api_method) {
+        //delete from database
+        Database::getInstance()->execute("DELETE FROM `{praefix}api_methods` WHERE `api_method` = :api_method; ", array(
+            'api_method' => $api_method
+        ));
+
+        //clear cache
+        Cache::clear("apimethods");
+    }
+
+    public static function deleteMethodsByOwner (string $owner) {
+        //delete from database
+        Database::getInstance()->execute("DELETE FROM `{praefix}api_methods` WHERE `owner` = :owner; ", array(
+            'owner' => $owner
+        ));
+
+        //clear cache
+        Cache::clear("apimethods");
+    }
 
 }
 

plugins/calender/classes/calenders.php

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
 
 class Calenders {
 
-	public static function listMyCalenderIDs (int $userUD) : array {
+	public static function listMyCalenderIDs(int $userUD) : array {
 		if (Cache::contains("plugin-calender", "calenderIDs-" . $userUD)) {
 			return Cache::get("plugin-calender", "calenderIDs-" . $userUD);
 		} else {
@@ -65,7 +65,7 @@ 
 		}
 	}
 
-	public static function listMyCalenders (int $userID) : array {
+	public static function listMyCalenders(int $userID) : array {
 		if (Cache::contains("plugin-calender", "my-calenders-" . $userID)) {
 			return Cache::get("plugin-calender", "my-calenders-" . $userID);
 		} else {
@@ -108,7 +108,7 @@ 
 	 *
 	 * @return array with calender IDs in form calenderID=>value
 	 */
-	protected static function listCalenderRowsByGroups (array $groupIDs) : array {
+	protected static function listCalenderRowsByGroups(array $groupIDs) : array {
 		$array = array();
 
 		foreach ($groupIDs as $id) {
@@ -129,7 +129,7 @@ 
 		return $res_array;
 	}
 
-	protected static function listCalenderRowsByUser (int $userID) : array {
+	protected static function listCalenderRowsByUser(int $userID) : array {
 		if (Cache::contains("plugin-calender", "calender-ids-by-user-" . $userID)) {
 			return Cache::get("plugin-calender", "calender-ids-by-user-" . $userID);
 		} else {
@@ -156,7 +156,7 @@ 
 		}
 	}
 
-	public static function valueToInt (string $value) : int {
+	public static function valueToInt(string $value) : int {
 		switch ($value) {
 			case "read":
 				return 1;

Indentation +133 added lines, -133 removed lines

@@ -35,139 +35,139 @@
 
 class Calenders {
 
-	public static function listMyCalenderIDs (int $userUD) : array {
-		if (Cache::contains("plugin-calender", "calenderIDs-" . $userUD)) {
-			return Cache::get("plugin-calender", "calenderIDs-" . $userUD);
-		} else {
-			$groups = new Groups();
-			$groups->loadMyGroups(User::current()->getID());
-			$groupIDs = $groups->listGroupIDs();
-
-			//get calenders by groups
-			$calender_ids = self::listCalenderRowsByGroups($groupIDs);
-
-			//merge arrays
-			foreach (self::listCalenderRowsByUser(User::current()->getID()) as $calenderID=>$row) {
-				if (isset($calender_ids[$calender_ids])) {
-					//check, which is higher permission
-					if (self::valueToInt($calender_ids[$calenderID]['value']) < self::valueToInt($row['value'])) {
-						$calender_ids[$calenderID] = $row;
-					}
-				} else {
-					$calender_ids[$calenderID] = $row;
-				}
-			}
-
-			//put results to cache
-			Cache::put("plugin-calender", "calenderIDs-" . $userUD, $calender_ids);
-
-			return $calender_ids;
-		}
-	}
-
-	public static function listMyCalenders (int $userID) : array {
-		if (Cache::contains("plugin-calender", "my-calenders-" . $userID)) {
-			return Cache::get("plugin-calender", "my-calenders-" . $userID);
-		} else {
-			$array = array();
-
-			$array1 = array();
-			$user_rows = array();
-
-			foreach (self::listMyCalenderIDs($userID) as $calenderID=>$row) {
-				$array1[] = "`id` = '" . intval($calenderID) . "'";
-				$user_rows[$calenderID] = $row;
-			}
-
-			$array_str = (!empty($array1) ? " OR " : "") . implode(" OR ", $array1);
-
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}plugin_calender_calenders` WHERE `id` = '-1'" . $array_str . "; ");
-
-			foreach ($rows as $row) {
-				$calenderID = $row['id'];
-
-				//create new calender
-				$calender = new Calender($row, $user_rows[$calenderID]);
-
-				$array[] = $calender;
-			}
-
-			//put array to cache
-			Cache::put("plugin-calender", "my-calenders-" . $userID, $array);
-
-			return $array;
-		}
-	}
-
-	/**
-	 * list calender ids in this form calenderID=>value
-	 *
-	 * Dont use this method directly, because its not cached!
-	 *
-	 * @param $groupIDs array with ids of groups, user belongs to
-	 *
-	 * @return array with calender IDs in form calenderID=>value
-	 */
-	protected static function listCalenderRowsByGroups (array $groupIDs) : array {
-		$array = array();
-
-		foreach ($groupIDs as $id) {
-			$array[] = "`groupID` = '" . intval($id) . "'";
-		}
-
-		$array_str = (!empty($array) ? " OR " : "") . implode(" OR ", $array);
-
-		$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}plugin_calender_group_rights` WHERE `groupID` = '-1'" . $array_str . "; ");
-
-		$res_array = array();
-
-		foreach ($rows as $row) {
-			$calenderID = $row['calenderID'];
-			$res_array[$calenderID] = $row;
-		}
-
-		return $res_array;
-	}
-
-	protected static function listCalenderRowsByUser (int $userID) : array {
-		if (Cache::contains("plugin-calender", "calender-ids-by-user-" . $userID)) {
-			return Cache::get("plugin-calender", "calender-ids-by-user-" . $userID);
-		} else {
-			$array = array();
-
-			//get calenders from database
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}plugin_calender_user_rights` WHERE `userID` = :userID; ", array(
-				'userID' => array(
-					'type' => PDO::PARAM_INT,
-					'value' => $userID
-				)
-			));
-
-			foreach ($rows as $row) {
-				$calenderID = $row['calenderID'];
-
-				$array[$calenderID] = $row;
-			}
-
-			//cache results
-			Cache::put("plugin-calender", "calender-ids-by-user-" . $userID, $array);
-
-			return $array;
-		}
-	}
-
-	public static function valueToInt (string $value) : int {
-		switch ($value) {
-			case "read":
-				return 1;
-			case "write":
-				return 2;
-			case "owner":
-				return 3;
-			default:
-				throw new \IllegalArgumentException("Unknown calender value '" . $value . "'!");
-		}
-	}
+    public static function listMyCalenderIDs (int $userUD) : array {
+        if (Cache::contains("plugin-calender", "calenderIDs-" . $userUD)) {
+            return Cache::get("plugin-calender", "calenderIDs-" . $userUD);
+        } else {
+            $groups = new Groups();
+            $groups->loadMyGroups(User::current()->getID());
+            $groupIDs = $groups->listGroupIDs();
+
+            //get calenders by groups
+            $calender_ids = self::listCalenderRowsByGroups($groupIDs);
+
+            //merge arrays
+            foreach (self::listCalenderRowsByUser(User::current()->getID()) as $calenderID=>$row) {
+                if (isset($calender_ids[$calender_ids])) {
+                    //check, which is higher permission
+                    if (self::valueToInt($calender_ids[$calenderID]['value']) < self::valueToInt($row['value'])) {
+                        $calender_ids[$calenderID] = $row;
+                    }
+                } else {
+                    $calender_ids[$calenderID] = $row;
+                }
+            }
+
+            //put results to cache
+            Cache::put("plugin-calender", "calenderIDs-" . $userUD, $calender_ids);
+
+            return $calender_ids;
+        }
+    }
+
+    public static function listMyCalenders (int $userID) : array {
+        if (Cache::contains("plugin-calender", "my-calenders-" . $userID)) {
+            return Cache::get("plugin-calender", "my-calenders-" . $userID);
+        } else {
+            $array = array();
+
+            $array1 = array();
+            $user_rows = array();
+
+            foreach (self::listMyCalenderIDs($userID) as $calenderID=>$row) {
+                $array1[] = "`id` = '" . intval($calenderID) . "'";
+                $user_rows[$calenderID] = $row;
+            }
+
+            $array_str = (!empty($array1) ? " OR " : "") . implode(" OR ", $array1);
+
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}plugin_calender_calenders` WHERE `id` = '-1'" . $array_str . "; ");
+
+            foreach ($rows as $row) {
+                $calenderID = $row['id'];
+
+                //create new calender
+                $calender = new Calender($row, $user_rows[$calenderID]);
+
+                $array[] = $calender;
+            }
+
+            //put array to cache
+            Cache::put("plugin-calender", "my-calenders-" . $userID, $array);
+
+            return $array;
+        }
+    }
+
+    /**
+     * list calender ids in this form calenderID=>value
+     *
+     * Dont use this method directly, because its not cached!
+     *
+     * @param $groupIDs array with ids of groups, user belongs to
+     *
+     * @return array with calender IDs in form calenderID=>value
+     */
+    protected static function listCalenderRowsByGroups (array $groupIDs) : array {
+        $array = array();
+
+        foreach ($groupIDs as $id) {
+            $array[] = "`groupID` = '" . intval($id) . "'";
+        }
+
+        $array_str = (!empty($array) ? " OR " : "") . implode(" OR ", $array);
+
+        $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}plugin_calender_group_rights` WHERE `groupID` = '-1'" . $array_str . "; ");
+
+        $res_array = array();
+
+        foreach ($rows as $row) {
+            $calenderID = $row['calenderID'];
+            $res_array[$calenderID] = $row;
+        }
+
+        return $res_array;
+    }
+
+    protected static function listCalenderRowsByUser (int $userID) : array {
+        if (Cache::contains("plugin-calender", "calender-ids-by-user-" . $userID)) {
+            return Cache::get("plugin-calender", "calender-ids-by-user-" . $userID);
+        } else {
+            $array = array();
+
+            //get calenders from database
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}plugin_calender_user_rights` WHERE `userID` = :userID; ", array(
+                'userID' => array(
+                    'type' => PDO::PARAM_INT,
+                    'value' => $userID
+                )
+            ));
+
+            foreach ($rows as $row) {
+                $calenderID = $row['calenderID'];
+
+                $array[$calenderID] = $row;
+            }
+
+            //cache results
+            Cache::put("plugin-calender", "calender-ids-by-user-" . $userID, $array);
+
+            return $array;
+        }
+    }
+
+    public static function valueToInt (string $value) : int {
+        switch ($value) {
+            case "read":
+                return 1;
+            case "write":
+                return 2;
+            case "owner":
+                return 3;
+            default:
+                throw new \IllegalArgumentException("Unknown calender value '" . $value . "'!");
+        }
+    }
 
 }