@@ -1622,8 +1622,7 @@ |
||
1622 | 1622 | updateStats('topic'); |
1623 | 1623 | |
1624 | 1624 | // This function is needed to do the updateStats('subject') call. |
1625 | - $smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' : |
|
1626 | - function($string){ |
|
1625 | + $smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' : function($string) { |
|
1627 | 1626 | global $sourcedir; |
1628 | 1627 | if (function_exists('mb_strtolower')) |
1629 | 1628 | return mb_strtolower($string, 'UTF-8'); |
@@ -3031,8 +3031,7 @@ |
||
3031 | 3031 | <div class="roundframe"> |
3032 | 3032 | <div> |
3033 | 3033 | ', !empty($context['tfa_backup']) ? ' |
3034 | - <div class="smalltext error">' . $txt['tfa_backup_used_desc'] . '</div>' : |
|
3035 | - ($modSettings['tfa_mode'] == 2 ? ' |
|
3034 | + <div class="smalltext error">' . $txt['tfa_backup_used_desc'] . '</div>' : ($modSettings['tfa_mode'] == 2 ? ' |
|
3036 | 3035 | <div class="smalltext"><strong>' . $txt['tfa_forced_desc'] . '</strong></div>' : ''), ' |
3037 | 3036 | <div class="smalltext">', $txt['tfa_desc'], '</div> |
3038 | 3037 | <div id="basicinfo" style="width: 60%"> |
@@ -21,7 +21,7 @@ |
||
21 | 21 | <div id="recent" class="main_section"> |
22 | 22 | <div class="cat_bar"> |
23 | 23 | <h3 class="catbg"> |
24 | - <span class="xx"></span>',$txt['recent_posts'],' |
|
24 | + <span class="xx"></span>',$txt['recent_posts'], ' |
|
25 | 25 | </h3> |
26 | 26 | </div> |
27 | 27 | <div class="pagesection">', $context['page_index'], '</div>'; |
@@ -259,8 +259,8 @@ |
||
259 | 259 | $time_string = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]); |
260 | 260 | |
261 | 261 | $js_time_string = str_replace( |
262 | - array('%H', '%k', '%I', '%l', '%M', '%p', '%P', '%r', '%R', '%S', '%T', '%X'), |
|
263 | - array('H', 'G', 'h', 'g', 'i', 'A', 'a', 'h:i:s A', 'H:i', 's', 'H:i:s', 'H:i:s'), |
|
262 | + array('%H', '%k', '%I', '%l', '%M', '%p', '%P', '%r', '%R', '%S', '%T', '%X'), |
|
263 | + array('H', 'G', 'h', 'g', 'i', 'A', 'a', 'h:i:s A', 'H:i', 's', 'H:i:s', 'H:i:s'), |
|
264 | 264 | $time_string |
265 | 265 | ); |
266 | 266 |
@@ -757,7 +757,7 @@ discard block |
||
757 | 757 | $connection |
758 | 758 | ); |
759 | 759 | |
760 | - if(!empty($keys) && (count($keys) > 0) && $method == '' && $returnmode > 0) |
|
760 | + if (!empty($keys) && (count($keys) > 0) && $method == '' && $returnmode > 0) |
|
761 | 761 | { |
762 | 762 | if ($returnmode == 1) |
763 | 763 | $return_var = smf_db_insert_id($table, $keys[0]) + count($insertRows) - 1; |
@@ -766,7 +766,7 @@ discard block |
||
766 | 766 | $return_var = array(); |
767 | 767 | $count = count($insertRows); |
768 | 768 | $start = smf_db_insert_id($table, $keys[0]); |
769 | - for ($i = 0; $i < $count; $i++ ) |
|
769 | + for ($i = 0; $i < $count; $i++) |
|
770 | 770 | $return_var[] = $start + $i; |
771 | 771 | } |
772 | 772 | return $return_var; |
@@ -763,10 +763,10 @@ discard block |
||
763 | 763 | $returning = ''; |
764 | 764 | $with_returning = false; |
765 | 765 | // lets build the returning string, mysql allow only in normal mode |
766 | - if(!empty($keys) && (count($keys) > 0) && $method == '' && $returnmode > 0) |
|
766 | + if (!empty($keys) && (count($keys) > 0) && $method == '' && $returnmode > 0) |
|
767 | 767 | { |
768 | 768 | // we only take the first key |
769 | - $returning = ' RETURNING '.$keys[0]; |
|
769 | + $returning = ' RETURNING ' . $keys[0]; |
|
770 | 770 | $with_returning = true; |
771 | 771 | } |
772 | 772 | |
@@ -797,7 +797,7 @@ discard block |
||
797 | 797 | INSERT INTO ' . $table . '("' . implode('", "', $indexed_columns) . '") |
798 | 798 | VALUES |
799 | 799 | ' . implode(', |
800 | - ', $insertRows).$replace.$returning, |
|
800 | + ', $insertRows) . $replace . $returning, |
|
801 | 801 | array( |
802 | 802 | 'security_override' => true, |
803 | 803 | 'db_error_skip' => $method == 'ignore' || $table === $db_prefix . 'log_errors', |
@@ -810,7 +810,7 @@ discard block |
||
810 | 810 | if ($returnmode === 2) |
811 | 811 | $return_var = array(); |
812 | 812 | |
813 | - while(($row = $smcFunc['db_fetch_row']($request)) && $with_returning) |
|
813 | + while (($row = $smcFunc['db_fetch_row']($request)) && $with_returning) |
|
814 | 814 | { |
815 | 815 | if (is_numeric($row[0])) // try to emulate mysql limitation |
816 | 816 | { |
@@ -104,7 +104,7 @@ |
||
104 | 104 | * |
105 | 105 | * @param string $class The fully-qualified class name. |
106 | 106 | */ |
107 | -spl_autoload_register(function ($class) use ($sourcedir) |
|
107 | +spl_autoload_register(function($class) use ($sourcedir) |
|
108 | 108 | { |
109 | 109 | $classMap = array( |
110 | 110 | 'ReCaptcha\\' => 'ReCaptcha/', |
@@ -39,8 +39,8 @@ discard block |
||
39 | 39 | // when both paths have nothing in common, one of them is probably |
40 | 40 | // absolute while the other is relative |
41 | 41 | $cwd = getcwd(); |
42 | - $from = strpos($from, $cwd) === 0 ? $from : $cwd.'/'.$from; |
|
43 | - $to = strpos($to, $cwd) === 0 ? $to : $cwd.'/'.$to; |
|
42 | + $from = strpos($from, $cwd) === 0 ? $from : $cwd . '/' . $from; |
|
43 | + $to = strpos($to, $cwd) === 0 ? $to : $cwd . '/' . $to; |
|
44 | 44 | |
45 | 45 | // or traveling the tree via `..` |
46 | 46 | // attempt to resolve path, or assume it's fine if it doesn't exist |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | } |
148 | 148 | |
149 | 149 | // normalize paths |
150 | - $path = $this->normalize($this->from.'/'.$path); |
|
150 | + $path = $this->normalize($this->from . '/' . $path); |
|
151 | 151 | |
152 | 152 | // strip shared ancestor paths |
153 | 153 | $shared = $this->shared($path, $this->to); |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | // add .. for every directory that needs to be traversed to new path |
158 | 158 | $to = str_repeat('../', mb_substr_count($to, '/')); |
159 | 159 | |
160 | - return $to.ltrim($path, '/'); |
|
160 | + return $to . ltrim($path, '/'); |
|
161 | 161 | } |
162 | 162 | |
163 | 163 | /** |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | } |
83 | 83 | |
84 | 84 | // add to top |
85 | - $content = implode('', $matches[0]).$content; |
|
85 | + $content = implode('', $matches[0]) . $content; |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | return $content; |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | // loop the matches |
208 | 208 | foreach ($matches as $match) { |
209 | 209 | // get the path for the file that will be imported |
210 | - $importPath = dirname($source).'/'.$match['path']; |
|
210 | + $importPath = dirname($source) . '/' . $match['path']; |
|
211 | 211 | |
212 | 212 | // only replace the import with the content if we can grab the |
213 | 213 | // content of the file |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | // check if current file was not imported previously in the same |
216 | 216 | // import chain. |
217 | 217 | if (in_array($importPath, $parents)) { |
218 | - throw new FileImportException('Failed to import file "'.$importPath.'": circular reference detected.'); |
|
218 | + throw new FileImportException('Failed to import file "' . $importPath . '": circular reference detected.'); |
|
219 | 219 | } |
220 | 220 | |
221 | 221 | // grab referenced file & minify it (which may include importing |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | |
226 | 226 | // check if this is only valid for certain media |
227 | 227 | if (!empty($match['media'])) { |
228 | - $importContent = '@media '.$match['media'].'{'.$importContent.'}'; |
|
228 | + $importContent = '@media ' . $match['media'] . '{' . $importContent . '}'; |
|
229 | 229 | } |
230 | 230 | |
231 | 231 | // add to replacement array |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | protected function importFiles($source, $content) |
255 | 255 | { |
256 | 256 | $extensions = array_keys($this->importExtensions); |
257 | - $regex = '/url\((["\']?)((?!["\']?data:).*?\.('.implode('|', $extensions).'))\\1\)/i'; |
|
257 | + $regex = '/url\((["\']?)((?!["\']?data:).*?\.(' . implode('|', $extensions) . '))\\1\)/i'; |
|
258 | 258 | if ($extensions && preg_match_all($regex, $content, $matches, PREG_SET_ORDER)) { |
259 | 259 | $search = array(); |
260 | 260 | $replace = array(); |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | foreach ($matches as $match) { |
264 | 264 | // get the path for the file that will be imported |
265 | 265 | $path = $match[2]; |
266 | - $path = dirname($source).'/'.$path; |
|
266 | + $path = dirname($source) . '/' . $path; |
|
267 | 267 | $extension = $match[3]; |
268 | 268 | |
269 | 269 | // only replace the import with the content if we're able to get |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | |
276 | 276 | // build replacement |
277 | 277 | $search[] = $match[0]; |
278 | - $replace[] = 'url('.$this->importExtensions[$extension].';base64,'.$importContent.')'; |
|
278 | + $replace[] = 'url(' . $this->importExtensions[$extension] . ';base64,' . $importContent . ')'; |
|
279 | 279 | } |
280 | 280 | } |
281 | 281 | |
@@ -463,9 +463,9 @@ discard block |
||
463 | 463 | // build replacement |
464 | 464 | $search[] = $match[0]; |
465 | 465 | if ($type == 'url') { |
466 | - $replace[] = 'url('.$url.')'; |
|
466 | + $replace[] = 'url(' . $url . ')'; |
|
467 | 467 | } elseif ($type == 'import') { |
468 | - $replace[] = '@import "'.$url.'"'; |
|
468 | + $replace[] = '@import "' . $url . '"'; |
|
469 | 469 | } |
470 | 470 | } |
471 | 471 | |
@@ -519,8 +519,8 @@ discard block |
||
519 | 519 | ); |
520 | 520 | |
521 | 521 | return preg_replace_callback( |
522 | - '/(?<=[: ])('.implode(array_keys($colors), '|').')(?=[; }])/i', |
|
523 | - function ($match) use ($colors) { |
|
522 | + '/(?<=[: ])(' . implode(array_keys($colors), '|') . ')(?=[; }])/i', |
|
523 | + function($match) use ($colors) { |
|
524 | 524 | return $colors[strtoupper($match[0])]; |
525 | 525 | }, |
526 | 526 | $content |
@@ -541,11 +541,11 @@ discard block |
||
541 | 541 | 'bold' => 700, |
542 | 542 | ); |
543 | 543 | |
544 | - $callback = function ($match) use ($weights) { |
|
545 | - return $match[1].$weights[$match[2]]; |
|
544 | + $callback = function($match) use ($weights) { |
|
545 | + return $match[1] . $weights[$match[2]]; |
|
546 | 546 | }; |
547 | 547 | |
548 | - return preg_replace_callback('/(font-weight\s*:\s*)('.implode('|', array_keys($weights)).')(?=[;}])/', $callback, $content); |
|
548 | + return preg_replace_callback('/(font-weight\s*:\s*)(' . implode('|', array_keys($weights)) . ')(?=[;}])/', $callback, $content); |
|
549 | 549 | } |
550 | 550 | |
551 | 551 | /** |
@@ -571,19 +571,19 @@ discard block |
||
571 | 571 | // practice, Webkit (especially Safari) seems to stumble over at least |
572 | 572 | // 0%, potentially other units as well. Only stripping 'px' for now. |
573 | 573 | // @see https://github.com/matthiasmullie/minify/issues/60 |
574 | - $content = preg_replace('/'.$before.'(-?0*(\.0+)?)(?<=0)px'.$after.'/', '\\1', $content); |
|
574 | + $content = preg_replace('/' . $before . '(-?0*(\.0+)?)(?<=0)px' . $after . '/', '\\1', $content); |
|
575 | 575 | |
576 | 576 | // strip 0-digits (.0 -> 0) |
577 | - $content = preg_replace('/'.$before.'\.0+'.$units.'?'.$after.'/', '0\\1', $content); |
|
577 | + $content = preg_replace('/' . $before . '\.0+' . $units . '?' . $after . '/', '0\\1', $content); |
|
578 | 578 | // strip trailing 0: 50.10 -> 50.1, 50.10px -> 50.1px |
579 | - $content = preg_replace('/'.$before.'(-?[0-9]+\.[0-9]+)0+'.$units.'?'.$after.'/', '\\1\\2', $content); |
|
579 | + $content = preg_replace('/' . $before . '(-?[0-9]+\.[0-9]+)0+' . $units . '?' . $after . '/', '\\1\\2', $content); |
|
580 | 580 | // strip trailing 0: 50.00 -> 50, 50.00px -> 50px |
581 | - $content = preg_replace('/'.$before.'(-?[0-9]+)\.0+'.$units.'?'.$after.'/', '\\1\\2', $content); |
|
581 | + $content = preg_replace('/' . $before . '(-?[0-9]+)\.0+' . $units . '?' . $after . '/', '\\1\\2', $content); |
|
582 | 582 | // strip leading 0: 0.1 -> .1, 01.1 -> 1.1 |
583 | - $content = preg_replace('/'.$before.'(-?)0+([0-9]*\.[0-9]+)'.$units.'?'.$after.'/', '\\1\\2\\3', $content); |
|
583 | + $content = preg_replace('/' . $before . '(-?)0+([0-9]*\.[0-9]+)' . $units . '?' . $after . '/', '\\1\\2\\3', $content); |
|
584 | 584 | |
585 | 585 | // strip negative zeroes (-0 -> 0) & truncate zeroes (00 -> 0) |
586 | - $content = preg_replace('/'.$before.'-?0+'.$units.'?'.$after.'/', '0\\1', $content); |
|
586 | + $content = preg_replace('/' . $before . '-?0+' . $units . '?' . $after . '/', '0\\1', $content); |
|
587 | 587 | |
588 | 588 | // remove zeroes where they make no sense in calc: e.g. calc(100px - 0) |
589 | 589 | // the 0 doesn't have any effect, and this isn't even valid without unit |