@@ -5,7 +5,7 @@ |
||
5 | 5 | * Time: 14:24 |
6 | 6 | */ |
7 | 7 | |
8 | -if (include_once(MODX_MANAGER_PATH . 'includes/extenders/export.class.inc.php')) { |
|
8 | +if (include_once(MODX_MANAGER_PATH.'includes/extenders/export.class.inc.php')) { |
|
9 | 9 | $this->export = new EXPORT_SITE; |
10 | 10 | |
11 | 11 | return true; |
@@ -9,7 +9,7 @@ |
||
9 | 9 | return true; |
10 | 10 | } |
11 | 11 | |
12 | -if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/phpass.class.inc.php')) { |
|
12 | +if (!include_once(MODX_MANAGER_PATH.'includes/extenders/phpass.class.inc.php')) { |
|
13 | 13 | return false; |
14 | 14 | } else { |
15 | 15 | $this->phpass = new PasswordHash; |
@@ -11,9 +11,9 @@ discard block |
||
11 | 11 | use PHPMailer\PHPMailer\PHPMailer; |
12 | 12 | use PHPMailer\PHPMailer\Exception as PHPMailerException; |
13 | 13 | |
14 | -require MODX_MANAGER_PATH . 'includes/controls/phpmailer/Exception.php'; |
|
15 | -require MODX_MANAGER_PATH . 'includes/controls/phpmailer/PHPMailer.php'; |
|
16 | -require MODX_MANAGER_PATH . 'includes/controls/phpmailer/SMTP.php'; |
|
14 | +require MODX_MANAGER_PATH.'includes/controls/phpmailer/Exception.php'; |
|
15 | +require MODX_MANAGER_PATH.'includes/controls/phpmailer/PHPMailer.php'; |
|
16 | +require MODX_MANAGER_PATH.'includes/controls/phpmailer/SMTP.php'; |
|
17 | 17 | |
18 | 18 | /** |
19 | 19 | * Class MODxMailer |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | public function init(DocumentParser $modx) |
47 | 47 | { |
48 | 48 | $this->modx = $modx; |
49 | - $this->PluginDir = MODX_MANAGER_PATH . 'includes/controls/phpmailer/'; |
|
49 | + $this->PluginDir = MODX_MANAGER_PATH.'includes/controls/phpmailer/'; |
|
50 | 50 | |
51 | 51 | switch ($modx->config['email_method']) { |
52 | 52 | case 'smtp': |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | mb_language($this->mb_language); |
111 | 111 | mb_internal_encoding($modx->config['modx_charset']); |
112 | 112 | } |
113 | - $exconf = MODX_MANAGER_PATH . 'includes/controls/phpmailer/config.inc.php'; |
|
113 | + $exconf = MODX_MANAGER_PATH.'includes/controls/phpmailer/config.inc.php'; |
|
114 | 114 | if (is_file($exconf)) { |
115 | 115 | include($exconf); |
116 | 116 | } |
@@ -178,12 +178,12 @@ discard block |
||
178 | 178 | } |
179 | 179 | |
180 | 180 | if ($this->modx->debug) { |
181 | - $debug_info = 'CharSet = ' . $this->CharSet . "\n"; |
|
182 | - $debug_info .= 'Encoding = ' . $this->Encoding . "\n"; |
|
183 | - $debug_info .= 'mb_language = ' . $this->mb_language . "\n"; |
|
184 | - $debug_info .= 'encode_header_method = ' . $this->encode_header_method . "\n"; |
|
181 | + $debug_info = 'CharSet = '.$this->CharSet."\n"; |
|
182 | + $debug_info .= 'Encoding = '.$this->Encoding."\n"; |
|
183 | + $debug_info .= 'mb_language = '.$this->mb_language."\n"; |
|
184 | + $debug_info .= 'encode_header_method = '.$this->encode_header_method."\n"; |
|
185 | 185 | $debug_info .= "send_mode = {$mode}\n"; |
186 | - $debug_info .= 'Subject = ' . $this->Subject . "\n"; |
|
186 | + $debug_info .= 'Subject = '.$this->Subject."\n"; |
|
187 | 187 | $log = "<pre>{$debug_info}\n{$header}\n{$org_body}</pre>"; |
188 | 188 | $this->modx->logEvent(1, 1, $log, 'MODxMailer debug information'); |
189 | 189 | |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | ini_set('sendmail_from', $old_from); |
250 | 250 | } |
251 | 251 | if (!$rt) { |
252 | - $msg = $this->Lang('instantiate') . "<br />\n"; |
|
252 | + $msg = $this->Lang('instantiate')."<br />\n"; |
|
253 | 253 | $msg .= "{$this->Subject}<br />\n"; |
254 | 254 | $msg .= "{$this->FromName}<{$this->From}><br />\n"; |
255 | 255 | $msg .= mb_convert_encoding($body, $this->modx->config['modx_charset'], $this->CharSet); |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | */ |
269 | 269 | public function SetError($msg) |
270 | 270 | { |
271 | - $msg .= '<pre>' . print_r(get_object_vars($this), true) . '</pre>'; |
|
271 | + $msg .= '<pre>'.print_r(get_object_vars($this), true).'</pre>'; |
|
272 | 272 | $this->modx->config['send_errormail'] = '0'; |
273 | 273 | $this->modx->logEvent(0, 3, $msg, 'phpmailer'); |
274 | 274 |
@@ -5,7 +5,7 @@ |
||
5 | 5 | * Time: 14:38 |
6 | 6 | */ |
7 | 7 | |
8 | -if (!include_once MODX_MANAGER_PATH . 'includes/extenders/maketable.class.php') { |
|
8 | +if (!include_once MODX_MANAGER_PATH.'includes/extenders/maketable.class.php') { |
|
9 | 9 | return false; |
10 | 10 | } else { |
11 | 11 | $this->table = new MakeTable; |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | |
49 | 49 | $this->portable_hashes = $portable_hashes; |
50 | 50 | |
51 | - $this->random_state = microtime() . uniqid(mt_rand(), true); |
|
51 | + $this->random_state = microtime().uniqid(mt_rand(), true); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | /** |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | $output = ''; |
69 | 69 | for ($i = 0; $i < $count; $i += 16) { |
70 | 70 | $this->random_state = |
71 | - md5(microtime() . $this->random_state); |
|
71 | + md5(microtime().$this->random_state); |
|
72 | 72 | $output .= |
73 | 73 | pack('H*', md5($this->random_state)); |
74 | 74 | } |
@@ -160,9 +160,9 @@ discard block |
||
160 | 160 | // consequently in lower iteration counts and hashes that are |
161 | 161 | // quicker to crack (by non-PHP code). |
162 | 162 | |
163 | - $hash = md5($salt . $password, true); |
|
163 | + $hash = md5($salt.$password, true); |
|
164 | 164 | do { |
165 | - $hash = md5($hash . $password, true); |
|
165 | + $hash = md5($hash.$password, true); |
|
166 | 166 | } while (--$count); |
167 | 167 | |
168 | 168 | $output = substr($setting, 0, 12); |
@@ -118,16 +118,16 @@ discard block |
||
118 | 118 | for ($i = 0; $i < $tablevel; $i++) { |
119 | 119 | $tabs .= "\t"; |
120 | 120 | } |
121 | - $listhtml = $ordered == true ? $tabs . "<ol class='$ulroot'$typestr>\n" : $tabs . "<ul class='$ulroot'$typestr>\n"; |
|
121 | + $listhtml = $ordered == true ? $tabs."<ol class='$ulroot'$typestr>\n" : $tabs."<ul class='$ulroot'$typestr>\n"; |
|
122 | 122 | foreach ($array as $key => $value) { |
123 | 123 | if (is_array($value)) { |
124 | - $listhtml .= $tabs . "\t<li>" . $key . "\n" . $this->makeList($value, $ulprefix . $ulroot, $ulprefix, |
|
125 | - $type, $ordered, $tablevel + 2) . $tabs . "\t</li>\n"; |
|
124 | + $listhtml .= $tabs."\t<li>".$key."\n".$this->makeList($value, $ulprefix.$ulroot, $ulprefix, |
|
125 | + $type, $ordered, $tablevel + 2).$tabs."\t</li>\n"; |
|
126 | 126 | } else { |
127 | - $listhtml .= $tabs . "\t<li>" . $value . "</li>\n"; |
|
127 | + $listhtml .= $tabs."\t<li>".$value."</li>\n"; |
|
128 | 128 | } |
129 | 129 | } |
130 | - $listhtml .= $ordered == true ? $tabs . "</ol>\n" : $tabs . "</ul>\n"; |
|
130 | + $listhtml .= $ordered == true ? $tabs."</ol>\n" : $tabs."</ul>\n"; |
|
131 | 131 | |
132 | 132 | return $listhtml; |
133 | 133 | } |
@@ -298,9 +298,9 @@ discard block |
||
298 | 298 | $msg = addslashes($modx->db->escape($msg)); |
299 | 299 | if (substr(strtolower($url), 0, 11) == "javascript:") { |
300 | 300 | $act = "__WebAlert();"; |
301 | - $fnc = "function __WebAlert(){" . substr($url, 11) . "};"; |
|
301 | + $fnc = "function __WebAlert(){".substr($url, 11)."};"; |
|
302 | 302 | } else { |
303 | - $act = ($url ? "window.location.href='" . addslashes($url) . "';" : ""); |
|
303 | + $act = ($url ? "window.location.href='".addslashes($url)."';" : ""); |
|
304 | 304 | } |
305 | 305 | $html = "<script>$fnc window.setTimeout(\"alert('$msg');$act\",100);</script>"; |
306 | 306 | if ($modx->isFrontend()) { |
@@ -9,6 +9,6 @@ |
||
9 | 9 | return true; |
10 | 10 | } |
11 | 11 | |
12 | -include_once(MODX_MANAGER_PATH . 'includes/extenders/modifiers.class.inc.php'); |
|
12 | +include_once(MODX_MANAGER_PATH.'includes/extenders/modifiers.class.inc.php'); |
|
13 | 13 | $this->filter = new MODIFIERS; |
14 | 14 | return true; |
@@ -5,7 +5,7 @@ |
||
5 | 5 | * Time: 14:16 |
6 | 6 | */ |
7 | 7 | |
8 | -if (!include_once MODX_MANAGER_PATH . 'includes/extenders/manager.api.class.inc.php') { |
|
8 | +if (!include_once MODX_MANAGER_PATH.'includes/extenders/manager.api.class.inc.php') { |
|
9 | 9 | return false; |
10 | 10 | } else { |
11 | 11 | $this->manager = new ManagerAPI; |
@@ -6,7 +6,7 @@ |
||
6 | 6 | * Time: 14:17 |
7 | 7 | */ |
8 | 8 | |
9 | -if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/modxmailer.class.inc.php')) { |
|
9 | +if (!include_once(MODX_MANAGER_PATH.'includes/extenders/modxmailer.class.inc.php')) { |
|
10 | 10 | return false; |
11 | 11 | } else { |
12 | 12 | $this->mail = new MODxMailer; |