evolution-cms / evolution

manager/actions/mutate_settings/tab6_filemanager_settings.inc.php

Spacing +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
         <?php

             // invoke OnMiscSettingsRender event

             $evtOut = $modx->invokeEvent('OnFileManagerSettingsRender');

-            if(is_array($evtOut)) echo implode("",$evtOut);

+            if (is_array($evtOut)) echo implode("", $evtOut);

         ?>

     </td>

   </tr>

manager/includes/header.inc.php

Spacing +23 added lines, -23 removed lines

@@ -20,28 +20,28 @@ 
 $body_class = '';

 $theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');

 if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {

-    $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']];

+    $body_class .= ' '.$theme_modes[$_COOKIE['MODX_themeMode']];

 } elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {

-    $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']];

+    $body_class .= ' '.$theme_modes[$modx->config['manager_theme_mode']];

 }

 

-$css = 'media/style/' . $modx->config['manager_theme'] . '/style.css?v=' . $lastInstallTime;

+$css = 'media/style/'.$modx->config['manager_theme'].'/style.css?v='.$lastInstallTime;

 

 if ($modx->config['manager_theme'] == 'default') {

-    if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')

-        && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {

+    if (!file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')

+        && is_writable(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css')) {

         $files = array(

-            'bootstrap' => MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css',

-            'font-awesome' => MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css',

-            'fonts' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/fonts.css',

-            'forms' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/forms.css',

-            'mainmenu' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/mainmenu.css',

-            'tree' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tree.css',

-            'custom' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/custom.css',

-            'tabpane' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tabpane.css',

-            'contextmenu' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/contextmenu.css',

-            'index' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/index.css',

-            'main' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/main.css'

+            'bootstrap' => MODX_MANAGER_PATH.'media/style/common/bootstrap/css/bootstrap.min.css',

+            'font-awesome' => MODX_MANAGER_PATH.'media/style/common/font-awesome/css/font-awesome.min.css',

+            'fonts' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/fonts.css',

+            'forms' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/forms.css',

+            'mainmenu' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/mainmenu.css',

+            'tree' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tree.css',

+            'custom' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/custom.css',

+            'tabpane' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tabpane.css',

+            'contextmenu' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/contextmenu.css',

+            'index' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/index.css',

+            'main' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/main.css'

         );

         $evtOut = $modx->invokeEvent('OnBeforeMinifyCss', array(

             'files' => $files,

@@ -58,16 +58,16 @@ 
             default:

                 $modx->webAlertAndQuit(sprintf($_lang['invalid_event_response'], 'OnBeforeMinifyManagerCss'));

         }

-        require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';

+        require_once MODX_BASE_PATH.'assets/lib/Formatter/CSSMinify.php';

         $minifier = new Formatter\CSSMinify($files);

         $css = $minifier->minify();

         file_put_contents(

-            MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css',

+            MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css',

             $css

         );

     }

-    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {

-        $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;

+    if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) {

+        $css = 'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css?v='.$lastInstallTime;

     }

 }

 

@@ -82,7 +82,7 @@ 
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>

     <link rel="stylesheet" type="text/css" href="<?= $css ?>"/>

     <script type="text/javascript" src="media/script/tabpane.js"></script>

-    <?= sprintf('<script type="text/javascript" src="%s"></script>' . "\n", $modx->config['mgr_jquery_path']) ?>

+    <?= sprintf('<script type="text/javascript" src="%s"></script>'."\n", $modx->config['mgr_jquery_path']) ?>

     <?php if ($modx->config['show_picker'] != "0") { ?>

         <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/color.switcher.js"

                 type="text/javascript"></script>

@@ -95,7 +95,7 @@ 
     <?php } ?>

 

     <!-- OnManagerMainFrameHeaderHTMLBlock -->

-    <?= $onManagerMainFrameHeaderHTMLBlock . "\n" ?>

+    <?= $onManagerMainFrameHeaderHTMLBlock."\n" ?>

 

     <script type="text/javascript">

       if (!evo) {

@@ -125,7 +125,7 @@ 
     <script>

         <?php

         if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {

-            echo 'doRefresh(' . $_REQUEST['r'] . ");\n";

+            echo 'doRefresh('.$_REQUEST['r'].");\n";

         }

         ?>

     </script>

install/src/functions.php

Spacing +34 added lines, -34 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! function_exists('getLangOptions')) {
+if (!function_exists('getLangOptions')) {
     /**
      * @param string $install_language
      * @return string
@@ -7,7 +7,7 @@ 
     function getLangOptions($install_language = 'english')
     {
         $langs = array();
-        if ($handle = opendir(__DIR__ . '/lang/')) {
+        if ($handle = opendir(__DIR__.'/lang/')) {
             while (false !== ($file = readdir($handle))) {
                 if (strpos($file, '.')) {
                     $langs[] = str_replace('.inc.php', '', $file);
@@ -21,14 +21,14 @@ 
             $abrv_language = explode('-', $language);
             $selected = ($language === $install_language) ? 'selected' : '';
             $_[] = sprintf('<option value="%s" %s>%s</option>', $language, $selected,
-                    ucwords($abrv_language[0])) . "\n";
+                    ucwords($abrv_language[0]))."\n";
         }
 
         return implode("\n", $_);
     }
 }
 
-if (! function_exists('install_sessionCheck')) {
+if (!function_exists('install_sessionCheck')) {
     function install_sessionCheck()
     {
         global $_lang;
@@ -50,8 +50,8 @@ 
 </head>
 <body>
 	<div class="install">
-		<p>' . $_lang["session_problem"] . '</p>
-		<p><a href="./">' . $_lang["session_problem_try_again"] . '</a></p>
+		<p>' . $_lang["session_problem"].'</p>
+		<p><a href="./">' . $_lang["session_problem_try_again"].'</a></p>
 	</div>
 </body>
 </html>';
@@ -72,7 +72,7 @@ 
     function parse($src, $ph, $left = '[+', $right = '+]')
     {
         foreach ($ph as $k => $v) {
-            $k = $left . $k . $right;
+            $k = $left.$k.$right;
             $src = str_replace($k, $v, $src);
         }
 
@@ -99,7 +99,7 @@ 
         $ph['textdir'] = $modx_textdir ? ' id="rtl"' : '';
         $ph['help_link'] = $installmode == 0 ? $_lang['help_link_new'] : $_lang['help_link_upd'];
         $ph['version'] = $moduleVersion;
-        $ph['release_date'] = ($modx_textdir ? '&rlm;' : '') . $modx_release_date;
+        $ph['release_date'] = ($modx_textdir ? '&rlm;' : '').$modx_release_date;
         $ph['footer1'] = $_lang['modx_footer1'];
         $ph['footer2'] = $_lang['modx_footer2'];
         $ph['current_year'] = date('Y');
@@ -184,7 +184,7 @@ 
             $manager_language = "english";
         }
         $langs = array();
-        if ($handle = opendir(dirname(dirname(__DIR__)) . '/' . MGR_DIR . '/includes/lang')) {
+        if ($handle = opendir(dirname(dirname(__DIR__)).'/'.MGR_DIR.'/includes/lang')) {
             while (false !== ($file = readdir($handle))) {
                 if (strpos($file, '.inc.') !== false) {
                     $langs[] = $file;
@@ -250,7 +250,7 @@ 
             $i++;
         }
 
-        return (0 < count($_)) ? '<h3>[%templates%]</h3>' . implode("\n", $_) : '';
+        return (0 < count($_)) ? '<h3>[%templates%]</h3>'.implode("\n", $_) : '';
     }
 }
 
@@ -280,7 +280,7 @@ 
             $i++;
         }
 
-        return (0 < count($_)) ? '<h3>[%tvs%]</h3>' . implode("\n", $_) : '';
+        return (0 < count($_)) ? '<h3>[%tvs%]</h3>'.implode("\n", $_) : '';
     }
 }
 
@@ -311,7 +311,7 @@ 
             $i++;
         }
 
-        return (0 < count($_)) ? '<h3>[%chunks%]</h3>' . implode("\n", $_) : '';
+        return (0 < count($_)) ? '<h3>[%chunks%]</h3>'.implode("\n", $_) : '';
     }
 }
 
@@ -342,7 +342,7 @@ 
             $i++;
         }
 
-        return (0 < count($_)) ? '<h3>[%modules%]</h3>' . implode("\n", $_) : '';
+        return (0 < count($_)) ? '<h3>[%modules%]</h3>'.implode("\n", $_) : '';
     }
 }
 
@@ -377,7 +377,7 @@ 
             $i++;
         }
 
-        return (0 < count($_)) ? '<h3>[%plugins%]</h3>' . implode("\n", $_) : '';
+        return (0 < count($_)) ? '<h3>[%plugins%]</h3>'.implode("\n", $_) : '';
     }
 }
 
@@ -408,7 +408,7 @@ 
             $i++;
         }
 
-        return (0 < count($_)) ? '<h3>[%snippets%]</h3>' . implode("\n", $_) : '';
+        return (0 < count($_)) ? '<h3>[%snippets%]</h3>'.implode("\n", $_) : '';
     }
 }
 
@@ -419,46 +419,46 @@ 
 
         // secure web documents - privateweb
         mysqli_query($sqlParser->conn,
-            "UPDATE `" . $sqlParser->prefix . "site_content` SET privateweb = 0 WHERE privateweb = 1");
+            "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1");
         $sql = "SELECT DISTINCT sc.id
-             FROM `" . $sqlParser->prefix . "site_content` sc
-             LEFT JOIN `" . $sqlParser->prefix . "document_groups` dg ON dg.document = sc.id
-             LEFT JOIN `" . $sqlParser->prefix . "webgroup_access` wga ON wga.documentgroup = dg.document_group
+             FROM `" . $sqlParser->prefix."site_content` sc
+             LEFT JOIN `" . $sqlParser->prefix."document_groups` dg ON dg.document = sc.id
+             LEFT JOIN `" . $sqlParser->prefix."webgroup_access` wga ON wga.documentgroup = dg.document_group
              WHERE wga.id>0";
         $ds = mysqli_query($sqlParser->conn, $sql);
         if (!$ds) {
-            echo "An error occurred while executing a query: " . mysqli_error($sqlParser->conn);
+            echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
         } else {
             while ($r = mysqli_fetch_assoc($ds)) {
                 $ids[] = $r["id"];
             }
             if (count($ids) > 0) {
                 mysqli_query($sqlParser->conn,
-                    "UPDATE `" . $sqlParser->prefix . "site_content` SET privateweb = 1 WHERE id IN (" . implode(", ",
-                        $ids) . ")");
+                    "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ",
+                        $ids).")");
                 unset($ids);
             }
         }
 
         // secure manager documents privatemgr
         mysqli_query($sqlParser->conn,
-            "UPDATE `" . $sqlParser->prefix . "site_content` SET privatemgr = 0 WHERE privatemgr = 1");
+            "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1");
         $sql = "SELECT DISTINCT sc.id
-             FROM `" . $sqlParser->prefix . "site_content` sc
-             LEFT JOIN `" . $sqlParser->prefix . "document_groups` dg ON dg.document = sc.id
-             LEFT JOIN `" . $sqlParser->prefix . "membergroup_access` mga ON mga.documentgroup = dg.document_group
+             FROM `" . $sqlParser->prefix."site_content` sc
+             LEFT JOIN `" . $sqlParser->prefix."document_groups` dg ON dg.document = sc.id
+             LEFT JOIN `" . $sqlParser->prefix."membergroup_access` mga ON mga.documentgroup = dg.document_group
              WHERE mga.id>0";
         $ds = mysqli_query($sqlParser->conn, $sql);
         if (!$ds) {
-            echo "An error occurred while executing a query: " . mysqli_error($sqlParser->conn);
+            echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
         } else {
             while ($r = mysqli_fetch_assoc($ds)) {
                 $ids[] = $r["id"];
             }
             if (count($ids) > 0) {
                 mysqli_query($sqlParser->conn,
-                    "UPDATE `" . $sqlParser->prefix . "site_content` SET privatemgr = 1 WHERE id IN (" . implode(", ",
-                        $ids) . ")");
+                    "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ",
+                        $ids).")");
                 unset($ids);
             }
         }
@@ -469,7 +469,7 @@ 
     function parse_docblock($element_dir, $filename)
     {
         $params = array();
-        $fullpath = $element_dir . '/' . $filename;
+        $fullpath = $element_dir.'/'.$filename;
         if (is_readable($fullpath)) {
             $tpl = @fopen($fullpath, "r");
             if ($tpl) {
@@ -688,17 +688,17 @@ 
     function getCreateDbCategory($category, $sqlParser)
     {
         $dbase = $sqlParser->dbname;
-        $dbase = '`' . trim($dbase, '`') . '`';
+        $dbase = '`'.trim($dbase, '`').'`';
         $table_prefix = $sqlParser->prefix;
         $category_id = 0;
         if (!empty($category)) {
             $category = mysqli_real_escape_string($sqlParser->conn, $category);
             $rs = mysqli_query($sqlParser->conn,
-                "SELECT id FROM $dbase.`" . $table_prefix . "categories` WHERE category = '" . $category . "'");
+                "SELECT id FROM $dbase.`".$table_prefix."categories` WHERE category = '".$category."'");
             if (mysqli_num_rows($rs) && ($row = mysqli_fetch_assoc($rs))) {
                 $category_id = $row['id'];
             } else {
-                $q = "INSERT INTO $dbase.`" . $table_prefix . "categories` (`category`) VALUES ('{$category}');";
+                $q = "INSERT INTO $dbase.`".$table_prefix."categories` (`category`) VALUES ('{$category}');";
                 $rs = mysqli_query($sqlParser->conn, $q);
                 if ($rs) {
                     $category_id = mysqli_insert_id($sqlParser->conn);
@@ -740,7 +740,7 @@ 
             default:
                 return $cleaned;
         };
-        if (substr(trim($cleaned), 0, $count) == $include . ' MODX_BASE_PATH.\'assets/' . $elm_name . '/') {
+        if (substr(trim($cleaned), 0, $count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/') {
             return $cleaned;
         }
 

install/src/controllers/mode.php

Spacing +11 added lines, -11 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 // Determine upgradeability
 $upgradeable = 0;
-if (is_file($base_path . MGR_DIR . '/includes/config.inc.php')) { // Include the file so we can test its validity
-    include_once $base_path . MGR_DIR . '/includes/config.inc.php';
+if (is_file($base_path.MGR_DIR.'/includes/config.inc.php')) { // Include the file so we can test its validity
+    include_once $base_path.MGR_DIR.'/includes/config.inc.php';
     // We need to have all connection settings - tho prefix may be empty so we have to ignore it
     if (isset($dbase)) {
         if (!$conn = @mysqli_connect($database_server, $database_user, $database_password))
@@ -17,16 +17,16 @@ 
 }
 
 $ph['moduleName']       = $moduleName;
-$ph['displayNew']       = ($upgradeable!=0) ? 'display:none;' : '';
-$ph['displayUpg']       = ($upgradeable==0) ? 'display:none;' : '';
+$ph['displayNew']       = ($upgradeable != 0) ? 'display:none;' : '';
+$ph['displayUpg']       = ($upgradeable == 0) ? 'display:none;' : '';
 $ph['displayAdvUpg']    = $ph['displayUpg'];
-$ph['checkedNew']       = !$upgradeable     ? 'checked' : '';
-$ph['checkedUpg']       = ($_POST['installmode']==1 || $upgradeable==1) ? 'checked' : '';
-$ph['checkedAdvUpg']    = ($_POST['installmode']==2 || $upgradeable==2) ? 'checked' : '';
+$ph['checkedNew']       = !$upgradeable ? 'checked' : '';
+$ph['checkedUpg']       = ($_POST['installmode'] == 1 || $upgradeable == 1) ? 'checked' : '';
+$ph['checkedAdvUpg']    = ($_POST['installmode'] == 2 || $upgradeable == 2) ? 'checked' : '';
 $ph['install_language'] = $install_language;
-$ph['disabledUpg']      = ($upgradeable!=1) ? 'disabled' : '';
-$ph['disabledAdvUpg']   = ($upgradeable==0) ? 'disabled' : '';
+$ph['disabledUpg']      = ($upgradeable != 1) ? 'disabled' : '';
+$ph['disabledAdvUpg']   = ($upgradeable == 0) ? 'disabled' : '';
 
-$tpl = file_get_contents(dirname(__DIR__) . '/template/actions/mode.tpl');
+$tpl = file_get_contents(dirname(__DIR__).'/template/actions/mode.tpl');
 $content = parse($tpl, $ph);
-echo parse($content, $_lang,'[%','%]');
+echo parse($content, $_lang, '[%', '%]');

install/src/controllers/options.php

Spacing +7 added lines, -7 removed lines

@@ -1,19 +1,19 @@ 
 <?php
-$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0;
+$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0;
 
-switch($installMode){
+switch ($installMode) {
     case 0:
     case 2:
         $database_collation = isset($_POST['database_collation']) ? $_POST['database_collation'] : 'utf8_general_ci';
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         $_POST['database_connection_charset'] = $database_charset;
-        if(empty($_SESSION['databaseloginpassword']))
+        if (empty($_SESSION['databaseloginpassword']))
             $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword'];
-        if(empty($_SESSION['databaseloginname']))
+        if (empty($_SESSION['databaseloginname']))
             $_SESSION['databaseloginname'] = $_POST['databaseloginname'];
         break;
     case 1:
-        include $base_path . MGR_DIR . '/includes/config.inc.php';
+        include $base_path.MGR_DIR.'/includes/config.inc.php';
         if (@ $conn = mysqli_connect($database_server, $database_user, $database_password)) {
             if (@ mysqli_query($conn, "USE {$dbase}")) {
                 if (!$rs = mysqli_query($conn, "show session variables like 'collation_database'")) {
@@ -68,7 +68,7 @@ 
 $ph['checked'] = isset ($_POST['installdata']) && $_POST['installdata'] == "1" ? 'checked' : '';
 
 # load setup information file
-include_once dirname(__DIR__) . '/processor/result.php';
+include_once dirname(__DIR__).'/processor/result.php';
 $ph['templates'] = getTemplates($moduleTemplates);
 $ph['tvs']       = getTVs($moduleTVs);
 $ph['chunks']    = getChunks($moduleChunks);
@@ -78,6 +78,6 @@ 
 
 $ph['action'] = ($installMode == 1) ? 'mode' : 'connection';
 
-$tpl = file_get_contents(dirname(__DIR__) . '/template/actions/options.tpl');
+$tpl = file_get_contents(dirname(__DIR__).'/template/actions/options.tpl');
 $content = parse($tpl, $ph);
 echo parse($content, $_lang, '[%', '%]');

install/src/controllers/connection/databasetest.php

Spacing +8 added lines, -8 removed lines

@@ -7,7 +7,7 @@ 
 
 $output = $_lang["status_checking_database"];
 if (!$conn = mysqli_connect($host, $uid, $pwd)) {
-    $output .= '<span id="database_fail" style="color:#FF0000;">' . $_lang['status_failed'] . '</span>';
+    $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed'].'</span>';
 } else {
     $database_name = mysqli_real_escape_string($conn, $_POST['database_name']);
     $database_name = str_replace("`", "", $database_name);
@@ -18,22 +18,22 @@ 
     if (!@ mysqli_select_db($conn, $database_name)) {
         // create database
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
-        $query = "CREATE DATABASE `" . $database_name . "` CHARACTER SET " . $database_charset . " COLLATE " . $database_collation . ";";
+        $query = "CREATE DATABASE `".$database_name."` CHARACTER SET ".$database_charset." COLLATE ".$database_collation.";";
 
         if (!mysqli_query($conn, $query)) {
-            $output .= '<span id="database_fail" style="color:#FF0000;">' . $_lang['status_failed_could_not_create_database'] . '</span>';
+            $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_could_not_create_database'].'</span>';
         } else {
-            $output .= '<span id="database_pass" style="color:#80c000;">' . $_lang['status_passed_database_created'] . '</span>';
+            $output .= '<span id="database_pass" style="color:#80c000;">'.$_lang['status_passed_database_created'].'</span>';
         }
     } elseif (($installMode == 0) && (mysqli_query($conn,
             "SELECT COUNT(*) FROM {$database_name}.`{$tableprefix}site_content`"))) {
-        $output .= '<span id="database_fail" style="color:#FF0000;">' . $_lang['status_failed_table_prefix_already_in_use'] . '</span>';
+        $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_table_prefix_already_in_use'].'</span>';
     } elseif (($database_connection_method != 'SET NAMES') && ($rs = mysqli_query($conn,
             "show variables like 'collation_database'")) && ($row = mysqli_fetch_row($rs)) && ($row[1] != $database_collation)) {
-        $output .= '<span id="database_fail" style="color:#FF0000;">' . sprintf($_lang['status_failed_database_collation_does_not_match'],
-                $row[1]) . '</span>';
+        $output .= '<span id="database_fail" style="color:#FF0000;">'.sprintf($_lang['status_failed_database_collation_does_not_match'],
+                $row[1]).'</span>';
     } else {
-        $output .= '<span id="database_pass" style="color:#80c000;">' . $_lang['status_passed'] . '</span>';
+        $output .= '<span id="database_pass" style="color:#80c000;">'.$_lang['status_passed'].'</span>';
     }
 }
 

install/src/controllers/connection/servertest.php

Spacing +5 added lines, -5 removed lines

@@ -7,13 +7,13 @@ 
 $output = $_lang["status_connecting"];
 if (function_exists('mysqli_connect')) {
     if (!$conn = @mysqli_connect($host, $uid, $pwd)) {
-        $output .= '<span id="server_fail" style="color:#FF0000;"> ' . $_lang['status_failed'] . '</span>';
+        $output .= '<span id="server_fail" style="color:#FF0000;"> '.$_lang['status_failed'].'</span>';
     } else {
-        $output .= '<span id="server_pass" style="color:#80c000;"> ' . $_lang['status_passed_server'] . '</span>';
+        $output .= '<span id="server_pass" style="color:#80c000;"> '.$_lang['status_passed_server'].'</span>';
 
         // Mysql version check
         if (version_compare(mysqli_get_server_info($conn), '5.0.51', '=')) {
-            $output .= '<br /><span style="color:#FF0000;"> ' . $_lang['mysql_5051'] . '</span>';
+            $output .= '<br /><span style="color:#FF0000;"> '.$_lang['mysql_5051'].'</span>';
         }
         // Mode check
         $mysqlmode = mysqli_query($conn, "SELECT @@session.sql_mode");
@@ -26,11 +26,11 @@ 
                 }
             }
             if ($strictMode) {
-                $output .= '<br /><span style="color:#FF0000;"> ' . $_lang['strict_mode'] . '</span>';
+                $output .= '<br /><span style="color:#FF0000;"> '.$_lang['strict_mode'].'</span>';
             }
         }
     }
 } else {
-    $output .= '<span id="server_fail" style="color:#FF0000;"> ' . $_lang['status_failed_mysqli'] . '</span>';
+    $output .= '<span id="server_fail" style="color:#FF0000;"> '.$_lang['status_failed_mysqli'].'</span>';
 }
 echo $output;

install/src/controllers/language.php

Spacing +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php
 
-$content = file_get_contents(dirname(__DIR__) . '/template/actions/language.tpl');
+$content = file_get_contents(dirname(__DIR__).'/template/actions/language.tpl');
 $content = parse($content, array(
     'langOptions' => getLangOptions($install_language))
 );
-$content = parse($content, $_lang,'[%','%]');
+$content = parse($content, $_lang, '[%', '%]');
 
 echo $content;

install/src/controllers/connection.php

Spacing +8 added lines, -8 removed lines

@@ -1,27 +1,27 @@ 
 <?php
-$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0;
+$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0;
 
 // Determine upgradeability
 $upgradeable = 0;
 if ($installMode === 0) {
     $database_name = '';
     $database_server = 'localhost';
-    $table_prefix = base_convert(mt_rand(10, 20), 10, 36) .
-        substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyz'), mt_rand(0, 33), 3) .
+    $table_prefix = base_convert(mt_rand(10, 20), 10, 36).
+        substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyz'), mt_rand(0, 33), 3).
         '_';
 } else {
     $database_name = '';
-    if (! is_file($base_path . MGR_DIR . '/includes/config.inc.php')) {
+    if (!is_file($base_path.MGR_DIR.'/includes/config.inc.php')) {
         $upgradeable = 0;
     } else {
         // Include the file so we can test its validity
-        include $base_path . MGR_DIR . '/includes/config.inc.php';
+        include $base_path.MGR_DIR.'/includes/config.inc.php';
         // We need to have all connection settings - but prefix may be empty so we have to ignore it
         if ($dbase) {
             $database_name = trim($dbase, '`');
             if (!$conn = mysqli_connect($database_server, $database_user, $database_password)) {
                 $upgradeable = (isset($_POST['installmode']) && $_POST['installmode'] === 'new') ? 0 : 2;
-            } elseif (! mysqli_select_db($conn, trim($dbase, '`'))) {
+            } elseif (!mysqli_select_db($conn, trim($dbase, '`'))) {
                 $upgradeable = (isset($_POST['installmode']) && $_POST['installmode'] === 'new') ? 0 : 2;
             } else {
                 $upgradeable = 1;
@@ -33,7 +33,7 @@ 
 }
 
 // check the database collation if not specified in the configuration
-if ($upgradeable && (! isset($database_connection_charset) || empty($database_connection_charset))) {
+if ($upgradeable && (!isset($database_connection_charset) || empty($database_connection_charset))) {
     if (!$rs = mysqli_query($conn, "show session variables like 'collation_database'")) {
         $rs = mysqli_query($conn, "show session variables like 'collation_server'");
     }
@@ -77,7 +77,7 @@ 
 $ph['databaseloginpassword'] = isset($_SESSION['databaseloginpassword']) ? $_SESSION['databaseloginpassword'] : "";
 $ph['MGR_DIR'] = MGR_DIR;
 
-$content = file_get_contents(dirname(__DIR__) . '/template/actions/connection.tpl');
+$content = file_get_contents(dirname(__DIR__).'/template/actions/connection.tpl');
 $content = parse($content, $_lang, '[%', '%]');
 $content = parse($content, $ph);