evolution-cms / evolution

install/actions/action_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($base_path . 'install/actions/tpl_mode.html');
+$tpl = file_get_contents($base_path.'install/actions/tpl_mode.html');
 $content = parse($tpl, $ph);
-echo parse($content, $_lang,'[%','%]');
+echo parse($content, $_lang, '[%', '%]');

Braces +12 added lines, -10 removed lines

@@ -1,20 +1,22 @@
 <?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
+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))
-            $upgradeable = isset($_POST['installmode']) && $_POST['installmode'] == 'new' ? 0 : 2;
-        elseif (!@mysqli_select_db($conn, trim($dbase, '`')))
-            $upgradeable = isset($_POST['installmode']) && $_POST['installmode'] == 'new' ? 0 : 2;
-        else
-            $upgradeable = 1;
+        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, '`'))) {
+                    $upgradeable = isset($_POST['installmode']) && $_POST['installmode'] == 'new' ? 0 : 2;
+        } else {
+                    $upgradeable = 1;
+        }
+    } else {
+            $upgradeable = 2;
+    }
     }
-    else
-        $upgradeable = 2;
-}
 
 $ph['moduleName']       = $moduleName;
 $ph['displayNew']       = ($upgradeable!=0) ? 'display:none;' : '';

manager/processors/save_content.processor.php

Indentation +1 added lines, -1 removed lines

@@ -492,7 +492,7 @@
                 }elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
                 $publishedon = $pub_date;
                 $publishedby = $modx->getLoginUserID();
-                   }elseif ($was_published && !$published) {
+                    }elseif ($was_published && !$published) {
                 $publishedon = 0;
                 $publishedby = 0;
             } else {

Switch Indentation +11 added lines, -11 removed lines

@@ -280,19 +280,19 @@
             // invoke OnBeforeDocFormSave event
             switch($modx->config['docid_incrmnt_method'])
             {
-            case '1':
-                $from = "{$tbl_site_content} AS T0 LEFT JOIN {$tbl_site_content} AS T1 ON T0.id + 1 = T1.id";
-                $where = "T1.id IS NULL";
-                $rs = $modx->db->select('MIN(T0.id)+1', $from, "T1.id IS NULL");
-                $id = $modx->db->getValue($rs);
+                case '1':
+                    $from = "{$tbl_site_content} AS T0 LEFT JOIN {$tbl_site_content} AS T1 ON T0.id + 1 = T1.id";
+                    $where = "T1.id IS NULL";
+                    $rs = $modx->db->select('MIN(T0.id)+1', $from, "T1.id IS NULL");
+                    $id = $modx->db->getValue($rs);
+                    break;
+                case '2':
+                    $rs = $modx->db->select('MAX(id)+1', $tbl_site_content);
+                    $id = $modx->db->getValue($rs);
                 break;
-            case '2':
-                $rs = $modx->db->select('MAX(id)+1', $tbl_site_content);
-                $id = $modx->db->getValue($rs);
-            break;
 
-            default:
-                $id = '';
+                default:
+                    $id = '';
             }
 
         $modx->invokeEvent("OnBeforeDocFormSave", array(

Spacing +12 added lines, -12 removed lines

@@ -278,7 +278,7 @@ 
         case 'new' :
 
             // invoke OnBeforeDocFormSave event
-            switch($modx->config['docid_incrmnt_method'])
+            switch ($modx->config['docid_incrmnt_method'])
             {
             case '1':
                 $from = "{$tbl_site_content} AS T0 LEFT JOIN {$tbl_site_content} AS T1 ON T0.id + 1 = T1.id";
@@ -489,7 +489,7 @@ 
             if (!$was_published && $published) {
                 $publishedon = $currentdate;
                 $publishedby = $modx->getLoginUserID();
-                }elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
+                }elseif ((!empty($pub_date) && $pub_date <= $currentdate && $published)) {
                 $publishedon = $pub_date;
                 $publishedby = $modx->getLoginUserID();
                    }elseif ($was_published && !$published) {
@@ -501,7 +501,7 @@ 
             }
 
             // invoke OnBeforeDocFormSave event
-            $modx->invokeEvent("OnBeforeDocFormSave", array (
+            $modx->invokeEvent("OnBeforeDocFormSave", array(
                 "mode" => "upd",
                 "id" => $id
             ));
@@ -526,7 +526,7 @@ 
                 . "menuindex={$menuindex}, "
                 . "searchable={$searchable}, "
                 . "cacheable={$cacheable}, "
-                . "editedby=" . $modx->getLoginUserID() . ", "
+                . "editedby=".$modx->getLoginUserID().", "
                 . "editedon={$currentdate}, "
                 . "publishedon={$publishedon}, "
                 . "publishedby={$publishedby}, "
@@ -540,7 +540,7 @@ 
 
             // update template variables
             $rs = $modx->db->select('id, tmplvarid', $tbl_site_tmplvar_contentvalues, "contentid='{$id}'");
-            $tvIds = array ();
+            $tvIds = array();
             while ($row = $modx->db->getRow($rs)) {
                 $tvIds[$row['tmplvarid']] = $row['id'];
             }
@@ -593,7 +593,7 @@ 
                     'groups.id, groups.document_group',
                     "{$tbl_document_groups} AS groups
                     LEFT JOIN {$tbl_documentgroup_names} AS dgn ON dgn.id = groups.document_group",
-                    "((1=".(int)$isManager." AND dgn.private_memgroup) OR (1=".(int)$isWeb." AND dgn.private_webgroup)) AND groups.document = '{$id}'"
+                    "((1=".(int) $isManager." AND dgn.private_memgroup) OR (1=".(int) $isWeb." AND dgn.private_webgroup)) AND groups.document = '{$id}'"
                     );
                 $old_groups = array();
                 while ($row = $modx->db->getRow($rs)) $old_groups[$row['document_group']] = $row['id'];
@@ -605,7 +605,7 @@ 
                         unset($old_groups[$group]);
                         continue;
                     } elseif ($link_id == 'new') {
-                        $insertions[] = '('.(int)$group.','.$id.')';
+                        $insertions[] = '('.(int) $group.','.$id.')';
                     }
                 }
                 if (!empty($insertions)) {
@@ -637,17 +637,17 @@ 
 
 
             // invoke OnDocFormSave event
-            $modx->invokeEvent("OnDocFormSave", array (
+            $modx->invokeEvent("OnDocFormSave", array(
                 "mode" => "upd",
                 "id" => $id
             ));
 
             // secure web documents - flag as private
-            include MODX_MANAGER_PATH . "includes/secure_web_documents.inc.php";
+            include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php";
             secureWebDocument($id);
 
             // secure manager documents - flag as private
-            include MODX_MANAGER_PATH . "includes/secure_mgr_documents.inc.php";
+            include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php";
             secureMgrDocument($id);
 
             // Set the item name for logger
@@ -673,13 +673,13 @@ 
                         // document
                         $a = ($_POST['stay'] == '2') ? "27&id=$id" : "4&pid=$parent";
                     }
-                    $header = "Location: index.php?a=" . $a . "&r=1&stay=" . $_POST['stay'].$add_path;
+                    $header = "Location: index.php?a=".$a."&r=1&stay=".$_POST['stay'].$add_path;
                 } else {
                     $header = "Location: index.php?a=3&id=$id&r=1".$add_path;
                 }
             }
             if (headers_sent()) {
-                $header = str_replace('Location: ','',$header);
+                $header = str_replace('Location: ', '', $header);
                 echo "<script>document.location.href='$header';</script>\n";
             } else {
                 header($header);

Braces +23 added lines, -19 removed lines

@@ -134,8 +134,7 @@ 
         }
         //end webber
     }
-}
-elseif ($alias) {
+} elseif ($alias) {
     $alias = $modx->stripAlias($alias);
 }
 
@@ -149,8 +148,7 @@ 
 
     if ($pub_date < $currentdate) {
         $published = 1;
-    }
-    elseif ($pub_date > $currentdate) {
+    } elseif ($pub_date > $currentdate) {
         $published = 0;
     }
 }
@@ -278,8 +276,7 @@ 
         case 'new' :
 
             // invoke OnBeforeDocFormSave event
-            switch($modx->config['docid_incrmnt_method'])
-            {
+            switch($modx->config['docid_incrmnt_method']) {
             case '1':
                 $from = "{$tbl_site_content} AS T0 LEFT JOIN {$tbl_site_content} AS T1 ON T0.id + 1 = T1.id";
                 $where = "T1.id IS NULL";
@@ -347,8 +344,9 @@ 
             "alias_visible"    => $aliasvisible
         );
 
-        if ($id != '')
-            $dbInsert["id"] = $id;
+        if ($id != '') {
+                    $dbInsert["id"] = $id;
+        }
 
         $key = $modx->db->insert($dbInsert, $tbl_site_content);
 
@@ -424,11 +422,13 @@ 
         // redirect/stay options
         if ($_POST['stay'] != '') {
             // weblink
-            if ($_POST['mode'] == "72")
-                $a = ($_POST['stay'] == '2') ? "27&id=$key" : "72&pid=$parent";
+            if ($_POST['mode'] == "72") {
+                            $a = ($_POST['stay'] == '2') ? "27&id=$key" : "72&pid=$parent";
+            }
             // document
-            if ($_POST['mode'] == "4")
-                $a = ($_POST['stay'] == '2') ? "27&id=$key" : "4&pid=$parent";
+            if ($_POST['mode'] == "4") {
+                            $a = ($_POST['stay'] == '2') ? "27&id=$key" : "4&pid=$parent";
+            }
             $header = "Location: index.php?a=".$a."&r=1&stay=".$_POST['stay'];
         } else {
             $header = "Location: index.php?a=3&id=$key&r=1";
@@ -489,10 +489,10 @@ 
             if (!$was_published && $published) {
                 $publishedon = $currentdate;
                 $publishedby = $modx->getLoginUserID();
-                }elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
+                } elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
                 $publishedon = $pub_date;
                 $publishedby = $modx->getLoginUserID();
-                   }elseif ($was_published && !$published) {
+                   } elseif ($was_published && !$published) {
                 $publishedon = 0;
                 $publishedby = 0;
             } else {
@@ -548,7 +548,9 @@ 
             $tvChanges = array();
             foreach ($tmplvars as $field => $value) {
                 if (!is_array($value)) {
-                    if (isset($tvIds[$value])) $tvDeletions[] = $tvIds[$value];
+                    if (isset($tvIds[$value])) {
+                        $tvDeletions[] = $tvIds[$value];
+                    }
                 } else {
                     $tvId = $value[0];
                     $tvVal = $value[1];
@@ -596,7 +598,9 @@ 
                     "((1=".(int)$isManager." AND dgn.private_memgroup) OR (1=".(int)$isWeb." AND dgn.private_webgroup)) AND groups.document = '{$id}'"
                     );
                 $old_groups = array();
-                while ($row = $modx->db->getRow($rs)) $old_groups[$row['document_group']] = $row['id'];
+                while ($row = $modx->db->getRow($rs)) {
+                    $old_groups[$row['document_group']] = $row['id'];
+                }
 
                 // update the permissions in the database
                 $insertions = $deletions = array();
@@ -658,9 +662,9 @@ 
                 $modx->clearCache('full');
             }
 
-            if ($_POST['refresh_preview'] == '1')
-                $header = "Location: ".MODX_SITE_URL."index.php?id=$id&z=manprev";
-            else {
+            if ($_POST['refresh_preview'] == '1') {
+                            $header = "Location: ".MODX_SITE_URL."index.php?id=$id&z=manprev";
+            } else {
                 if ($_POST['stay'] != '2' && $id > 0) {
                     $modx->unlockElement(7, $id);
                 }

manager/actions/help/version_notices/1.3.6.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 ?>

manager/actions/help/version_notices/1.4.1.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 ?>

manager/actions/help/version_notices/1.4.0.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 ?>