JuKu / JuKuCMS

system/packages/com.jukusoft.cms.user/classes/mailverifypage.php

Indentation +18 added lines, -18 removed lines

@@ -27,24 +27,24 @@
 
 class MailVerifyPage extends PageType {
 
-	public function getContent(): string {
-		$template = new DwooTemplate("pages/verifymail");
-
-		if (isset($_REQUEST['token']) && !empty($_REQUEST['token'])) {
-			$template->assign("no_token", false);
-
-			//check token
-			if (!Mail_Verification::checkToken($_REQUEST['token'])) {
-				$template->assign("invalide_token", true);
-			} else {
-				$template->assign("invalide_token", false);
-			}
-		} else {
-			$template->assign("no_token", true);
-		}
-
-		return $template->getCode();
-	}
+    public function getContent(): string {
+        $template = new DwooTemplate("pages/verifymail");
+
+        if (isset($_REQUEST['token']) && !empty($_REQUEST['token'])) {
+            $template->assign("no_token", false);
+
+            //check token
+            if (!Mail_Verification::checkToken($_REQUEST['token'])) {
+                $template->assign("invalide_token", true);
+            } else {
+                $template->assign("invalide_token", false);
+            }
+        } else {
+            $template->assign("no_token", true);
+        }
+
+        return $template->getCode();
+    }
 
 }
 

system/packages/com.jukusoft.cms.dwoo/dwoo/lib/Dwoo/Plugins/Functions/PluginPLang.php

Indentation +10 added lines, -10 removed lines

@@ -33,16 +33,16 @@
 
 class PluginPLang extends Plugin implements ICompilable {
 
-	/**
-	 * @param Compiler $compiler
-	 * @param mixed    $value
-	 * @param mixed    $var
-	 *
-	 * @return string
-	 */
-	public static function compile(Compiler $compiler, $msg1, $msg2, $n, $domain = "") {
-		return 'Translator::n_translate(' . $msg1 . ', ' . $msg2 . ', ' . $n . ', ' . $domain . ')';
-	}
+    /**
+     * @param Compiler $compiler
+     * @param mixed    $value
+     * @param mixed    $var
+     *
+     * @return string
+     */
+    public static function compile(Compiler $compiler, $msg1, $msg2, $n, $domain = "") {
+        return 'Translator::n_translate(' . $msg1 . ', ' . $msg2 . ', ' . $n . ', ' . $domain . ')';
+    }
 
 }
 

system/packages/com.jukusoft.cms.lang/classes/translator_backend.php

Indentation +31 added lines, -31 removed lines

@@ -27,41 +27,41 @@
 
 interface Translator_Backend {
 
-	/**
-	 * initialize translator backend
-	 *
-	 * @param $lang_token $lang_token contains language & country, e.q. de_DE
-	 */
-	public function init (string $lang_token);
+    /**
+     * initialize translator backend
+     *
+     * @param $lang_token $lang_token contains language & country, e.q. de_DE
+     */
+    public function init (string $lang_token);
 
-	/**
-	 * translate a string
-	 *
-	 * @param string $key message to translate
-	 * @param string $domain domain where to search key (optional)
-	 * @param array $params array with params to replace in translated message
-	 *
-	 * @return string translated message
-	 */
-	public function translate (string $key, string $domain = "", $params = null) : string;
+    /**
+     * translate a string
+     *
+     * @param string $key message to translate
+     * @param string $domain domain where to search key (optional)
+     * @param array $params array with params to replace in translated message
+     *
+     * @return string translated message
+     */
+    public function translate (string $key, string $domain = "", $params = null) : string;
 
-	/**
-	 * translate a string, plural version of translate()
-	 *
-	 * @see Translator_Backend::translate()
-	 * @since 0.1.0
-	 *
-	 * @param string $key message to translate
-	 * @param string $domain domain where to search key (optional)
-	 * @param array $params array with params to replace in translated message
-	 *
-	 * @return string translated message
-	 */
-	public function n_translate (string $key, string $plural_key, int $n, string $domain = "", $params = null) : string;
+    /**
+     * translate a string, plural version of translate()
+     *
+     * @see Translator_Backend::translate()
+     * @since 0.1.0
+     *
+     * @param string $key message to translate
+     * @param string $domain domain where to search key (optional)
+     * @param array $params array with params to replace in translated message
+     *
+     * @return string translated message
+     */
+    public function n_translate (string $key, string $plural_key, int $n, string $domain = "", $params = null) : string;
 
-	public function bindLangPack (string $domain, string $path);
+    public function bindLangPack (string $domain, string $path);
 
-	public function setDefaultDomain (string $domain);
+    public function setDefaultDomain (string $domain);
 
 }
 

Spacing +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
 	 *
 	 * @param $lang_token $lang_token contains language & country, e.q. de_DE
 	 */
-	public function init (string $lang_token);
+	public function init(string $lang_token);
 
 	/**
 	 * translate a string
@@ -43,7 +43,7 @@ 
 	 *
 	 * @return string translated message
 	 */
-	public function translate (string $key, string $domain = "", $params = null) : string;
+	public function translate(string $key, string $domain = "", $params = null) : string;
 
 	/**
 	 * translate a string, plural version of translate()
@@ -57,11 +57,11 @@ 
 	 *
 	 * @return string translated message
 	 */
-	public function n_translate (string $key, string $plural_key, int $n, string $domain = "", $params = null) : string;
+	public function n_translate(string $key, string $plural_key, int $n, string $domain = "", $params = null) : string;
 
-	public function bindLangPack (string $domain, string $path);
+	public function bindLangPack(string $domain, string $path);
 
-	public function setDefaultDomain (string $domain);
+	public function setDefaultDomain(string $domain);
 
 }
 

system/packages/com.jukusoft.cms.lang/classes/gettextbackend.php

Indentation +67 added lines, -67 removed lines

@@ -27,73 +27,73 @@
 
 class GetTextBackend implements Translator_Backend {
 
-	//current language token
-	protected $lang_token = "";
-
-	//current domain
-	protected $domain = "";
-
-	/**
-	 * initialize translator backend
-	 *
-	 * @param $lang_token $lang_token contains language & country, e.q. de_DE
-	 */
-	public function init(string $lang_token) {
-		//check, if gettext is available
-		if (!PHPUtils::isGettextAvailable()) {
-			throw new IllegalStateException("PHP extension 'gettext' is not available.");
-		}
-
-		putenv("LANG=" . $lang_token);
-		setlocale(LC_ALL, $lang_token);
-	}
-
-	public function translate(string $key, string $domain = "", $params = null): string {
-		$text = "";
-
-		if (empty($domain)) {
-			$text = gettext($key);
-		} else {
-			$text = dgettext($domain, $key);
-		}
-
-		if ($params != null && !empty($params)) {
-			foreach ($params as $key=>$value) {
-				//replace variables
-				$text = str_replace("{" . $key . "}", $value, $text);
-			}
-		}
-
-		return $text;
-	}
-
-	public function n_translate (string $key, string $plural_key, int $n, string $domain = "", $params = null) : string {
-		$text = "";
-
-		if (empty($domain)) {
-			$text = ngettext($key, $plural_key, $n);
-		} else {
-			$text = dngettext($domain, $key, $plural_key, $n);
-		}
-
-		if ($params != null && !empty($params)) {
-			foreach ($params as $key=>$value) {
-				//replace variables
-				$text = str_replace("{" . $key . "}", $value, $text);
-			}
-		}
-
-		return $text;
-	}
-
-	public function bindLangPack(string $domain, string $path) {
-		bindtextdomain($domain, $path);
-		bind_textdomain_codeset($domain, 'UTF-8');
-	}
-
-	public function setDefaultDomain(string $domain) {
-		textdomain($domain);
-	}
+    //current language token
+    protected $lang_token = "";
+
+    //current domain
+    protected $domain = "";
+
+    /**
+     * initialize translator backend
+     *
+     * @param $lang_token $lang_token contains language & country, e.q. de_DE
+     */
+    public function init(string $lang_token) {
+        //check, if gettext is available
+        if (!PHPUtils::isGettextAvailable()) {
+            throw new IllegalStateException("PHP extension 'gettext' is not available.");
+        }
+
+        putenv("LANG=" . $lang_token);
+        setlocale(LC_ALL, $lang_token);
+    }
+
+    public function translate(string $key, string $domain = "", $params = null): string {
+        $text = "";
+
+        if (empty($domain)) {
+            $text = gettext($key);
+        } else {
+            $text = dgettext($domain, $key);
+        }
+
+        if ($params != null && !empty($params)) {
+            foreach ($params as $key=>$value) {
+                //replace variables
+                $text = str_replace("{" . $key . "}", $value, $text);
+            }
+        }
+
+        return $text;
+    }
+
+    public function n_translate (string $key, string $plural_key, int $n, string $domain = "", $params = null) : string {
+        $text = "";
+
+        if (empty($domain)) {
+            $text = ngettext($key, $plural_key, $n);
+        } else {
+            $text = dngettext($domain, $key, $plural_key, $n);
+        }
+
+        if ($params != null && !empty($params)) {
+            foreach ($params as $key=>$value) {
+                //replace variables
+                $text = str_replace("{" . $key . "}", $value, $text);
+            }
+        }
+
+        return $text;
+    }
+
+    public function bindLangPack(string $domain, string $path) {
+        bindtextdomain($domain, $path);
+        bind_textdomain_codeset($domain, 'UTF-8');
+    }
+
+    public function setDefaultDomain(string $domain) {
+        textdomain($domain);
+    }
 }
 
 ?>

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 		return $text;
 	}
 
-	public function n_translate (string $key, string $plural_key, int $n, string $domain = "", $params = null) : string {
+	public function n_translate(string $key, string $plural_key, int $n, string $domain = "", $params = null) : string {
 		$text = "";
 
 		if (empty($domain)) {

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

Indentation +21 added lines, -21 removed lines

@@ -27,12 +27,12 @@ 
 
 class PHPInfoPage extends PageType {
 
-	public function getContent(): string {
-		if (isset($_REQUEST['no_design'])) {
-			phpinfo();
-			exit;
-		} else {
-			/*$content = "";
+    public function getContent(): string {
+        if (isset($_REQUEST['no_design'])) {
+            phpinfo();
+            exit;
+        } else {
+            /*$content = "";
 
 			ob_start();
 			phpinfo();
@@ -41,25 +41,25 @@ 
 
 			return $content;*/
 
-			//https://github.com/Froxlor/Froxlor/blob/5437fcdc898cb505348b89c5a3d09a16e29f67d2/admin_settings.php
+            //https://github.com/Froxlor/Froxlor/blob/5437fcdc898cb505348b89c5a3d09a16e29f67d2/admin_settings.php
 
-			//show iframe
-			return $this->generateNormalPage(" <iframe src=\"" . DomainUtils::generateURL("admin/phpinfo") . "?no_design=true\" style=\"width: 100%; min-height: 800px; \"></iframe> ");
-		}
-	}
+            //show iframe
+            return $this->generateNormalPage(" <iframe src=\"" . DomainUtils::generateURL("admin/phpinfo") . "?no_design=true\" style=\"width: 100%; min-height: 800px; \"></iframe> ");
+        }
+    }
 
-	public function setCustomHeader() {
-		//allow iframe
-		header('X-Frame-Options: SAMEORIGIN');
-	}
+    public function setCustomHeader() {
+        //allow iframe
+        header('X-Frame-Options: SAMEORIGIN');
+    }
 
-	public function showDesign() {
-		return !isset($_REQUEST['no_design']);
-	}
+    public function showDesign() {
+        return !isset($_REQUEST['no_design']);
+    }
 
-	public function listRequiredPermissions(): array {
-		return array("can_see_phpinfo");
-	}
+    public function listRequiredPermissions(): array {
+        return array("can_see_phpinfo");
+    }
 
 }
 

system/packages/com.jukusoft.cms.lang/classes/translator.php

Indentation +89 added lines, -89 removed lines

@@ -27,96 +27,96 @@
 
 class Translator {
 
-	/**
-	 *
-	 */
-	protected static $backend = null;
-
-	/**
-	 * translate a string
-	 *
-	 * @param string $key message to translate
-	 * @param string $domain domain where to search key (optional)
-	 * @param array $params array with params to replace in translated message
-	 *
-	 * @throws IllegalStateException if settings key "translator_class_name" is not set
-	 * @see Translator_Backend::translate()
-	 * @since 0.1.0
-	 *
-	 * @return string translated message
-	 */
-	public static function translate (string $key, string $domain = "", $params = null) : string {
-		return self::getBackend()->translate($key, $domain, $params);
-	}
-
-	/**
-	 * translate a string, plural version of translate()
-	 *
-	 * @param string $key message to translate
-	 * @param string $domain domain where to search key (optional)
-	 * @param array $params array with params to replace in translated message
-	 *
-	 * @throws IllegalStateException if settings key "translator_class_name" is not set
-	 * @see Translator_Backend::n_translate()
-	 * @since 0.1.0
-	 *
-	 * @return string translated message
-	 */
-	public static function n_translate (string $key, string $plural_key, int $n, string $domain = "", $params = null) : string {
-		return self::getBackend()->n_translate($key, $plural_key, $n, $domain, $params);
-	}
+    /**
+     *
+     */
+    protected static $backend = null;
+
+    /**
+     * translate a string
+     *
+     * @param string $key message to translate
+     * @param string $domain domain where to search key (optional)
+     * @param array $params array with params to replace in translated message
+     *
+     * @throws IllegalStateException if settings key "translator_class_name" is not set
+     * @see Translator_Backend::translate()
+     * @since 0.1.0
+     *
+     * @return string translated message
+     */
+    public static function translate (string $key, string $domain = "", $params = null) : string {
+        return self::getBackend()->translate($key, $domain, $params);
+    }
+
+    /**
+     * translate a string, plural version of translate()
+     *
+     * @param string $key message to translate
+     * @param string $domain domain where to search key (optional)
+     * @param array $params array with params to replace in translated message
+     *
+     * @throws IllegalStateException if settings key "translator_class_name" is not set
+     * @see Translator_Backend::n_translate()
+     * @since 0.1.0
+     *
+     * @return string translated message
+     */
+    public static function n_translate (string $key, string $plural_key, int $n, string $domain = "", $params = null) : string {
+        return self::getBackend()->n_translate($key, $plural_key, $n, $domain, $params);
+    }
 	
-	public static function translateTitle (string $token) {
-		//translate title
-		if (strpos($token, "lang_") !== FALSE) {
-			$array1 = explode("_", $token);
-
-			if (count($array1) == 2) {
-				//translate
-				$token = Translator::translate($array1[1]);
-			} else if (count($array1) == 3) {
-				//translate with domain
-				$token = Translator::translate($array1[2], $array1[1]);
-			} else if (count($array1) > 3) {
-				$token_parts = array();
-
-				for ($i = 2; $i < count($array1); $i++) {
-					$token_parts[] = $array1[$i];
-				}
-
-				//generate final token
-				$token = implode("_", $token_parts);
-
-				//translate with domain
-				$token = Translator::translate($token, $array1[1]);
-			}
-		}
-
-		return $token;
-	}
-
-	/**
-	 * get current instance of translator backend
-	 *
-	 * @see GetTextBackend
-	 *
-	 * @throws IllegalStateException if settings key "translator_class_name" is not set
-	 *
-	 * @return Translator_Backend instance of translator backend
-	 */
-	public static function &getBackend () : Translator_Backend {
-		if (self::$backend == null) {
-			//get translator backend
-			$class_name = Settings::get("translator_class_name", "GetTextBackend");
-
-			self::$backend = new $class_name();
-
-			//initialize backend with current language
-			self::$backend->init(Registry::singleton()->getSetting("lang_token"));
-		}
-
-		return self::$backend;
-	}
+    public static function translateTitle (string $token) {
+        //translate title
+        if (strpos($token, "lang_") !== FALSE) {
+            $array1 = explode("_", $token);
+
+            if (count($array1) == 2) {
+                //translate
+                $token = Translator::translate($array1[1]);
+            } else if (count($array1) == 3) {
+                //translate with domain
+                $token = Translator::translate($array1[2], $array1[1]);
+            } else if (count($array1) > 3) {
+                $token_parts = array();
+
+                for ($i = 2; $i < count($array1); $i++) {
+                    $token_parts[] = $array1[$i];
+                }
+
+                //generate final token
+                $token = implode("_", $token_parts);
+
+                //translate with domain
+                $token = Translator::translate($token, $array1[1]);
+            }
+        }
+
+        return $token;
+    }
+
+    /**
+     * get current instance of translator backend
+     *
+     * @see GetTextBackend
+     *
+     * @throws IllegalStateException if settings key "translator_class_name" is not set
+     *
+     * @return Translator_Backend instance of translator backend
+     */
+    public static function &getBackend () : Translator_Backend {
+        if (self::$backend == null) {
+            //get translator backend
+            $class_name = Settings::get("translator_class_name", "GetTextBackend");
+
+            self::$backend = new $class_name();
+
+            //initialize backend with current language
+            self::$backend->init(Registry::singleton()->getSetting("lang_token"));
+        }
+
+        return self::$backend;
+    }
 
 }
 

Spacing +4 added lines, -4 removed lines

@@ -45,7 +45,7 @@ 
 	 *
 	 * @return string translated message
 	 */
-	public static function translate (string $key, string $domain = "", $params = null) : string {
+	public static function translate(string $key, string $domain = "", $params = null) : string {
 		return self::getBackend()->translate($key, $domain, $params);
 	}
 
@@ -62,11 +62,11 @@ 
 	 *
 	 * @return string translated message
 	 */
-	public static function n_translate (string $key, string $plural_key, int $n, string $domain = "", $params = null) : string {
+	public static function n_translate(string $key, string $plural_key, int $n, string $domain = "", $params = null) : string {
 		return self::getBackend()->n_translate($key, $plural_key, $n, $domain, $params);
 	}
 	
-	public static function translateTitle (string $token) {
+	public static function translateTitle(string $token) {
 		//translate title
 		if (strpos($token, "lang_") !== FALSE) {
 			$array1 = explode("_", $token);
@@ -104,7 +104,7 @@ 
 	 *
 	 * @return Translator_Backend instance of translator backend
 	 */
-	public static function &getBackend () : Translator_Backend {
+	public static function &getBackend() : Translator_Backend {
 		if (self::$backend == null) {
 			//get translator backend
 			$class_name = Settings::get("translator_class_name", "GetTextBackend");

system/packages/com.jukusoft.cms.dwoo/dwoo/lib/Dwoo/Plugins/Blocks/PluginLang.php

Indentation +38 added lines, -38 removed lines

@@ -32,64 +32,64 @@
 
 class PluginLang extends Plugin implements ICompilableBlock {
 
-	protected static $domain = "";
-
-	/**
-	 * @param Compiler $compiler
-	 * @param mixed    $value
-	 * @param mixed    $var
-	 *
-	 * @return string
-	 */
-	/*public static function compile(Compiler $compiler, $value, $domain = "") {
+    protected static $domain = "";
+
+    /**
+     * @param Compiler $compiler
+     * @param mixed    $value
+     * @param mixed    $var
+     *
+     * @return string
+     */
+    /*public static function compile(Compiler $compiler, $value, $domain = "") {
 		return 'Translator::translate(' . $value . ', ' . $domain . ')';
 	}*/
 
-	// parameters go here if you need any settings
-	public function init() {
-		//
-	}
+    // parameters go here if you need any settings
+    public function init() {
+        //
+    }
 
-	// this can be ommitted, it's called once when the block ends, don't implement if you don't need it
-	public function end() {
-		//
-	}
+    // this can be ommitted, it's called once when the block ends, don't implement if you don't need it
+    public function end() {
+        //
+    }
 
-	// this is called when the block is required to output it's data, it should read $this->buffer, process it and return it
-	/*public function process(){
+    // this is called when the block is required to output it's data, it should read $this->buffer, process it and return it
+    /*public function process(){
 		var_dump($this->buffer);
 
 		return strtoupper($this->buffer);
 	}*/
 
-	public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type) {
-		$domain = "";
+    public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type) {
+        $domain = "";
 
-		/*if (isset($params[1])) {
+        /*if (isset($params[1])) {
 			$domain = $params[1][1];
 		}
 
 		return Compiler::PHP_OPEN . $prepend . " echo Translator::translate(\"" . $params[0][1] . "\", \"" . $domain . "\"); " . $append . Compiler::PHP_CLOSE;*/
 
-		if (isset($params[0])) {
-			$domain = $params[0][1];
-		}
+        if (isset($params[0])) {
+            $domain = $params[0][1];
+        }
 
-		self::$domain = $domain;
+        self::$domain = $domain;
 
-		return Compiler::PHP_OPEN . "echo Translator::translate(\"";
-	}
+        return Compiler::PHP_OPEN . "echo Translator::translate(\"";
+    }
 
-	public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content) {
-		/**
-		 * the block is responsible for outputting it's entire content (passed as $content),
-		 * so you can transform it and then return it, but in this case we don't because
-		 * we want the content to be uppercased at runtime and not at compile time
-		 */
-		//return $content . Compiler::PHP_OPEN . $prepend . ' ' . $append . Compiler::PHP_CLOSE;
+    public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content) {
+        /**
+         * the block is responsible for outputting it's entire content (passed as $content),
+         * so you can transform it and then return it, but in this case we don't because
+         * we want the content to be uppercased at runtime and not at compile time
+         */
+        //return $content . Compiler::PHP_OPEN . $prepend . ' ' . $append . Compiler::PHP_CLOSE;
 
-		return $content . "\", \"" . self::$domain . "\"); " . Compiler::PHP_CLOSE;
-	}
+        return $content . "\", \"" . self::$domain . "\"); " . Compiler::PHP_CLOSE;
+    }
 
 }
 

system/packages/com.jukusoft.cms.dwoo/classes/dwootemplate.php

Indentation +112 added lines, -112 removed lines

@@ -27,155 +27,155 @@
 
 class DwooTemplate extends Template {
 
-	protected static $core = null;
+    protected static $core = null;
 
-	protected static $files = array();
+    protected static $files = array();
 
-	protected static $benchmark = array();
+    protected static $benchmark = array();
 
-	//variables
-	//protected $vars = array();
-	protected $data = null;
+    //variables
+    //protected $vars = array();
+    protected $data = null;
 
-	protected $file = "";
-	protected $template = null;
+    protected $file = "";
+    protected $template = null;
 
-	public function __construct($file, Registry $registry = null) {
-		if ($registry == null) {
-			$registry = Registry::singleton();
-		}
+    public function __construct($file, Registry $registry = null) {
+        if ($registry == null) {
+            $registry = Registry::singleton();
+        }
 
-		//initialize core if neccessary
-		self::initCoreIfAbsent();
+        //initialize core if neccessary
+        self::initCoreIfAbsent();
 
-		$start_time = microtime(true);
+        $start_time = microtime(true);
 
-		//find file
-		$this->file = Template::findTemplate($file, $registry);
+        //find file
+        $this->file = Template::findTemplate($file, $registry);
 
-		//load a template file, this is reusable if you want to render multiple times the same template with different data
-		if (isset(self::$files[$file])) {
-			$this->template = self::$files[$this->file];
-		} else {
-			$this->template = new Dwoo\Template\File($this->file);
-			self::$files[$file] = $this->template;
-		}
+        //load a template file, this is reusable if you want to render multiple times the same template with different data
+        if (isset(self::$files[$file])) {
+            $this->template = self::$files[$this->file];
+        } else {
+            $this->template = new Dwoo\Template\File($this->file);
+            self::$files[$file] = $this->template;
+        }
 
-		//create a data set, this data set can be reused to render multiple templates if it contains enough data to fill them all
-		$this->data = new Dwoo\Data();
+        //create a data set, this data set can be reused to render multiple templates if it contains enough data to fill them all
+        $this->data = new Dwoo\Data();
 
-		//set default values
-		$this->assign("REGISTRY", $registry->listSettings());
+        //set default values
+        $this->assign("REGISTRY", $registry->listSettings());
 
-		//set CSRF token
-		$this->assign("CSRF_TOKEN", Security::getCSRFToken());
+        //set CSRF token
+        $this->assign("CSRF_TOKEN", Security::getCSRFToken());
 
-		//set domain, current page and so on
-		$this->assign("DOMAIN", DomainUtils::getCurrentDomain());
-		$this->assign("BASE_URL", DomainUtils::getBaseURL());
-		$this->assign("CURRENT_URL", DomainUtils::getURL());
-		$this->assign("FOLDER", $registry->getSetting("folder"));
+        //set domain, current page and so on
+        $this->assign("DOMAIN", DomainUtils::getCurrentDomain());
+        $this->assign("BASE_URL", DomainUtils::getBaseURL());
+        $this->assign("CURRENT_URL", DomainUtils::getURL());
+        $this->assign("FOLDER", $registry->getSetting("folder"));
 
-		//set language settings
-		$this->assign("PREF_LANG", $registry->getSetting("pref_lang"));
-		$this->assign("LANG_TOKEN", $registry->getSetting("lang_token"));
+        //set language settings
+        $this->assign("PREF_LANG", $registry->getSetting("pref_lang"));
+        $this->assign("LANG_TOKEN", $registry->getSetting("lang_token"));
 
-		$domain = $registry->getObject("domain");
-		$this->assign("HOME_PAGE", $domain->getHomePage());
-		$this->assign("LOGIN_PAGE", Settings::get("login_page", "login"));
-		$this->assign("LOGIN_URL", $registry->getSetting("login_url"));
-		$this->assign("LOGOUT_PAGE", Settings::get("logout_page", "logout"));
-		$this->assign("LOGOUT_URL", $registry->getSetting("logout_url"));
+        $domain = $registry->getObject("domain");
+        $this->assign("HOME_PAGE", $domain->getHomePage());
+        $this->assign("LOGIN_PAGE", Settings::get("login_page", "login"));
+        $this->assign("LOGIN_URL", $registry->getSetting("login_url"));
+        $this->assign("LOGOUT_PAGE", Settings::get("logout_page", "logout"));
+        $this->assign("LOGOUT_URL", $registry->getSetting("logout_url"));
 
-		//set user variables
-		$this->assign("USERID", User::current()->getID());
-		$this->assign("USERNAME", User::current()->getUsername());
+        //set user variables
+        $this->assign("USERID", User::current()->getID());
+        $this->assign("USERNAME", User::current()->getUsername());
 
-		$style_name = $registry->getSetting("current_style_name");
-		$this->assign("STYLE_PATH",DomainUtils::getBaseURL() . "/styles/" . $style_name . "/");
+        $style_name = $registry->getSetting("current_style_name");
+        $this->assign("STYLE_PATH",DomainUtils::getBaseURL() . "/styles/" . $style_name . "/");
 
-		$end_time = microtime(true);
-		$exec_time = $end_time - $start_time;
+        $end_time = microtime(true);
+        $exec_time = $end_time - $start_time;
 
-		//store benchmark
-		self::$benchmark[$this->file] = $exec_time;
-	}
+        //store benchmark
+        self::$benchmark[$this->file] = $exec_time;
+    }
 
-	public function assign ($var, $value) {
-		//$this->vars[$var] = $value;
-		$this->data->assign($var, $value);
-	}
+    public function assign ($var, $value) {
+        //$this->vars[$var] = $value;
+        $this->data->assign($var, $value);
+    }
 
-	public function parse ($name = "main") {
-		throw new Exception("Method DwooTemplate::parse() is not supported from Dwoo template engine.");
-	}
+    public function parse ($name = "main") {
+        throw new Exception("Method DwooTemplate::parse() is not supported from Dwoo template engine.");
+    }
 
-	public function getCode ($name = "main") {
-		$start_time = microtime(true);
+    public function getCode ($name = "main") {
+        $start_time = microtime(true);
 
-		// Output the result
-		$html = self::$core->get($this->template, $this->data);
+        // Output the result
+        $html = self::$core->get($this->template, $this->data);
 
-		$end_time = microtime(true);
-		$exec_time = $end_time - $start_time;
+        $end_time = microtime(true);
+        $exec_time = $end_time - $start_time;
 
-		//store benchmark
-		if (isset(self::$benchmark[$this->file])) {
-			self::$benchmark[$this->file] = self::$benchmark[$this->file] + $exec_time;
-		} else {
-			self::$benchmark[$this->file] = $exec_time;
-		}
+        //store benchmark
+        if (isset(self::$benchmark[$this->file])) {
+            self::$benchmark[$this->file] = self::$benchmark[$this->file] + $exec_time;
+        } else {
+            self::$benchmark[$this->file] = $exec_time;
+        }
 
-		return $html;
-	}
+        return $html;
+    }
 
-	protected static function initCoreIfAbsent () {
-		if (self::$core == null) {
-			self::$core = new Dwoo\Core();
+    protected static function initCoreIfAbsent () {
+        if (self::$core == null) {
+            self::$core = new Dwoo\Core();
 
-			$cache_dir = CACHE_PATH . "dwoo/";
-			$compile_dir = CACHE_PATH . "dwoo-compile/";
+            $cache_dir = CACHE_PATH . "dwoo/";
+            $compile_dir = CACHE_PATH . "dwoo-compile/";
 
-			//check, if cache dir exists
-			if (!file_exists($cache_dir)) {
-				mkdir($cache_dir);
-			}
+            //check, if cache dir exists
+            if (!file_exists($cache_dir)) {
+                mkdir($cache_dir);
+            }
 
-			//check, if compile dir exists
-			if (!file_exists($compile_dir)) {
-				mkdir($compile_dir);
-			}
+            //check, if compile dir exists
+            if (!file_exists($compile_dir)) {
+                mkdir($compile_dir);
+            }
 
-			//set cache dir
-			self::$core->setCacheDir($cache_dir);
-			self::$core->setCompileDir($compile_dir);
+            //set cache dir
+            self::$core->setCacheDir($cache_dir);
+            self::$core->setCompileDir($compile_dir);
 
-			//allow some php functions
-			//self::$core->setSecurityPolicy(new \Dwoo\Security\Policy());
-			//self::$core->getSecurityPolicy()->allowPhpFunction("count");
-			//self::$core->getSecurityPolicy()->allowPhpFunction("sizeof");
-
-			//add plugins
-			//self::$core->addPlugin("if");
+            //allow some php functions
+            //self::$core->setSecurityPolicy(new \Dwoo\Security\Policy());
+            //self::$core->getSecurityPolicy()->allowPhpFunction("count");
+            //self::$core->getSecurityPolicy()->allowPhpFunction("sizeof");
+
+            //add plugins
+            //self::$core->addPlugin("if");
 
-			//self::$core->addPlugin("lang", new \Dwoo\Plugins\Functions\PluginLang(self::$core));
+            //self::$core->addPlugin("lang", new \Dwoo\Plugins\Functions\PluginLang(self::$core));
 
-			// add custom plugin
-			/*self::$core->addPlugin('lang', function (Dwoo\Core $core, $str, $str1 = "") {
+            // add custom plugin
+            /*self::$core->addPlugin('lang', function (Dwoo\Core $core, $str, $str1 = "") {
 				return "test_" . $str;
 			});*/
 
-			Events::throwEvent("init_dwoo", array(
-				'core' => &self::$core,
-				'cache_path' => CACHE_PATH,
-				'cache_dir' => $cache_dir
-			));
-		}
-	}
-
-	public static function listFileBenchmark () {
-		return self::$benchmark;
-	}
+            Events::throwEvent("init_dwoo", array(
+                'core' => &self::$core,
+                'cache_path' => CACHE_PATH,
+                'cache_dir' => $cache_dir
+            ));
+        }
+    }
+
+    public static function listFileBenchmark () {
+        return self::$benchmark;
+    }
 
 }
 

Spacing +6 added lines, -6 removed lines

@@ -92,7 +92,7 @@ 
 		$this->assign("USERNAME", User::current()->getUsername());
 
 		$style_name = $registry->getSetting("current_style_name");
-		$this->assign("STYLE_PATH",DomainUtils::getBaseURL() . "/styles/" . $style_name . "/");
+		$this->assign("STYLE_PATH", DomainUtils::getBaseURL() . "/styles/" . $style_name . "/");
 
 		$end_time = microtime(true);
 		$exec_time = $end_time - $start_time;
@@ -101,16 +101,16 @@ 
 		self::$benchmark[$this->file] = $exec_time;
 	}
 
-	public function assign ($var, $value) {
+	public function assign($var, $value) {
 		//$this->vars[$var] = $value;
 		$this->data->assign($var, $value);
 	}
 
-	public function parse ($name = "main") {
+	public function parse($name = "main") {
 		throw new Exception("Method DwooTemplate::parse() is not supported from Dwoo template engine.");
 	}
 
-	public function getCode ($name = "main") {
+	public function getCode($name = "main") {
 		$start_time = microtime(true);
 
 		// Output the result
@@ -129,7 +129,7 @@ 
 		return $html;
 	}
 
-	protected static function initCoreIfAbsent () {
+	protected static function initCoreIfAbsent() {
 		if (self::$core == null) {
 			self::$core = new Dwoo\Core();
 
@@ -173,7 +173,7 @@ 
 		}
 	}
 
-	public static function listFileBenchmark () {
+	public static function listFileBenchmark() {
 		return self::$benchmark;
 	}
 

system/packages/com.jukusoft.cms.plugin/classes/plugins.php

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
 
 class Plugins {
 
-	public static function listAvailablePluginNames () : array {
+	public static function listAvailablePluginNames() : array {
 		$names = array();
 
 		//use directory iterator
@@ -42,7 +42,7 @@ 
 		return $names;
 	}
 
-	public static function listInstalledPluginNames () : array {
+	public static function listInstalledPluginNames() : array {
 		if (Cache::contains("plugins", "installed_plugin_names")) {
 			return Cache::get("plugins", "installed_plugin_names");
 		} else {
@@ -61,7 +61,7 @@ 
 		}
 	}
 
-	public static function listInstalledPlugins () : array {
+	public static function listInstalledPlugins() : array {
 		if (Cache::contains("plugins", "installed_plugins")) {
 			return Cache::get("plugins", "installed_plugins");
 		} else {
@@ -87,7 +87,7 @@ 
 		}
 	}
 
-	public static function listUninstalledPlugins () : array {
+	public static function listUninstalledPlugins() : array {
 		$installed_plugin_names = self::listInstalledPluginNames();
 
 		//create new empty list
@@ -125,7 +125,7 @@ 
 		return $list;
 	}
 
-	public static function clearCache () {
+	public static function clearCache() {
 		Cache::clear("plugins");
 	}
 

Indentation +75 added lines, -75 removed lines

@@ -27,107 +27,107 @@
 
 class Plugins {
 
-	public static function listAvailablePluginNames () : array {
-		$names = array();
+    public static function listAvailablePluginNames () : array {
+        $names = array();
 
-		//use directory iterator
-		$dir = new DirectoryIterator(PLUGIN_PATH);
+        //use directory iterator
+        $dir = new DirectoryIterator(PLUGIN_PATH);
 
-		foreach ($dir as $fileinfo) {
-			if ($fileinfo->isDir() && !$fileinfo->isDot()) {
-				$names[] = $fileinfo->getFilename();
-			}
-		}
+        foreach ($dir as $fileinfo) {
+            if ($fileinfo->isDir() && !$fileinfo->isDot()) {
+                $names[] = $fileinfo->getFilename();
+            }
+        }
 
-		return $names;
-	}
+        return $names;
+    }
 
-	public static function listInstalledPluginNames () : array {
-		if (Cache::contains("plugins", "installed_plugin_names")) {
-			return Cache::get("plugins", "installed_plugin_names");
-		} else {
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}plugins` WHERE `installed` = '1'; ");
+    public static function listInstalledPluginNames () : array {
+        if (Cache::contains("plugins", "installed_plugin_names")) {
+            return Cache::get("plugins", "installed_plugin_names");
+        } else {
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}plugins` WHERE `installed` = '1'; ");
 
-			$array = array();
+            $array = array();
 
-			foreach ($rows as $row) {
-				$array[] = $row['name'];
-			}
+            foreach ($rows as $row) {
+                $array[] = $row['name'];
+            }
 
-			//cache rows
-			Cache::put("plugins", "installed_plugin_names", $array);
+            //cache rows
+            Cache::put("plugins", "installed_plugin_names", $array);
 
-			return $array;
-		}
-	}
+            return $array;
+        }
+    }
 
-	public static function listInstalledPlugins () : array {
-		if (Cache::contains("plugins", "installed_plugins")) {
-			return Cache::get("plugins", "installed_plugins");
-		} else {
-			//read installed plugins from database
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}plugins` WHERE `installed` = '1'; ");
+    public static function listInstalledPlugins () : array {
+        if (Cache::contains("plugins", "installed_plugins")) {
+            return Cache::get("plugins", "installed_plugins");
+        } else {
+            //read installed plugins from database
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}plugins` WHERE `installed` = '1'; ");
 
-			$plugins = array();
+            $plugins = array();
 
-			foreach ($rows as $row) {
-				//create new plugin instance
-				$plugin = new Plugin($row['name'], $row);
+            foreach ($rows as $row) {
+                //create new plugin instance
+                $plugin = new Plugin($row['name'], $row);
 
-				//load plugin
-				$plugin->load();
+                //load plugin
+                $plugin->load();
 
-				$plugins[$plugin->getName()] = $plugin;
-			}
+                $plugins[$plugin->getName()] = $plugin;
+            }
 
-			//cache plugins
-			Cache::put("plugins", "installed_plugins", $plugins);
+            //cache plugins
+            Cache::put("plugins", "installed_plugins", $plugins);
 
-			return $plugins;
-		}
-	}
+            return $plugins;
+        }
+    }
 
-	public static function listUninstalledPlugins () : array {
-		$installed_plugin_names = self::listInstalledPluginNames();
+    public static function listUninstalledPlugins () : array {
+        $installed_plugin_names = self::listInstalledPluginNames();
 
-		//create new empty list
-		$list = array();
+        //create new empty list
+        $list = array();
 
-		$dir = new DirectoryIterator(PLUGIN_PATH);
+        $dir = new DirectoryIterator(PLUGIN_PATH);
 
-		foreach ($dir as $fileInfo) {
-			if ($fileInfo->isDot()) {
-				//dont parse directory "."
-				continue;
-			}
+        foreach ($dir as $fileInfo) {
+            if ($fileInfo->isDot()) {
+                //dont parse directory "."
+                continue;
+            }
 
-			if (!$fileInfo->isDir()) {
-				//we only search for directories
-				continue;
-			}
+            if (!$fileInfo->isDir()) {
+                //we only search for directories
+                continue;
+            }
 
-			//get directory name
-			$name = $fileInfo->getFilename();
+            //get directory name
+            $name = $fileInfo->getFilename();
 
-			//check, if plugin is already installed
-			if (in_array($name, $installed_plugin_names)) {
-				continue;
-			}
+            //check, if plugin is already installed
+            if (in_array($name, $installed_plugin_names)) {
+                continue;
+            }
 
-			//create and load new plugin
-			$plugin = new Plugin($name);
-			$plugin->load();
+            //create and load new plugin
+            $plugin = new Plugin($name);
+            $plugin->load();
 
-			//add plugin to list
-			$list[] = $plugin;
-		}
+            //add plugin to list
+            $list[] = $plugin;
+        }
 
-		return $list;
-	}
+        return $list;
+    }
 
-	public static function clearCache () {
-		Cache::clear("plugins");
-	}
+    public static function clearCache () {
+        Cache::clear("plugins");
+    }
 
 }