evolution-cms / evolution

index.php

Spacing +16 added lines, -16 removed lines

@@ -50,16 +50,16 @@ 
 	include_once($autoloader);
 }
 
-if(!isset($_SERVER['REQUEST_TIME_FLOAT'])) $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
+if (!isset($_SERVER['REQUEST_TIME_FLOAT'])) $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
 
-$base_path = str_replace('\\','/',dirname(__FILE__)) . '/';
-if(is_file($base_path . 'assets/cache/siteManager.php'))
-    include_once($base_path . 'assets/cache/siteManager.php');
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager"))
+$base_path = str_replace('\\', '/', dirname(__FILE__)).'/';
+if (is_file($base_path.'assets/cache/siteManager.php'))
+    include_once($base_path.'assets/cache/siteManager.php');
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager"))
 	define('MGR_DIR', 'manager');
-if(is_file($base_path . 'assets/cache/siteHostnames.php'))
-    include_once($base_path . 'assets/cache/siteHostnames.php');
-if(!defined('MODX_SITE_HOSTNAMES'))
+if (is_file($base_path.'assets/cache/siteHostnames.php'))
+    include_once($base_path.'assets/cache/siteHostnames.php');
+if (!defined('MODX_SITE_HOSTNAMES'))
 	define('MODX_SITE_HOSTNAMES', '');
 
 // get start time
@@ -71,7 +71,7 @@ 
 // set some settings, and address some IE issues
 @ini_set('url_rewriter.tags', '');
 @ini_set('session.use_trans_sid', 0);
-@ini_set('session.use_only_cookies',1);
+@ini_set('session.use_only_cookies', 1);
 session_cache_limiter('');
 header('P3P: CP="NOI NID ADMa OUR IND UNI COM NAV"'); // header for weird cookie stuff. Blame IE.
 header('Cache-Control: private, must-revalidate');
@@ -83,7 +83,7 @@ 
  */
 
 define('IN_PARSER_MODE', true);
-if ( ! defined('IN_MANAGER_MODE')) {
+if (!defined('IN_MANAGER_MODE')) {
 	define('IN_MANAGER_MODE', false);
 }
 if (!defined('MODX_API_MODE')) {
@@ -91,10 +91,10 @@ 
 }
 
 // get the required includes
-if(!isset($database_user) || $database_user=="") {
+if (!isset($database_user) || $database_user == "") {
 	$rt = @include_once(dirname(__FILE__).'/'.MGR_DIR.'/includes/config.inc.php');
 	// Be sure config.inc.php is there and that it contains some important values
-	if(!$rt || !$database_type || !$database_server || !$database_user || !$dbase) {
+	if (!$rt || !$database_type || !$database_server || !$database_user || !$dbase) {
 		readfile('install/not_installed.tpl');
 		exit;
 	}
@@ -125,13 +125,13 @@ 
 $modx->stopOnNotice = false;
 
 // Don't show PHP errors to the public
-if(!isset($_SESSION['mgrValidated']) || !$_SESSION['mgrValidated']) {
-    @ini_set("display_errors","0");
+if (!isset($_SESSION['mgrValidated']) || !$_SESSION['mgrValidated']) {
+    @ini_set("display_errors", "0");
 }
 
-if(MODX_CLI){
+if (MODX_CLI) {
     @set_time_limit(0);
-    @ini_set('max_execution_time',0);
+    @ini_set('max_execution_time', 0);
 }
 
 // execute the parser if index.php was not included

manager/includes/preload.functions.inc.php

Spacing +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
     $_ = crc32(__FILE__);

     $_ = sprintf('%u', $_);

 

-    return 'evo' . base_convert($_, 10, 36);

+    return 'evo'.base_convert($_, 10, 36);

 }

 

 /**

@@ -20,7 +20,7 @@ 
 function startCMSSession()

 {

     global $site_sessionname, $https_port, $session_cookie_path, $session_cookie_domain;

-    if(MODX_CLI) return;

+    if (MODX_CLI) return;

 

     session_name($site_sessionname);

     removeInvalidCmsSessionIds($site_sessionname);

@@ -32,7 +32,7 @@ 
     session_start();

     $key = "modx.mgr.session.cookie.lifetime";

     if (isset($_SESSION[$key]) && is_numeric($_SESSION[$key])) {

-        $cookieLifetime = (int)$_SESSION[$key];

+        $cookieLifetime = (int) $_SESSION[$key];

         if ($cookieLifetime) {

             $cookieExpiration = $_SERVER['REQUEST_TIME'] + $cookieLifetime;

         }

@@ -61,7 +61,7 @@ 
  */

 function removeInvalidCmsSessionIds($session_name)

 {

-    if(MODX_CLI) return;

+    if (MODX_CLI) return;

     // session ids is invalid iff it is empty string

     // storage priorioty can see in PHP source ext/session/session.c

     removeInvalidCmsSessionFromStorage($_COOKIE, $session_name);

manager/frames/nodes.php

Spacing +3 added lines, -3 removed lines

@@ -18,9 +18,9 @@
     exit('send some data');
 } //??
 
-$indent = (int)$_REQUEST['indent'];
-$parent = (int)$_REQUEST['parent'];
-$expandAll = (int)$_REQUEST['expandAll'];
+$indent = (int) $_REQUEST['indent'];
+$parent = (int) $_REQUEST['parent'];
+$expandAll = (int) $_REQUEST['expandAll'];
 $output = '';
 $hereid = isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ? $_REQUEST['id'] : '';
 

manager/frames/nodes.functions.inc.php

Spacing +31 added lines, -31 removed lines

@@ -38,13 +38,13 @@ 
         case 'publishedon':
         case 'pub_date':
         case 'unpub_date':
-            $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.' . $_SESSION['tree_sortby'], 'sc.' . $_SESSION['tree_sortby']);
+            $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.'.$_SESSION['tree_sortby'], 'sc.'.$_SESSION['tree_sortby']);
             break;
         default:
-            $sortby = 'sc.' . $_SESSION['tree_sortby'];
+            $sortby = 'sc.'.$_SESSION['tree_sortby'];
     };
 
-    $orderby = $modx->db->escape($sortby . ' ' . $_SESSION['tree_sortdir']);
+    $orderby = $modx->db->escape($sortby.' '.$_SESSION['tree_sortdir']);
 
     // Folder sorting gets special setup ;) Add menuindex and pagetitle
     if ($_SESSION['tree_sortby'] == 'isfolder') {
@@ -58,11 +58,11 @@ 
     $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
     $showProtected = false;
     if (isset ($modx->config['tree_show_protected'])) {
-        $showProtected = (boolean)$modx->config['tree_show_protected'];
+        $showProtected = (boolean) $modx->config['tree_show_protected'];
     }
-    $mgrRole = (isset ($_SESSION['mgrRole']) && (string)$_SESSION['mgrRole'] === '1') ? '1' : '0';
+    $mgrRole = (isset ($_SESSION['mgrRole']) && (string) $_SESSION['mgrRole'] === '1') ? '1' : '0';
     if ($showProtected == false) {
-        $access = "AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
+        $access = "AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
     } else {
         $access = '';
     }
@@ -98,7 +98,7 @@ 
         }
 
         $weblinkDisplay = $row['type'] == 'reference' ? sprintf(' %s', $_style['tree_linkgo']) : '';
-        $pageIdDisplay = '<small>(' . ($modx_textdir ? '&rlm;' : '') . $row['id'] . ')</small>';
+        $pageIdDisplay = '<small>('.($modx_textdir ? '&rlm;' : '').$row['id'].')</small>';
 
         // Prepare displaying user-locks
         $lockedByUser = '';
@@ -109,7 +109,7 @@ 
                     'element_type' => $_lang["lock_element_type_7"],
                     'lasthit_df' => $rowLock['lasthit_df']
                 ));
-                $lockedByUser = '<span title="' . $title . '" class="editResource">' . $_style['tree_preview_resource'] . '</span>';
+                $lockedByUser = '<span title="'.$title.'" class="editResource">'.$_style['tree_preview_resource'].'</span>';
             } else {
                 $title = $modx->parseText($_lang["lock_element_locked_by"], array(
                     'element_type' => $_lang["lock_element_type_7"],
@@ -117,9 +117,9 @@ 
                     'lasthit_df' => $rowLock['lasthit_df']
                 ));
                 if ($modx->hasPermission('remove_locks')) {
-                    $lockedByUser = '<span onclick="modx.tree.unlockElement(7, ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+                    $lockedByUser = '<span onclick="modx.tree.unlockElement(7, '.$row['id'].', this);return false;" title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>';
                 } else {
-                    $lockedByUser = '<span title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+                    $lockedByUser = '<span title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>';
                 }
             }
         }
@@ -128,22 +128,22 @@ 
 
         $title = '';
         if (isDateNode($nodeNameSource)) {
-            $title = $_lang['pagetitle'] . ': ' . $row['pagetitle'] . '[+lf+]';
+            $title = $_lang['pagetitle'].': '.$row['pagetitle'].'[+lf+]';
         }
-        $title .= $_lang['id'] . ': ' . $row['id'];
-        $title .= '[+lf+]' . $_lang['resource_opt_menu_title'] . ': ' . $row['menutitle'];
-        $title .= '[+lf+]' . $_lang['resource_opt_menu_index'] . ': ' . $row['menuindex'];
-        $title .= '[+lf+]' . $_lang['alias'] . ': ' . (!empty($row['alias']) ? $row['alias'] : '-');
-        $title .= '[+lf+]' . $_lang['template'] . ': ' . $row['templatename'];
-        $title .= '[+lf+]' . $_lang['publish_date'] . ': ' . $modx->toDateFormat($row['pub_date']);
-        $title .= '[+lf+]' . $_lang['unpublish_date'] . ': ' . $modx->toDateFormat($row['unpub_date']);
-        $title .= '[+lf+]' . $_lang['page_data_web_access'] . ': ' . ($row['privateweb'] ? $_lang['private'] : $_lang['public']);
-        $title .= '[+lf+]' . $_lang['page_data_mgr_access'] . ': ' . ($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
-        $title .= '[+lf+]' . $_lang['resource_opt_richtext'] . ': ' . ($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
-        $title .= '[+lf+]' . $_lang['page_data_searchable'] . ': ' . ($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
-        $title .= '[+lf+]' . $_lang['page_data_cacheable'] . ': ' . ($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
+        $title .= $_lang['id'].': '.$row['id'];
+        $title .= '[+lf+]'.$_lang['resource_opt_menu_title'].': '.$row['menutitle'];
+        $title .= '[+lf+]'.$_lang['resource_opt_menu_index'].': '.$row['menuindex'];
+        $title .= '[+lf+]'.$_lang['alias'].': '.(!empty($row['alias']) ? $row['alias'] : '-');
+        $title .= '[+lf+]'.$_lang['template'].': '.$row['templatename'];
+        $title .= '[+lf+]'.$_lang['publish_date'].': '.$modx->toDateFormat($row['pub_date']);
+        $title .= '[+lf+]'.$_lang['unpublish_date'].': '.$modx->toDateFormat($row['unpub_date']);
+        $title .= '[+lf+]'.$_lang['page_data_web_access'].': '.($row['privateweb'] ? $_lang['private'] : $_lang['public']);
+        $title .= '[+lf+]'.$_lang['page_data_mgr_access'].': '.($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
+        $title .= '[+lf+]'.$_lang['resource_opt_richtext'].': '.($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
+        $title .= '[+lf+]'.$_lang['page_data_searchable'].': '.($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
+        $title .= '[+lf+]'.$_lang['page_data_cacheable'].': '.($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
         $title = $modx->htmlspecialchars($title);
-        $title = str_replace('[+lf+]', ' &#13;', $title);   // replace line-breaks with empty space as fall-back
+        $title = str_replace('[+lf+]', ' &#13;', $title); // replace line-breaks with empty space as fall-back
 
         $data = array(
             'id' => $row['id'],
@@ -227,7 +227,7 @@ 
             }
 
             if ($ph['contextmenu']) {
-                $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
             }
 
             if ($_SESSION['tree_show_only_folders']) {
@@ -285,7 +285,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -323,7 +323,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -374,7 +374,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -416,7 +416,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -493,7 +493,7 @@ 
                     $nodetitle .= $modx->config['friendly_url_suffix'];
                 }
             }
-            $nodetitle = $modx->config['friendly_url_prefix'] . $nodetitle;
+            $nodetitle = $modx->config['friendly_url_prefix'].$nodetitle;
             break;
         case 'pagetitle':
             $nodetitle = $row['pagetitle'];
@@ -553,7 +553,7 @@ 
 {
     global $modx;
 
-    return (int)$modx->db->getValue($modx->db->query('SELECT count(*) FROM ' . $modx->getFullTableName('site_content') . ' WHERE parent=' . $parent . ' AND isfolder=' . $isfolder . ' '));
+    return (int) $modx->db->getValue($modx->db->query('SELECT count(*) FROM '.$modx->getFullTableName('site_content').' WHERE parent='.$parent.' AND isfolder='.$isfolder.' '));
 }
 
 /**

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, '[%', '%]');

manager/actions/mutate_settings/tab1_site_settings.inc.php

Spacing +50 added lines, -50 removed lines

@@ -13,8 +13,8 @@ 
   <tr>

     <th><?php echo $_lang['sitestatus_title'] ?><br><small>[(site_status)]</small></th>

     <td>

-        <?php echo wrap_label($_lang['online'],  form_radio('site_status', 1));?><br />

-        <?php echo wrap_label($_lang['offline'], form_radio('site_status', 0));?>

+        <?php echo wrap_label($_lang['online'], form_radio('site_status', 1)); ?><br />

+        <?php echo wrap_label($_lang['offline'], form_radio('site_status', 0)); ?>

     </td>

   </tr>

   <tr>

@@ -58,12 +58,12 @@ 
       <br />

       <p><?php echo $_lang['update_settings_from_language']; ?></p>

       <select name="reload_site_unavailable" id="reload_site_unavailable_select" onchange="confirmLangChange(this, 'siteunavailable_message_default', 'site_unavailable_message_textarea');">

-<?php echo get_lang_options('siteunavailable_message_default');?>

+<?php echo get_lang_options('siteunavailable_message_default'); ?>

       </select>

     </th>

     <td> <textarea name="site_unavailable_message" id="site_unavailable_message_textarea" style="width:100%; height: 120px;"><?php echo $site_unavailable_message_view; ?></textarea>

-        <input type="hidden" name="siteunavailable_message_default" id="siteunavailable_message_default_hidden" value="<?php echo addslashes($_lang['siteunavailable_message_default']);?>" />

-	<div class="comment"><?php echo $_lang['siteunavailable_message'];?></div>

+        <input type="hidden" name="siteunavailable_message_default" id="siteunavailable_message_default_hidden" value="<?php echo addslashes($_lang['siteunavailable_message_default']); ?>" />

+	<div class="comment"><?php echo $_lang['siteunavailable_message']; ?></div>

     </td>

   </tr>

   <tr>

@@ -78,17 +78,17 @@ 
             'c.category, t.templatename ASC'

             );

     ?>

-      <select name="default_template" class="inputBox" onchange="documentDirty=true;wrap=document.getElementById('template_reset_options_wrapper');if(this.options[this.selectedIndex].value != '<?php echo $default_template;?>'){wrap.style.display='block';}else{wrap.style.display='none';}" style="width:150px">

+      <select name="default_template" class="inputBox" onchange="documentDirty=true;wrap=document.getElementById('template_reset_options_wrapper');if(this.options[this.selectedIndex].value != '<?php echo $default_template; ?>'){wrap.style.display='block';}else{wrap.style.display='none';}" style="width:150px">

         <?php

         

         $currentCategory = '';

                         while ($row = $modx->db->getRow($rs)) {

             $thisCategory = $row['category'];

-            if($thisCategory == null) {

+            if ($thisCategory == null) {

                 $thisCategory = $_lang['no_category'];

             }

-            if($thisCategory != $currentCategory) {

-                if($closeOptGroup) {

+            if ($thisCategory != $currentCategory) {

+                if ($closeOptGroup) {

                     echo "\t\t\t\t\t</optgroup>\n";

                 }

                 echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";

@@ -106,7 +106,7 @@ 
             echo "\t\t\t\t\t".'<option value="'.$row['id'].'"'.$selectedtext.'>'.$row['templatename']."</option>\n";

             $currentCategory = $thisCategory;

         }

-        if($thisCategory != '') {

+        if ($thisCategory != '') {

             echo "\t\t\t\t\t</optgroup>\n";

         }

 ?>

@@ -114,19 +114,19 @@ 
           <br />

         <div id="template_reset_options_wrapper" style="display:none;">

             <label><input type="radio" name="reset_template" value="1" /> <?php echo $_lang['template_reset_all']; ?></label><br />

-            <label><input type="radio" name="reset_template" value="2" /> <?php echo sprintf($_lang['template_reset_specific'],$oldTmpName); ?></label>

+            <label><input type="radio" name="reset_template" value="2" /> <?php echo sprintf($_lang['template_reset_specific'], $oldTmpName); ?></label>

         </div>

         <input type="hidden" name="old_template" value="<?php echo $oldTmpId; ?>" />

 	<div class="comment"><?php echo $_lang['defaulttemplate_message'] ?></div>

     </td>

   </tr>

   <tr>

-        <th><?php echo $_lang['defaulttemplate_logic_title'];?><br><small>[(auto_template_logic)]</small></th>

+        <th><?php echo $_lang['defaulttemplate_logic_title']; ?><br><small>[(auto_template_logic)]</small></th>

         <td>

-            <p><?php echo $_lang['defaulttemplate_logic_general_message'];?></p>

-            <label><input type="radio" name="auto_template_logic" value="system"<?php if($auto_template_logic == 'system') {echo " checked='checked'";}?>/> <?php echo $_lang['defaulttemplate_logic_system_message']; ?></label><br />

-            <label><input type="radio" name="auto_template_logic" value="parent"<?php if($auto_template_logic == 'parent') {echo " checked='checked'";}?>/> <?php echo $_lang['defaulttemplate_logic_parent_message']; ?></label><br />

-            <label><input type="radio" name="auto_template_logic" value="sibling"<?php if($auto_template_logic == 'sibling') {echo " checked='checked'";}?>/> <?php echo $_lang['defaulttemplate_logic_sibling_message']; ?></label><br />

+            <p><?php echo $_lang['defaulttemplate_logic_general_message']; ?></p>

+            <label><input type="radio" name="auto_template_logic" value="system"<?php if ($auto_template_logic == 'system') {echo " checked='checked'"; }?>/> <?php echo $_lang['defaulttemplate_logic_system_message']; ?></label><br />

+            <label><input type="radio" name="auto_template_logic" value="parent"<?php if ($auto_template_logic == 'parent') {echo " checked='checked'"; }?>/> <?php echo $_lang['defaulttemplate_logic_parent_message']; ?></label><br />

+            <label><input type="radio" name="auto_template_logic" value="sibling"<?php if ($auto_template_logic == 'sibling') {echo " checked='checked'"; }?>/> <?php echo $_lang['defaulttemplate_logic_sibling_message']; ?></label><br />

         </td>

     </tr>

     <tr>

@@ -138,22 +138,22 @@ 
               $modx->db->select('id', '[+prefix+]site_plugins', 

               "plugincode LIKE '%phx.parser.class.inc.php%OnParseDocument();%' AND disabled != 1")

             );

-            if($count) {

+            if ($count) {

                 $disabledFilters = 1;

                 echo '<b>'.$_lang['enable_filter_phx_warning'].'</b><br/>';

             }

             else $disabledFilters = false;

         ?>

-        <?php echo wrap_label($_lang['yes'],form_radio('enable_filter', 1, '', $disabledFilters));?><br />

-        <?php echo wrap_label($_lang['no'], form_radio('enable_filter', 0, '', $disabledFilters));?>

+        <?php echo wrap_label($_lang['yes'], form_radio('enable_filter', 1, '', $disabledFilters)); ?><br />

+        <?php echo wrap_label($_lang['no'], form_radio('enable_filter', 0, '', $disabledFilters)); ?>

         <div class="comment"><?php echo $_lang['enable_filter_message']; ?></div>

       </td>

     </tr>

     <tr>

       <th><?php echo $_lang['enable_at_syntax_title'] ?><br><small>[(enable_at_syntax)]</small></th>

       <td >

-        <?php echo wrap_label($_lang['yes'],form_radio('enable_at_syntax', 1));?><br />

-        <?php echo wrap_label($_lang['no'], form_radio('enable_at_syntax', 0));?>

+        <?php echo wrap_label($_lang['yes'], form_radio('enable_at_syntax', 1)); ?><br />

+        <?php echo wrap_label($_lang['no'], form_radio('enable_at_syntax', 0)); ?>

         <div class="comment">

             <?php echo $_lang['enable_at_syntax_message']; ?>

             <ul>

@@ -167,8 +167,8 @@ 
   <tr>

     <th><?php echo $_lang['defaultpublish_title'] ?><br><small>[(publish_default)]</small></th>

     <td>

-        <?php echo wrap_label($_lang['yes'],form_radio('publish_default', 1));?><br />

-        <?php echo wrap_label($_lang['no'],form_radio('publish_default', 0));?>

+        <?php echo wrap_label($_lang['yes'], form_radio('publish_default', 1)); ?><br />

+        <?php echo wrap_label($_lang['no'], form_radio('publish_default', 0)); ?>

         <div class="comment"><?php echo $_lang['defaultpublish_message'] ?></div>

     </td>

   </tr>

@@ -176,24 +176,24 @@ 
   <tr>

     <th><?php echo $_lang['defaultcache_title'] ?><br><small>[(cache_default)]</small></th>

     <td>

-        <?php echo wrap_label($_lang['yes'],form_radio('cache_default', 1));?><br />

-        <?php echo wrap_label($_lang['no'],form_radio('cache_default', 0));?>

+        <?php echo wrap_label($_lang['yes'], form_radio('cache_default', 1)); ?><br />

+        <?php echo wrap_label($_lang['no'], form_radio('cache_default', 0)); ?>

         <div class="comment"><?php echo $_lang['defaultcache_message'] ?></div>

     </td>

   </tr>

   <tr>

     <th><?php echo $_lang['defaultsearch_title'] ?><br><small>[(search_default)]</small></th>

     <td>

-        <?php echo wrap_label($_lang['yes'],form_radio('search_default', 1));?><br />

-        <?php echo wrap_label($_lang['no'],form_radio('search_default', 0));?>

+        <?php echo wrap_label($_lang['yes'], form_radio('search_default', 1)); ?><br />

+        <?php echo wrap_label($_lang['no'], form_radio('search_default', 0)); ?>

         <div class="comment"><?php echo $_lang['defaultsearch_message'] ?></div>

     </td>

   </tr>

   <tr>

     <th><?php echo $_lang['defaultmenuindex_title'] ?><br><small>[(auto_menuindex)]</small></th>

     <td>

-        <?php echo wrap_label($_lang['yes'],form_radio('auto_menuindex', 1));?><br />

-        <?php echo wrap_label($_lang['no'],form_radio('auto_menuindex', 0));?>

+        <?php echo wrap_label($_lang['yes'], form_radio('auto_menuindex', 1)); ?><br />

+        <?php echo wrap_label($_lang['no'], form_radio('auto_menuindex', 0)); ?>

         <div class="comment"><?php echo $_lang['defaultmenuindex_message'] ?></div>

     </td>

   </tr>

@@ -203,8 +203,8 @@ 
     <table border="0" cellspacing="0" cellpadding="0"><tr><td valign="top">

     <select name="lst_custom_contenttype" style="width:200px;height:100px;" size="5">

     <?php

-        $ct = explode(",",$custom_contenttype);

-        for($i=0;$i<count($ct);$i++) {

+        $ct = explode(",", $custom_contenttype);

+        for ($i = 0; $i < count($ct); $i++) {

             echo "<option value=\"".$ct[$i]."\">".$ct[$i]."</option>";

         }

     ?>

@@ -218,14 +218,14 @@ 
 <th><?php echo $_lang['docid_incrmnt_method_title'] ?><br><small>[(docid_incrmnt_method)]</small></th>

 <td>

 <label><input type="radio" name="docid_incrmnt_method" value="0"

-    <?php echo ($docid_incrmnt_method=='0') ? 'checked="checked"' : "" ; ?> />

+    <?php echo ($docid_incrmnt_method == '0') ? 'checked="checked"' : ""; ?> />

     <?php echo $_lang['docid_incrmnt_method_0']?></label><br />

     

 <label><input type="radio" name="docid_incrmnt_method" value="1"

-    <?php echo ($docid_incrmnt_method=='1') ? 'checked="checked"' : "" ; ?> />

+    <?php echo ($docid_incrmnt_method == '1') ? 'checked="checked"' : ""; ?> />

     <?php echo $_lang['docid_incrmnt_method_1']?></label><br />

 <label><input type="radio" name="docid_incrmnt_method" value="2"

-    <?php echo ($docid_incrmnt_method=='2') ? 'checked="checked"' : "" ; ?> />

+    <?php echo ($docid_incrmnt_method == '2') ? 'checked="checked"' : ""; ?> />

     <?php echo $_lang['docid_incrmnt_method_2']?></label><br />

 </td>

 </tr>

@@ -233,24 +233,24 @@ 
 <tr>

 <th><?php echo $_lang['enable_cache_title'] ?><br><small>[(enable_cache)]</small></th>

 <td>

-    <?php echo wrap_label($_lang['enabled'],form_radio('enable_cache', 1));?><br />

-    <?php echo wrap_label($_lang['disabled'], form_radio('enable_cache', 0));?><br />

-    <?php echo wrap_label($_lang['disabled_at_login'], form_radio('enable_cache', 2));?>

+    <?php echo wrap_label($_lang['enabled'], form_radio('enable_cache', 1)); ?><br />

+    <?php echo wrap_label($_lang['disabled'], form_radio('enable_cache', 0)); ?><br />

+    <?php echo wrap_label($_lang['disabled_at_login'], form_radio('enable_cache', 2)); ?>

 </td>

 </tr>

 

 <tr>

 <th><?php echo $_lang['cache_type_title'] ?><br><small>[(cache_type)]</small></th>

 <td>

-<?php echo wrap_label($_lang['cache_type_1'],form_radio('cache_type', 1));?><br />

-<?php echo wrap_label($_lang['cache_type_2'], form_radio('cache_type', 2));?>

+<?php echo wrap_label($_lang['cache_type_1'], form_radio('cache_type', 1)); ?><br />

+<?php echo wrap_label($_lang['cache_type_2'], form_radio('cache_type', 2)); ?>

 </td>

 </tr>

   <tr>

 <th><?php echo $_lang['minifyphp_incache_title'] ?><br><small>[(minifyphp_incache)]</small></th>

     <td>

-<?php echo wrap_label($_lang['enabled'],form_radio('minifyphp_incache', 1));?><br />

-<?php echo wrap_label($_lang['disabled'], form_radio('minifyphp_incache', 0));?>

+<?php echo wrap_label($_lang['enabled'], form_radio('minifyphp_incache', 1)); ?><br />

+<?php echo wrap_label($_lang['disabled'], form_radio('minifyphp_incache', 0)); ?>

 <div class="comment"><?php echo $_lang['minifyphp_incache_message'] ?></div>

     </td>

   </tr>

@@ -259,23 +259,23 @@ 
       <th><?php echo $_lang['serveroffset_title'] ?><br><small>[(server_offset_time)]</small></th>

       <td> <select name="server_offset_time" size="1" class="inputBox">

           <?php

-      for($i=-24; $i<25; $i++) {

-          $seconds = $i*60*60;

-          $selectedtext = $seconds==$server_offset_time ? "selected='selected'" : "" ;

+      for ($i = -24; $i < 25; $i++) {

+          $seconds = $i * 60 * 60;

+          $selectedtext = $seconds == $server_offset_time ? "selected='selected'" : "";

       ?>

           <option value="<?php echo $seconds; ?>" <?php echo $selectedtext; ?>><?php echo $i; ?></option>

           <?php

       }

       ?>

         </select>

-      	<div class="comment"><?php printf($_lang['serveroffset_message'], strftime('%H:%M:%S', time()), strftime('%H:%M:%S', time()+$server_offset_time)); ?></div>

+      	<div class="comment"><?php printf($_lang['serveroffset_message'], strftime('%H:%M:%S', time()), strftime('%H:%M:%S', time() + $server_offset_time)); ?></div>

       	</td>

     </tr>

     <tr>

       <th><?php echo $_lang['server_protocol_title'] ?><br><small>[(server_protocol)]</small></th>

       <td>

-        <?php echo wrap_label($_lang['server_protocol_http'],form_radio('server_protocol', 'http'));?><br />

-        <?php echo wrap_label($_lang['server_protocol_https'], form_radio('server_protocol', 'https'));?>

+        <?php echo wrap_label($_lang['server_protocol_http'], form_radio('server_protocol', 'http')); ?><br />

+        <?php echo wrap_label($_lang['server_protocol_https'], form_radio('server_protocol', 'https')); ?>

         <div class="comment"><?php echo $_lang['server_protocol_message'] ?></div>

       </td>

     </tr>

@@ -288,8 +288,8 @@ 
     <tr>

      <th><?php echo $_lang['track_visitors_title'] ?><br><small>[(track_visitors)]</small></th>

      <td>

-         <?php echo wrap_label($_lang['yes'],form_radio('track_visitors', 1));?><br />

-         <?php echo wrap_label($_lang['no'],form_radio('track_visitors', 0));?>

+         <?php echo wrap_label($_lang['yes'], form_radio('track_visitors', 1)); ?><br />

+         <?php echo wrap_label($_lang['no'], form_radio('track_visitors', 0)); ?>

          <div class="comment"><?php echo $_lang['track_visitors_message'] ?></div>

      </td>

    </tr>

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

             // invoke OnSiteSettingsRender event

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

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

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

         ?>

     </td>

   </tr>

manager/processors/save_content.processor.php

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);

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.");
 }
 ?>