@@ -25,7 +25,10 @@ |
||
| 25 | 25 | |
| 26 | 26 | $id = $row['id']; |
| 27 | 27 | |
| 28 | - if(in_array($id,$latestIds)) continue; // Keep latest version of disabled plugins |
|
| 28 | + if(in_array($id,$latestIds)) { |
|
| 29 | + continue; |
|
| 30 | + } |
|
| 31 | + // Keep latest version of disabled plugins |
|
| 29 | 32 | |
| 30 | 33 | // invoke OnBeforePluginFormDelete event |
| 31 | 34 | $modx->invokeEvent('OnBeforePluginFormDelete', array('id'=> $id)); |
@@ -10,11 +10,11 @@ |
||
| 10 | 10 | $pass1 = $_POST['pass1']; |
| 11 | 11 | $pass2 = $_POST['pass2']; |
| 12 | 12 | |
| 13 | -if($pass1!=$pass2){ |
|
| 13 | +if($pass1!=$pass2) { |
|
| 14 | 14 | $modx->webAlertAndQuit("Passwords don't match!"); |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | -if(strlen($pass1)<6){ |
|
| 17 | +if(strlen($pass1)<6) { |
|
| 18 | 18 | $modx->webAlertAndQuit("Password is too short. Please specify a password of at least 6 characters."); |
| 19 | 19 | } |
| 20 | 20 | |
@@ -119,7 +119,7 @@ |
||
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | // secure manager documents - flag as private |
| 122 | -if($updategroupaccess==true){ |
|
| 122 | +if($updategroupaccess==true) { |
|
| 123 | 123 | include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php"; |
| 124 | 124 | secureMgrDocument(); |
| 125 | 125 | |
@@ -1,19 +1,22 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! function_exists('f_owc')){ |
|
| 2 | +if( ! function_exists('f_owc')) { |
|
| 3 | 3 | /** |
| 4 | 4 | * @param $path |
| 5 | 5 | * @param $data |
| 6 | 6 | * @param null|int $mode |
| 7 | 7 | */ |
| 8 | - function f_owc($path, $data, $mode = null){ |
|
| 8 | + function f_owc($path, $data, $mode = null) |
|
| 9 | + { |
|
| 9 | 10 | try { |
| 10 | 11 | // make an attempt to create the file |
| 11 | 12 | $hnd = fopen($path, 'w'); |
| 12 | 13 | fwrite($hnd, $data); |
| 13 | 14 | fclose($hnd); |
| 14 | 15 | |
| 15 | - if(null !== $mode) chmod($path, $mode); |
|
| 16 | - }catch(Exception $e){ |
|
| 16 | + if(null !== $mode) { |
|
| 17 | + chmod($path, $mode); |
|
| 18 | + } |
|
| 19 | + } catch(Exception $e) { |
|
| 17 | 20 | // Nothing, this is NOT normal |
| 18 | 21 | unset($e); |
| 19 | 22 | } |
@@ -21,7 +24,9 @@ discard block |
||
| 21 | 24 | } |
| 22 | 25 | |
| 23 | 26 | $installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0; |
| 24 | -if( ! isset($_lang)) $_lang = array(); |
|
| 27 | +if( ! isset($_lang)) { |
|
| 28 | + $_lang = array(); |
|
| 29 | +} |
|
| 25 | 30 | |
| 26 | 31 | echo '<div class="stepcontainer"> |
| 27 | 32 | <ul class="progressbar"> |
@@ -57,7 +62,7 @@ discard block |
||
| 57 | 62 | // check if iconv is available |
| 58 | 63 | echo '<p>' . $_lang['checking_iconv']; |
| 59 | 64 | $iconv = (int) function_exists('iconv'); |
| 60 | -if ($iconv == '0'){ |
|
| 65 | +if ($iconv == '0') { |
|
| 61 | 66 | echo '<span class="notok">' . $_lang['failed'].'</span></p><p><strong>'.$_lang['checking_iconv_note'].'</strong></p>'; |
| 62 | 67 | $errors++; |
| 63 | 68 | } else { |
@@ -119,7 +124,7 @@ discard block |
||
| 119 | 124 | |
| 120 | 125 | // File Browser directories exists? |
| 121 | 126 | echo '<p>'.$_lang['checking_if_images_exist']; |
| 122 | -switch(true){ |
|
| 127 | +switch(true) { |
|
| 123 | 128 | case !file_exists("../assets/images"): |
| 124 | 129 | case !file_exists("../assets/files"): |
| 125 | 130 | case !file_exists("../assets/backup"): |
@@ -134,7 +139,7 @@ discard block |
||
| 134 | 139 | |
| 135 | 140 | // File Browser directories writable? |
| 136 | 141 | echo '<p>'.$_lang['checking_if_images_writable']; |
| 137 | -switch(true){ |
|
| 142 | +switch(true) { |
|
| 138 | 143 | case !is_writable("../assets/images"): |
| 139 | 144 | case !is_writable("../assets/files"): |
| 140 | 145 | case !is_writable("../assets/backup"): |
@@ -268,7 +273,7 @@ discard block |
||
| 268 | 273 | if ($conn) { |
| 269 | 274 | echo '<p>'. $_lang['checking_mysql_strict_mode']; |
| 270 | 275 | $mysqlmode = mysqli_query($conn, "SELECT @@global.sql_mode"); |
| 271 | - if (mysqli_num_rows($mysqlmode) > 0){ |
|
| 276 | + if (mysqli_num_rows($mysqlmode) > 0) { |
|
| 272 | 277 | $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM); |
| 273 | 278 | //$modes = array("STRICT_TRANS_TABLES"); // for testing |
| 274 | 279 | // print_r($modes); |
@@ -305,9 +310,9 @@ discard block |
||
| 305 | 310 | echo '<p>'; |
| 306 | 311 | echo $_lang['setup_cannot_continue'] . ' '; |
| 307 | 312 | |
| 308 | - if($errors > 1){ |
|
| 313 | + if($errors > 1) { |
|
| 309 | 314 | echo $errors . " " . $_lang['errors'] . $_lang['please_correct_errors'] . $_lang['and_try_again_plural']; |
| 310 | - }else{ |
|
| 315 | + } else { |
|
| 311 | 316 | echo $_lang['error'] . $_lang['please_correct_error'] . $_lang['and_try_again']; |
| 312 | 317 | } |
| 313 | 318 | |
@@ -343,23 +348,35 @@ discard block |
||
| 343 | 348 | <input type="hidden" value="<?php echo $_POST['installdata'] ?>" name="installdata" /> |
| 344 | 349 | <?php |
| 345 | 350 | $templates = isset ($_POST['template']) ? $_POST['template'] : array (); |
| 346 | - foreach ($templates as $i => $template) echo '<input type="hidden" name="template[]" value="'.$template.'" />'; |
|
| 351 | + foreach ($templates as $i => $template) { |
|
| 352 | + echo '<input type="hidden" name="template[]" value="'.$template.'" />'; |
|
| 353 | + } |
|
| 347 | 354 | |
| 348 | 355 | $tvs = isset ($_POST['tv']) ? $_POST['tv'] : array (); |
| 349 | - foreach ($tvs as $i => $tv) echo '<input type="hidden" name="tv[]" value="'.$tv.'" />'; |
|
| 356 | + foreach ($tvs as $i => $tv) { |
|
| 357 | + echo '<input type="hidden" name="tv[]" value="'.$tv.'" />'; |
|
| 358 | + } |
|
| 350 | 359 | |
| 351 | 360 | $chunks = isset ($_POST['chunk']) ? $_POST['chunk'] : array (); |
| 352 | - foreach ($chunks as $i => $chunk) echo '<input type="hidden" name="chunk[]" value="'.$chunk.'" />'; |
|
| 361 | + foreach ($chunks as $i => $chunk) { |
|
| 362 | + echo '<input type="hidden" name="chunk[]" value="'.$chunk.'" />'; |
|
| 363 | + } |
|
| 353 | 364 | |
| 354 | 365 | $snippets = isset ($_POST['snippet']) ? $_POST['snippet'] : array (); |
| 355 | - foreach ($snippets as $i => $snippet) echo '<input type="hidden" name="snippet[]" value="'.$snippet.'" />'; |
|
| 366 | + foreach ($snippets as $i => $snippet) { |
|
| 367 | + echo '<input type="hidden" name="snippet[]" value="'.$snippet.'" />'; |
|
| 368 | + } |
|
| 356 | 369 | |
| 357 | 370 | $plugins = isset ($_POST['plugin']) ? $_POST['plugin'] : array (); |
| 358 | - foreach ($plugins as $i => $plugin) echo '<input type="hidden" name="plugin[]" value="'.$plugin.'" />'; |
|
| 371 | + foreach ($plugins as $i => $plugin) { |
|
| 372 | + echo '<input type="hidden" name="plugin[]" value="'.$plugin.'" />'; |
|
| 373 | + } |
|
| 359 | 374 | |
| 360 | 375 | $modules = isset ($_POST['module']) ? $_POST['module'] : array (); |
| 361 | - foreach ($modules as $i => $module) echo '<input type="hidden" name="module[]" value="'.$module.'" />'; |
|
| 362 | -?> |
|
| 376 | + foreach ($modules as $i => $module) { |
|
| 377 | + echo '<input type="hidden" name="module[]" value="'.$module.'" />'; |
|
| 378 | + } |
|
| 379 | + ?> |
|
| 363 | 380 | </div> |
| 364 | 381 | |
| 365 | 382 | <h2><?php echo $_lang['agree_to_terms'];?></h2> |
@@ -5,7 +5,8 @@ |
||
| 5 | 5 | * @deprecated EvolutionCMS\Legacy\ErrorHandler |
| 6 | 6 | * @todo could be unnecessary |
| 7 | 7 | */ |
| 8 | -class errorHandler extends EvolutionCMS\Legacy\ErrorHandler { |
|
| 8 | +class errorHandler extends EvolutionCMS\Legacy\ErrorHandler |
|
| 9 | +{ |
|
| 9 | 10 | public function include_lang($context = 'common') |
| 10 | 11 | { |
| 11 | 12 | parent::includeLang($context); |
@@ -3,4 +3,6 @@ |
||
| 3 | 3 | /** |
| 4 | 4 | * @deprecated use EvolutionCMS\Legacy\LogHandler |
| 5 | 5 | */ |
| 6 | -class logHandler extends EvolutionCMS\Legacy\LogHandler{} |
|
| 6 | +class logHandler extends EvolutionCMS\Legacy\LogHandler |
|
| 7 | +{ |
|
| 8 | +} |
|
@@ -8,8 +8,8 @@ |
||
| 8 | 8 | * @todo could be unnecessary |
| 9 | 9 | * |
| 10 | 10 | */ |
| 11 | -Class TemplateParser extends EvolutionCMS\Legacy\TemplateParser |
|
| 12 | -{
|
|
| 11 | +Class TemplateParser extends EvolutionCMS\Legacy\TemplateParser |
|
| 12 | +{ |
|
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | ?> |
@@ -27,16 +27,14 @@ |
||
| 27 | 27 | $cm = new EvolutionCMS\Legacy\ModuleCategoriesManager(); |
| 28 | 28 | |
| 29 | 29 | // assign module_params to internal params |
| 30 | -foreach( $_module_params as $param => $value ) |
|
| 31 | -{ |
|
| 30 | +foreach( $_module_params as $param => $value ) { |
|
| 32 | 31 | $cm->set( $param, $value ); |
| 33 | 32 | } |
| 34 | 33 | |
| 35 | 34 | // catch the request actions |
| 36 | 35 | include_once $cm->get('inc_dir') . 'request_trigger.inc.php'; |
| 37 | 36 | |
| 38 | -if( !$categories = $cm->getCategories() ) |
|
| 39 | -{ |
|
| 37 | +if( !$categories = $cm->getCategories() ) { |
|
| 40 | 38 | setcookie('webfxtab_manage-categories-pane', 0 ); |
| 41 | 39 | $cm->addMessage( $cm->txt('Currently no categories available... JUST ADD A NEW ONE!'), 'global' ); |
| 42 | 40 | } |
@@ -4,4 +4,6 @@ |
||
| 4 | 4 | * Class to handle the modx-categories |
| 5 | 5 | * @deprecated use EvolutionCMS\Legacy\Categories |
| 6 | 6 | */ |
| 7 | -class Categories extends EvolutionCMS\Legacy\Categories{} |
|
| 7 | +class Categories extends EvolutionCMS\Legacy\Categories |
|
| 8 | +{ |
|
| 9 | +} |
|