@@ -104,7 +104,7 @@ |
||
104 | 104 | */ |
105 | 105 | protected static function openTag($tag, $add, $whitespace) |
106 | 106 | { |
107 | - $tabs = str_pad('', self::$tabCount ++, "\t"); |
|
107 | + $tabs = str_pad('', self::$tabCount++, "\t"); |
|
108 | 108 | |
109 | 109 | if (preg_match('#^<(a|label|option|textarea|h1|h2|h3|h4|h5|h6|strong|b|em|i|abbr|acronym|cite|span|sub|sup|u|s|title)(?: [^>]*|)>#', $tag)) { |
110 | 110 | // if it's one of those tag it's inline so it does not require a leading line break |
@@ -58,7 +58,7 @@ |
||
58 | 58 | define('ROOT_PATH', dirname(__FILE__) . "/../"); |
59 | 59 | define('DWOO_PATH', ROOT_PATH . "system/packages/com.jukusoft.cms.dwoo/dwoo/lib/"); |
60 | 60 | |
61 | -function dwoo_autoload ($class_name) { |
|
61 | +function dwoo_autoload($class_name) { |
|
62 | 62 | $class_name = str_replace("\\", "/", $class_name); |
63 | 63 | |
64 | 64 | if (file_exists(DWOO_PATH . $class_name . ".php")) { |
@@ -29,7 +29,7 @@ |
||
29 | 29 | |
30 | 30 | class DwooAutoloader { |
31 | 31 | |
32 | - public static function loadClass (string $class_name) { |
|
32 | + public static function loadClass(string $class_name) { |
|
33 | 33 | $class_name = str_replace("\\", "/", $class_name); |
34 | 34 | |
35 | 35 | if (file_exists(DWOO_PATH . $class_name . ".php")) { |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | } |
69 | 69 | } |
70 | 70 | |
71 | - protected function mergeRow (string $token, int $value) { |
|
71 | + protected function mergeRow(string $token, int $value) { |
|
72 | 72 | if ($value < 0 || $value > 2) { |
73 | 73 | throw new IllegalArgumentException("token ('" . $token . "') value '" . $value . "' is not allowed, value has to be >= 0 and <= 2."); |
74 | 74 | } |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | } |
85 | 85 | } |
86 | 86 | |
87 | - public function hasRight (string $token) { |
|
87 | + public function hasRight(string $token) { |
|
88 | 88 | //check, if user is super admin |
89 | 89 | if (/*$this->userID == 1 || */(isset($this->permissions["super_admin"]) && $this->permissions["super_admin"] == 1) && $token !== "not_logged_in") { |
90 | 90 | //super admin has all rights |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | return isset($this->permissions[$token]) && $this->permissions[$token] == 1; |
99 | 99 | } |
100 | 100 | |
101 | - public static function ¤t () { |
|
101 | + public static function ¤t() { |
|
102 | 102 | if (self::$instance == null) { |
103 | 103 | self::$instance = new PermissionChecker(User::current()->getID()); |
104 | 104 | } |
@@ -27,9 +27,9 @@ |
||
27 | 27 | |
28 | 28 | interface MailSender { |
29 | 29 | |
30 | - public function sendPlainMail ($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool; |
|
30 | + public function sendPlainMail($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool; |
|
31 | 31 | |
32 | - public function sendHTMLMail ($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool; |
|
32 | + public function sendHTMLMail($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool; |
|
33 | 33 | |
34 | 34 | } |
35 | 35 |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | return mail($to, $subject, $message, $headers); |
80 | 80 | } |
81 | 81 | |
82 | - public static function getOptions (array $options = array(), string $from = "", string $reply_to = "") : array { |
|
82 | + public static function getOptions(array $options = array(), string $from = "", string $reply_to = "") : array { |
|
83 | 83 | if (!is_null($from) && !empty($from)) { |
84 | 84 | $options['from'] = $from; |
85 | 85 | } |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | return $options; |
111 | 111 | } |
112 | 112 | |
113 | - public static function convertToArray ($to) : string { |
|
113 | + public static function convertToArray($to) : string { |
|
114 | 114 | if (is_array($to)) { |
115 | 115 | //convert array to RFC 2822 string |
116 | 116 | $to = implode(", ", $to); |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | return $to; |
120 | 120 | } |
121 | 121 | |
122 | - public static function generateHeader (array $options, string $to, bool $html_mail = false) { |
|
122 | + public static function generateHeader(array $options, string $to, bool $html_mail = false) { |
|
123 | 123 | //generate header |
124 | 124 | $headers = array(); |
125 | 125 |
@@ -27,11 +27,11 @@ |
||
27 | 27 | |
28 | 28 | interface ICaptcha { |
29 | 29 | |
30 | - public function getHeader () : string; |
|
30 | + public function getHeader() : string; |
|
31 | 31 | |
32 | - public function getFormCode () : string; |
|
32 | + public function getFormCode() : string; |
|
33 | 33 | |
34 | - public function verify (array $params = array()) : bool; |
|
34 | + public function verify(array $params = array()) : bool; |
|
35 | 35 | |
36 | 36 | } |
37 | 37 |
@@ -29,11 +29,11 @@ |
||
29 | 29 | |
30 | 30 | protected static $instance = null; |
31 | 31 | |
32 | - public static function isEnabled () : bool { |
|
32 | + public static function isEnabled() : bool { |
|
33 | 33 | return Settings::get("captcha_enabled", true); |
34 | 34 | } |
35 | 35 | |
36 | - public static function getInstance () : ICaptcha { |
|
36 | + public static function getInstance() : ICaptcha { |
|
37 | 37 | if (self::$instance == null) { |
38 | 38 | //create new instance |
39 | 39 | $class_name = Settings::get("captcha_class_name", "ReCaptcha"); |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | public function isValide($value): bool { |
31 | 31 | //https://stackoverflow.com/questions/4383878/php-username-validation |
32 | 32 | |
33 | - if(preg_match("/^[" . Settings::get("username_regex", "a-zA-Z0-9\.\-") . "]{" . Settings::get("username_min_length", 4) . "," . Settings::get("username_max_length", 20) . "}$/", $value)) { // for english chars + numbers only |
|
33 | + if (preg_match("/^[" . Settings::get("username_regex", "a-zA-Z0-9\.\-") . "]{" . Settings::get("username_min_length", 4) . "," . Settings::get("username_max_length", 20) . "}$/", $value)) { // for english chars + numbers only |
|
34 | 34 | return true; |
35 | 35 | } |
36 | 36 | |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | } |
46 | 46 | } |
47 | 47 | |
48 | - public static function get (string $value) : string { |
|
48 | + public static function get(string $value) : string { |
|
49 | 49 | $obj = new Validator_Username(); |
50 | 50 | return $obj->validate($value); |
51 | 51 | } |