evolution-cms / evolution

manager/actions/mutate_settings/tab2_furl_settings.inc.php

Spacing +47 added lines, -47 removed lines

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

 <td nowrap class="warning" valign="top"><?php echo $_lang['friendlyurls_title'] ?><br><small>[(friendly_urls)]</small></td>

 <td>

-    <?php echo wrap_label($_lang['yes'],form_radio('friendly_urls', 1, 'id="furlRowOn"'));?><br />

-    <?php echo wrap_label($_lang['no'], form_radio('friendly_urls', 0, 'id="furlRowOff"'));?>

+    <?php echo wrap_label($_lang['yes'], form_radio('friendly_urls', 1, 'id="furlRowOn"')); ?><br />

+    <?php echo wrap_label($_lang['no'], form_radio('friendly_urls', 0, 'id="furlRowOff"')); ?>

 </td>

 </tr>

 <tr>

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

     <td nowrap class="warning"><?php echo $_lang['xhtml_urls_title'] ?><br><small>[(xhtml_urls)]</small></td>

     <td>

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

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

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

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

     </td>

 </tr>

 <tr>

@@ -31,135 +31,135 @@ 
 <tr>

 <td colspan="2"><div class="split"></div></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td nowrap class="warning" valign="top"><?php echo $_lang['friendlyurlsprefix_title'] ?><br><small>[(friendly_url_prefix)]</small></td>

 <td><input onchange="documentDirty=true;" type="text" maxlength="50" style="width: 200px;" name="friendly_url_prefix" value="<?php echo $friendly_url_prefix; ?>" /></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td width="200">&nbsp;</td>

 <td class="comment"><?php echo $_lang['friendlyurlsprefix_message'] ?></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td colspan="2"><div class="split"></div></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td nowrap class="warning" valign="top"><?php echo $_lang['friendlyurlsuffix_title'] ?><br><small>[(friendly_url_suffix)]</small></td>

 <td><input onchange="documentDirty=true;" type="text" maxlength="50" style="width: 200px;" name="friendly_url_suffix" value="<?php echo $friendly_url_suffix; ?>" /></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td width="200">&nbsp;</td>

 <td class="comment"><?php echo $_lang['friendlyurlsuffix_message'] ?></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td colspan="2"><div class="split"></div></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

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

 <td>

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

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

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

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

 </td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

         <td width="200">&nbsp;</td>

         <td class="comment"><?php echo $_lang['make_folders_message'] ?></td>

       </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td colspan="2"><div class="split"></div></td>

 </tr>

   

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

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

 <td>

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

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

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

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

  </td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

         <td width="200">&nbsp;</td>

         <td class="comment"><?php echo $_lang['seostrict_message'] ?></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td colspan="2"><div class="split"></div></td>

 </tr>

 

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

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

   <td>

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

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

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

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

   </td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

   <td width="200">&nbsp;</td>

   <td class="comment"><?php echo $_lang['aliaslistingfolder_message'] ?></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

   <td colspan="2"><div class="split"></div></td>

 </tr>

 

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td nowrap class="warning" valign="top"><?php echo $_lang['friendly_alias_title'] ?><br><small>[(friendly_alias_urls)]</small></td>

 <td>

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

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

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

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

 </td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td width="200">&nbsp;</td>

 <td class="comment"><?php echo $_lang['friendly_alias_message'] ?></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td colspan="2"><div class="split"></div></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td nowrap class="warning" valign="top"><?php echo $_lang['use_alias_path_title'] ?><br><small>[(use_alias_path)]</small></td>

 <td>

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

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

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

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

 </td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td width="200">&nbsp;</td>

 <td class="comment"><?php echo $_lang['use_alias_path_message'] ?></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td colspan="2"><div class="split"></div></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td nowrap class="warning" valign="top"><?php echo $_lang['duplicate_alias_title'] ?><br><small>[(allow_duplicate_alias)]</small></td>

 <td>

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

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

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

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

 </td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td width="200">&nbsp;</td>

 <td class="comment"><?php echo $_lang['duplicate_alias_message'] ?></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td colspan="2"><div class="split"></div></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td nowrap class="warning" valign="top"><?php echo $_lang['automatic_alias_title'] ?><br><small>[(automatic_alias)]</small></td>

 <td>

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

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

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

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

 </td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td width="200">&nbsp;</td>

 <td class="comment"><?php echo $_lang['automatic_alias_message'] ?></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td colspan="2"><div class="split"></div></td>

 </tr>

-<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>>

+<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>>

 <td colspan="2">

     <?php

         // invoke OnFriendlyURLSettingsRender event

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

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

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

     ?>

 </td>

 </tr>

manager/processors/user_documents_permissions.class.php

Spacing +11 added lines, -11 removed lines

@@ -7,7 +7,7 @@ 
 	var $role;
 	var $duplicateDoc = false;
 	
-	function checkPermissions() {
+	function checkPermissions(){
 		
 		global $udperms_allowroot;
 		global $modx;
@@ -19,23 +19,23 @@ 
 		$document = $this->document;
 		$role = $this->role;
 
-		if($role==1) {
-			return true;  // administrator - grant all document permissions
+		if ($role == 1) {
+			return true; // administrator - grant all document permissions
 		}
 		
-		if($modx->config['use_udperms']==0 || $modx->config['use_udperms']=="" || !isset($modx->config['use_udperms'])) {
+		if ($modx->config['use_udperms'] == 0 || $modx->config['use_udperms'] == "" || !isset($modx->config['use_udperms'])) {
 			return true; // permissions aren't in use
 		}
 		
 		$parent = $modx->db->getValue($modx->db->select('parent', $tblsc, "id='{$this->document}'"));
-		if($document == 0 && $parent == NULL && $udperms_allowroot == 1) return true; // User is allowed to create new document in root
-		if (($this->duplicateDoc==true || $document==0) && $parent==0 && $udperms_allowroot==0) {
+		if ($document == 0 && $parent == NULL && $udperms_allowroot == 1) return true; // User is allowed to create new document in root
+		if (($this->duplicateDoc == true || $document == 0) && $parent == 0 && $udperms_allowroot == 0) {
 			return false; // deny duplicate || create new document at root if Allow Root is No
 		}
 		
 		// get document groups for current user
-		if($_SESSION['mgrDocgroups']) {
-			$docgrp = implode(" || dg.document_group = ",$_SESSION['mgrDocgroups']);
+		if ($_SESSION['mgrDocgroups']) {
+			$docgrp = implode(" || dg.document_group = ", $_SESSION['mgrDocgroups']);
 		}
 
 		/* Note:
@@ -46,17 +46,17 @@ 
 			are private to the manager users will not be private to web users if the 
 			document group is not assigned to a web user group and visa versa.
 		 */
-		$permissionsok = false;  // set permissions to false
+		$permissionsok = false; // set permissions to false
 		
 		$rs = $modx->db->select(
 			'count(DISTINCT sc.id)',
 			"{$tblsc} AS sc 
 				LEFT JOIN {$tbldg} AS dg on dg.document = sc.id 
 				LEFT JOIN {$tbldgn} dgn ON dgn.id = dg.document_group",
-			"sc.id='{$this->document}' AND (". ( (!$docgrp) ? null : "dg.document_group = ".$docgrp." ||" ) . " sc.privatemgr = 0)"
+			"sc.id='{$this->document}' AND (".((!$docgrp) ? null : "dg.document_group = ".$docgrp." ||")." sc.privatemgr = 0)"
 			);
 		$limit = $modx->db->getValue($rs);
-		if($limit==1) $permissionsok = true;
+		if ($limit == 1) $permissionsok = true;
 		
 		return $permissionsok;
 	}

manager/processors/cache_sync.class.processor.php

Spacing +29 added lines, -29 removed lines

@@ -61,7 +61,7 @@ 
         if (isset($this->aliases[$id])) {
             if ($this->aliasVisible[$id] == 1) {
                 if ($path != '') {
-                    $path = $this->aliases[$id] . '/' . $path;
+                    $path = $this->aliases[$id].'/'.$path;
                 } else {
                     $path = $this->aliases[$id];
                 }
@@ -80,7 +80,7 @@ 
             $modx->messageQuit("Cache path not set.");
         }
 
-        $files = glob(realpath($this->cachePath) . '/*.pageCache.php');
+        $files = glob(realpath($this->cachePath).'/*.pageCache.php');
         $filesincache = count($files);
         $deletedfiles = array();
         while ($file = array_shift($files)) {
@@ -93,7 +93,7 @@ 
             }
         }
 
-        if(function_exists('opcache_get_status')) {
+        if (function_exists('opcache_get_status')) {
             $opcache = opcache_get_status();
             if (!empty($opcache['opcache_enabled'])) {
                 opcache_reset();
@@ -113,9 +113,9 @@ 
                 if (isset($opcache)) {
                     echo '<p>Opcache empty.</p>';
                 }
-                echo '<p>' . $_lang['cache_files_deleted'] . '</p><ul>';
+                echo '<p>'.$_lang['cache_files_deleted'].'</p><ul>';
                 foreach ($deletedfiles as $deletedfile) {
-                    echo '<li>' . $deletedfile . '</li>';
+                    echo '<li>'.$deletedfile.'</li>';
                 }
                 echo '</ul>';
             }
@@ -131,11 +131,11 @@ 
 
 
         // write the file
-        $content = '<?php' . "\n";
-        $content .= '$recent_update=\'' . $this->request_time . '\';' . "\n";
-        $content .= '$cacheRefreshTime=\'' . $cacheRefreshTime . '\';' . "\n";
+        $content = '<?php'."\n";
+        $content .= '$recent_update=\''.$this->request_time.'\';'."\n";
+        $content .= '$cacheRefreshTime=\''.$cacheRefreshTime.'\';'."\n";
 
-        $filename = $this->cachePath . '/sitePublishing.idx.php';
+        $filename = $this->cachePath.'/sitePublishing.idx.php';
         if (!$handle = fopen($filename, 'w')) {
             exit("Cannot open file ({$filename}");
         }
@@ -155,7 +155,7 @@ 
         // update publish time file
         $timesArr = array();
 
-        $result = $modx->db->select('MIN(pub_date) AS minpub', '[+prefix+]site_content', 'pub_date>' . $this->request_time);
+        $result = $modx->db->select('MIN(pub_date) AS minpub', '[+prefix+]site_content', 'pub_date>'.$this->request_time);
         if (!$result) {
             echo "Couldn't determine next publish event!";
         }
@@ -165,7 +165,7 @@ 
             $timesArr[] = $minpub;
         }
 
-        $result = $modx->db->select('MIN(unpub_date) AS minunpub', '[+prefix+]site_content', 'unpub_date>' . $this->request_time);
+        $result = $modx->db->select('MIN(unpub_date) AS minunpub', '[+prefix+]site_content', 'unpub_date>'.$this->request_time);
         if (!$result) {
             echo "Couldn't determine next unpublish event!";
         }
@@ -203,7 +203,7 @@ 
         $config = array();
         $content .= '$c=&$this->config;';
         while (list($key, $value) = $modx->db->getRow($rs, 'num')) {
-            $content .= '$c[\'' . $key . '\']="' . $this->escapeDoubleQuotes($value) . '";';
+            $content .= '$c[\''.$key.'\']="'.$this->escapeDoubleQuotes($value).'";';
             $config[$key] = $value;
         }
 
@@ -241,23 +241,23 @@ 
             $docid = $doc['id'];
             if ($use_alias_path) {
                 $tmpPath = $this->getParents($doc['parent']);
-                $alias = (strlen($tmpPath) > 0 ? "$tmpPath/" : '') . $doc['alias'];
+                $alias = (strlen($tmpPath) > 0 ? "$tmpPath/" : '').$doc['alias'];
                 $key = $alias;
             } else {
                 $key = $doc['alias'];
             }
 
             $doc['path'] = $tmpPath;
-            $content .= '$a[' . $docid . ']=array(\'id\'=>' . $docid . ',\'alias\'=>\'' . $doc['alias'] . '\',\'path\'=>\'' . $doc['path'] . '\',\'parent\'=>' . $doc['parent'] . ',\'isfolder\'=>' . $doc['isfolder'] . ',\'alias_visible\'=>' . $doc['alias_visible'] . ');';
-            $content .= '$d[\'' . $key . '\']=' . $docid . ';';
-            $content .= '$m[]=array(' . $doc['parent'] . '=>' . $docid . ');';
+            $content .= '$a['.$docid.']=array(\'id\'=>'.$docid.',\'alias\'=>\''.$doc['alias'].'\',\'path\'=>\''.$doc['path'].'\',\'parent\'=>'.$doc['parent'].',\'isfolder\'=>'.$doc['isfolder'].',\'alias_visible\'=>'.$doc['alias_visible'].');';
+            $content .= '$d[\''.$key.'\']='.$docid.';';
+            $content .= '$m[]=array('.$doc['parent'].'=>'.$docid.');';
         }
 
         // get content types
         $rs = $modx->db->select('id, contentType', '[+prefix+]site_content', "contentType!='text/html'");
         $content .= '$c=&$this->contentTypes;';
         while ($doc = $modx->db->getRow($rs)) {
-            $content .= '$c[\'' . $doc['id'] . '\']=\'' . $doc['contentType'] . '\';';
+            $content .= '$c[\''.$doc['id'].'\']=\''.$doc['contentType'].'\';';
         }
 
         // WRITE Chunks to cache file
@@ -267,7 +267,7 @@ 
             if ($modx->config['minifyphp_incache']) {
                 $doc['snippet'] = $this->php_strip_whitespace($doc['snippet']);
             }
-            $content .= '$c[\'' . $doc['name'] . '\']=\'' . ($doc['disabled'] ? '' : $this->escapeSingleQuotes($doc['snippet'])) . '\';';
+            $content .= '$c[\''.$doc['name'].'\']=\''.($doc['disabled'] ? '' : $this->escapeSingleQuotes($doc['snippet'])).'\';';
         }
 
         // WRITE snippets to cache file
@@ -278,18 +278,18 @@ 
         while ($row = $modx->db->getRow($rs)) {
             $key = $row['name'];
             if ($row['disabled']) {
-                $content .= '$s[\'' . $key . '\']=\'return false;\';';
+                $content .= '$s[\''.$key.'\']=\'return false;\';';
             } else {
                 $value = trim($row['snippet']);
                 if ($modx->config['minifyphp_incache']) {
                     $value = $this->php_strip_whitespace($value);
                 }
-                $content .= '$s[\'' . $key . '\']=\'' . $this->escapeSingleQuotes($value) . '\';';
+                $content .= '$s[\''.$key.'\']=\''.$this->escapeSingleQuotes($value).'\';';
                 $properties = $modx->parseProperties($row['properties']);
                 $sharedproperties = $modx->parseProperties($row['sharedproperties']);
                 $properties = array_merge($sharedproperties, $properties);
                 if (0 < count($properties)) {
-                    $content .= '$s[\'' . $key . 'Props\']=\'' . $this->escapeSingleQuotes(json_encode($properties)) . '\';';
+                    $content .= '$s[\''.$key.'Props\']=\''.$this->escapeSingleQuotes(json_encode($properties)).'\';';
                 }
             }
         }
@@ -307,13 +307,13 @@ 
             if ($modx->config['minifyphp_incache']) {
                 $value = $this->php_strip_whitespace($value);
             }
-            $content .= '$p[\'' . $key . '\']=\'' . $this->escapeSingleQuotes($value) . '\';';
+            $content .= '$p[\''.$key.'\']=\''.$this->escapeSingleQuotes($value).'\';';
             if ($row['properties'] != '' || $row['sharedproperties'] != '') {
                 $properties = $modx->parseProperties($row['properties']);
                 $sharedproperties = $modx->parseProperties($row['sharedproperties']);
                 $properties = array_merge($sharedproperties, $properties);
                 if (0 < count($properties)) {
-                    $content .= '$p[\'' . $key . 'Props\']=\'' . $this->escapeSingleQuotes(json_encode($properties)) . '\';';
+                    $content .= '$p[\''.$key.'Props\']=\''.$this->escapeSingleQuotes(json_encode($properties)).'\';';
                 }
             }
         }
@@ -336,13 +336,13 @@ 
         }
         foreach ($events as $evtname => $pluginnames) {
             $events[$evtname] = $pluginnames;
-            $content .= '$e[\'' . $evtname . '\']=array(\'' . implode('\',\'', $this->escapeSingleQuotes($pluginnames)) . '\');';
+            $content .= '$e[\''.$evtname.'\']=array(\''.implode('\',\'', $this->escapeSingleQuotes($pluginnames)).'\');';
         }
 
         $content .= "\n";
 
         // close and write the file
-        $filename = $this->cachePath . 'siteCache.idx.php';
+        $filename = $this->cachePath.'siteCache.idx.php';
 
         // invoke OnBeforeCacheUpdate event
         if ($modx) {
@@ -353,8 +353,8 @@ 
             exit("Cannot write main MODX cache file! Make sure the assets/cache directory is writable!");
         }
 
-        if (!is_file($this->cachePath . '/.htaccess')) {
-            file_put_contents($this->cachePath . '/.htaccess', "order deny,allow\ndeny from all\n");
+        if (!is_file($this->cachePath.'/.htaccess')) {
+            file_put_contents($this->cachePath.'/.htaccess', "order deny,allow\ndeny from all\n");
         }
 
         // invoke OnCacheUpdate event
@@ -371,7 +371,7 @@ 
 
         $source = trim($source);
         if (substr($source, 0, 5) !== '<?php') {
-            $source = '<?php ' . $source;
+            $source = '<?php '.$source;
         }
 
         $tokens = token_get_all($source);
@@ -427,7 +427,7 @@ 
                     $_ .= $text;
             }
         }
-        $source = preg_replace(array('@^<\?php@i', '|\s+|', '|<!--|', '|-->|', '|-->\s+<!--|'), array('', ' ', "\n" . '<!--', '-->' . "\n", '-->' . "\n" . '<!--'), $_);
+        $source = preg_replace(array('@^<\?php@i', '|\s+|', '|<!--|', '|-->|', '|-->\s+<!--|'), array('', ' ', "\n".'<!--', '-->'."\n", '-->'."\n".'<!--'), $_);
         $source = trim($source);
         return $source;
     }

manager/processors/remove_installer.processor.php

Spacing +10 added lines, -10 removed lines

@@ -12,25 +12,25 @@
  *
  */
 
-$msg ='';
+$msg = '';
 $pth = dirname(dirname(dirname(__FILE__)))."/install/";
-$pth = str_replace("\\","/",$pth);
-if(isset($_GET["rminstall"])) {
-	if(is_dir($pth)) {
-		if(!rmdirRecursive($pth)) $msg="An error occured while attempting to remove the install folder";
+$pth = str_replace("\\", "/", $pth);
+if (isset($_GET["rminstall"])) {
+	if (is_dir($pth)) {
+		if (!rmdirRecursive($pth)) $msg = "An error occured while attempting to remove the install folder";
 	}
 }
-if($msg) echo "<script>alert('".addslashes($msg)."');</script>";
+if ($msg) echo "<script>alert('".addslashes($msg)."');</script>";
 echo "<script>window.location='../index.php?a=2';</script>";
 
 // rmdirRecursive - detects symbollic links on unix
-function rmdirRecursive($path,$followLinks=false) {   
-   $dir = opendir($path) ;
+function rmdirRecursive($path, $followLinks = false){   
+   $dir = opendir($path);
    while ($entry = readdir($dir)) {       
 	   if (is_file("$path/$entry") || ((!$followLinks) && is_link("$path/$entry"))) {
-		   @unlink( "$path/$entry" );
+		   @unlink("$path/$entry");
 	   }
-	   elseif (is_dir("$path/$entry") && $entry!='.' && $entry!='..') {
+	   elseif (is_dir("$path/$entry") && $entry != '.' && $entry != '..') {
 		   rmdirRecursive("$path/$entry"); // recursive
 	   }
    }

manager/processors/login.processor.php

Spacing +60 added lines, -60 removed lines

@@ -1,23 +1,23 @@ 
 <?php
-if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
 	header('HTTP/1.0 404 Not Found');
 	exit('error');
 }
-define('IN_MANAGER_MODE', true);  // we use this to make sure files are accessed through
+define('IN_MANAGER_MODE', true); // we use this to make sure files are accessed through
 define('MODX_API_MODE', true);
-include_once(__DIR__ . '/../../index.php');
+include_once(__DIR__.'/../../index.php');
 $modx->db->connect();
 $modx->getSettings();
 $modx->invokeEvent('OnManagerPageInit');
 $modx->loadExtension('ManagerAPI');
 $modx->loadExtension('phpass');
 
-$core_path = MODX_MANAGER_PATH . 'includes/';
+$core_path = MODX_MANAGER_PATH.'includes/';
 // include_once the language file
 $_lang = array();
 include_once("{$core_path}lang/english.inc.php");
 
-if($manager_language !== 'english' && is_file("{$core_path}lang/{$manager_language}.inc.php")) {
+if ($manager_language !== 'english' && is_file("{$core_path}lang/{$manager_language}.inc.php")) {
 	include_once("{$core_path}lang/{$manager_language}.inc.php");
 }
 
@@ -25,7 +25,7 @@ 
 include_once("{$core_path}log.class.inc.php");
 
 // Initialize System Alert Message Queque
-if(!isset($_SESSION['SystemAlertMsgQueque'])) {
+if (!isset($_SESSION['SystemAlertMsgQueque'])) {
 	$_SESSION['SystemAlertMsgQueque'] = array();
 }
 $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
@@ -51,7 +51,7 @@ 
 $rs = $modx->db->select($fields, $from, $where);
 $limit = $modx->db->getRecordCount($rs);
 
-if($limit == 0 || $limit > 1) {
+if ($limit == 0 || $limit > 1) {
 	jsAlert($_lang['login_processor_unknown_user']);
 	return;
 }
@@ -73,32 +73,32 @@ 
 
 // get the user settings from the database
 $rs = $modx->db->select('setting_name, setting_value', '[+prefix+]user_settings', "user='{$internalKey}' AND setting_value!=''");
-while($row = $modx->db->getRow($rs)) {
+while ($row = $modx->db->getRow($rs)) {
 	extract($row);
 	${$setting_name} = $setting_value;
 }
 
 // blocked due to number of login errors.
-if($failedlogins >= $failed_allowed && $blockeduntildate > time()) {
+if ($failedlogins >= $failed_allowed && $blockeduntildate > time()) {
 	@session_destroy();
 	session_unset();
-	if($cip = getenv("HTTP_CLIENT_IP")) {
+	if ($cip = getenv("HTTP_CLIENT_IP")) {
 		$ip = $cip;
-	} elseif($cip = getenv("HTTP_X_FORWARDED_FOR")) {
+	} elseif ($cip = getenv("HTTP_X_FORWARDED_FOR")) {
 		$ip = $cip;
-	} elseif($cip = getenv("REMOTE_ADDR")) {
+	} elseif ($cip = getenv("REMOTE_ADDR")) {
 		$ip = $cip;
 	} else {
 		$ip = "UNKNOWN";
 	}
 	$log = new logHandler;
-	$log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: " . $ip);
+	$log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: ".$ip);
 	jsAlert($_lang['login_processor_many_failed_logins']);
 	return;
 }
 
 // blocked due to number of login errors, but get to try again
-if($failedlogins >= $failed_allowed && $blockeduntildate < time()) {
+if ($failedlogins >= $failed_allowed && $blockeduntildate < time()) {
 	$fields = array();
 	$fields['failedlogincount'] = '0';
 	$fields['blockeduntil'] = time() - 1;
@@ -106,7 +106,7 @@ 
 }
 
 // this user has been blocked by an admin, so no way he's loggin in!
-if($blocked == '1') {
+if ($blocked == '1') {
 	@session_destroy();
 	session_unset();
 	jsAlert($_lang['login_processor_blocked1']);
@@ -114,7 +114,7 @@ 
 }
 
 // blockuntil: this user has a block until date
-if($blockeduntildate > time()) {
+if ($blockeduntildate > time()) {
 	@session_destroy();
 	session_unset();
 	jsAlert($_lang['login_processor_blocked2']);
@@ -122,7 +122,7 @@ 
 }
 
 // blockafter: this user has a block after date
-if($blockedafterdate > 0 && $blockedafterdate < time()) {
+if ($blockedafterdate > 0 && $blockedafterdate < time()) {
 	@session_destroy();
 	session_unset();
 	jsAlert($_lang['login_processor_blocked3']);
@@ -130,24 +130,24 @@ 
 }
 
 // allowed ip
-if($allowed_ip) {
-	if(($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) {
-		if(gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) {
+if ($allowed_ip) {
+	if (($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) {
+		if (gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) {
 			jsAlert($_lang['login_processor_remotehost_ip']);
 			return;
 		}
 	}
-	if(!in_array($_SERVER['REMOTE_ADDR'], array_filter(array_map('trim', explode(',', $allowed_ip))))) {
+	if (!in_array($_SERVER['REMOTE_ADDR'], array_filter(array_map('trim', explode(',', $allowed_ip))))) {
 		jsAlert($_lang['login_processor_remote_ip']);
 		return;
 	}
 }
 
 // allowed days
-if($allowed_days) {
+if ($allowed_days) {
 	$date = getdate();
 	$day = $date['wday'] + 1;
-	if(strpos($allowed_days, $day) === false) {
+	if (strpos($allowed_days, $day) === false) {
 		jsAlert($_lang['login_processor_date']);
 		return;
 	}
@@ -164,33 +164,33 @@ 
 
 // check if plugin authenticated the user
 $matchPassword = false;
-if(!isset($rt) || !$rt || (is_array($rt) && !in_array(true, $rt))) {
+if (!isset($rt) || !$rt || (is_array($rt) && !in_array(true, $rt))) {
 	// check user password - local authentication
 	$hashType = $modx->manager->getHashType($dbasePassword);
-	if($hashType == 'phpass') {
+	if ($hashType == 'phpass') {
 		$matchPassword = login($username, $_REQUEST['password'], $dbasePassword);
-	} elseif($hashType == 'md5') {
+	} elseif ($hashType == 'md5') {
 		$matchPassword = loginMD5($internalKey, $_REQUEST['password'], $dbasePassword, $username);
-	} elseif($hashType == 'v1') {
+	} elseif ($hashType == 'v1') {
 		$matchPassword = loginV1($internalKey, $_REQUEST['password'], $dbasePassword, $username);
 	} else {
 		$matchPassword = false;
 	}
-} else if($rt === true || (is_array($rt) && in_array(true, $rt))) {
+} else if ($rt === true || (is_array($rt) && in_array(true, $rt))) {
 	$matchPassword = true;
 }
 
-if(!$matchPassword) {
+if (!$matchPassword) {
 	jsAlert($_lang['login_processor_wrong_password']);
 	incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
 	return;
 }
 
-if($modx->config['use_captcha'] == 1) {
-	if(!isset ($_SESSION['veriword'])) {
+if ($modx->config['use_captcha'] == 1) {
+	if (!isset ($_SESSION['veriword'])) {
 		jsAlert($_lang['login_processor_captcha_config']);
 		return;
-	} elseif($_SESSION['veriword'] != $captcha_code) {
+	} elseif ($_SESSION['veriword'] != $captcha_code) {
 		jsAlert($_lang['login_processor_bad_code']);
 		incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
 		return;
@@ -218,17 +218,17 @@ 
 $_SESSION['mgrPermissions'] = $modx->db->getRow($rs);
 
 // successful login so reset fail count and update key values
-$modx->db->update('failedlogincount=0, ' . 'logincount=logincount+1, ' . 'lastlogin=thislogin, ' . 'thislogin=' . time() . ', ' . "sessionid='{$currentsessionid}'", '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
+$modx->db->update('failedlogincount=0, '.'logincount=logincount+1, '.'lastlogin=thislogin, '.'thislogin='.time().', '."sessionid='{$currentsessionid}'", '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
 
 // get user's document groups
 $i = 0;
-$rs = $modx->db->select('uga.documentgroup', $modx->getFullTableName('member_groups') . ' ug
-		INNER JOIN ' . $modx->getFullTableName('membergroup_access') . ' uga ON uga.membergroup=ug.user_group', "ug.member='{$internalKey}'");
+$rs = $modx->db->select('uga.documentgroup', $modx->getFullTableName('member_groups').' ug
+		INNER JOIN ' . $modx->getFullTableName('membergroup_access').' uga ON uga.membergroup=ug.user_group', "ug.member='{$internalKey}'");
 $_SESSION['mgrDocgroups'] = $modx->db->getColumn('documentgroup', $rs);
 
 $_SESSION['mgrToken'] = md5($currentsessionid);
 
-if($rememberme == '1') {
+if ($rememberme == '1') {
 	$_SESSION['modx.mgr.session.cookie.lifetime'] = intval($modx->config['session.cookie.lifetime']);
 
 	// Set a cookie separate from the session cookie with the username in it. 
@@ -236,7 +236,7 @@ 
 	global $https_port;
 
 	$secure = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port);
-	if(version_compare(PHP_VERSION, '5.2', '<')) {
+	if (version_compare(PHP_VERSION, '5.2', '<')) {
 		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, '; HttpOnly', $secure);
 	} else {
 		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, NULL, $secure, true);
@@ -251,9 +251,9 @@ 
 // Check if user already has an active session, if not check if user pressed logout end of last session
 $rs = $modx->db->select('lasthit', $modx->getFullTableName('active_user_sessions'), "internalKey='{$internalKey}'");
 $activeSession = $modx->db->getValue($rs);
-if(!$activeSession) {
+if (!$activeSession) {
 	$rs = $modx->db->select('lasthit', $modx->getFullTableName('active_users'), "internalKey='{$internalKey}' AND action != 8");
-	if($lastHit = $modx->db->getValue($rs)) {
+	if ($lastHit = $modx->db->getValue($rs)) {
 		$_SESSION['show_logout_reminder'] = array(
 			'type' => 'logout_reminder',
 			'lastHit' => $lastHit
@@ -275,16 +275,16 @@ 
 // check if we should redirect user to a web page
 $rs = $modx->db->select('setting_value', '[+prefix+]user_settings', "user='{$internalKey}' AND setting_name='manager_login_startup'");
 $id = intval($modx->db->getValue($rs));
-if($id > 0) {
-	$header = 'Location: ' . $modx->makeUrl($id, '', '', 'full');
-	if($_POST['ajax'] == 1) {
+if ($id > 0) {
+	$header = 'Location: '.$modx->makeUrl($id, '', '', 'full');
+	if ($_POST['ajax'] == 1) {
 		echo $header;
 	} else {
 		header($header);
 	}
 } else {
-	$header = 'Location: ' . MODX_MANAGER_URL;
-	if($_POST['ajax'] == 1) {
+	$header = 'Location: '.MODX_MANAGER_URL;
+	if ($_POST['ajax'] == 1) {
 		echo $header;
 	} else {
 		header($header);
@@ -292,35 +292,35 @@ 
 }
 
 // show javascript alert
-function jsAlert($msg) {
+function jsAlert($msg){
 	global $modx;
-	if($_POST['ajax'] != 1) {
-		echo "<script>window.setTimeout(\"alert('" . addslashes($modx->db->escape($msg)) . "')\",10);history.go(-1)</script>";
+	if ($_POST['ajax'] != 1) {
+		echo "<script>window.setTimeout(\"alert('".addslashes($modx->db->escape($msg))."')\",10);history.go(-1)</script>";
 	} else {
-		echo $msg . "\n";
+		echo $msg."\n";
 	}
 }
 
-function login($username, $givenPassword, $dbasePassword) {
+function login($username, $givenPassword, $dbasePassword){
 	global $modx;
 	return $modx->phpass->CheckPassword($givenPassword, $dbasePassword);
 }
 
-function loginV1($internalKey, $givenPassword, $dbasePassword, $username) {
+function loginV1($internalKey, $givenPassword, $dbasePassword, $username){
 	global $modx;
 
 	$user_algo = $modx->manager->getV1UserHashAlgorithm($internalKey);
 
-	if(!isset($modx->config['pwd_hash_algo']) || empty($modx->config['pwd_hash_algo'])) {
+	if (!isset($modx->config['pwd_hash_algo']) || empty($modx->config['pwd_hash_algo'])) {
 		$modx->config['pwd_hash_algo'] = 'UNCRYPT';
 	}
 
-	if($user_algo !== $modx->config['pwd_hash_algo']) {
+	if ($user_algo !== $modx->config['pwd_hash_algo']) {
 		$bk_pwd_hash_algo = $modx->config['pwd_hash_algo'];
 		$modx->config['pwd_hash_algo'] = $user_algo;
 	}
 
-	if($dbasePassword != $modx->manager->genV1Hash($givenPassword, $internalKey)) {
+	if ($dbasePassword != $modx->manager->genV1Hash($givenPassword, $internalKey)) {
 		return false;
 	}
 
@@ -329,17 +329,17 @@ 
 	return true;
 }
 
-function loginMD5($internalKey, $givenPassword, $dbasePassword, $username) {
+function loginMD5($internalKey, $givenPassword, $dbasePassword, $username){
 	global $modx;
 
-	if($dbasePassword != md5($givenPassword)) {
+	if ($dbasePassword != md5($givenPassword)) {
 		return false;
 	}
 	updateNewHash($username, $givenPassword);
 	return true;
 }
 
-function updateNewHash($username, $password) {
+function updateNewHash($username, $password){
 	global $modx;
 
 	$field = array();
@@ -347,23 +347,23 @@ 
 	$modx->db->update($field, '[+prefix+]manager_users', "username='{$username}'");
 }
 
-function incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes) {
+function incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes){
 	global $modx;
 
 	$failedlogins += 1;
 
 	$fields = array('failedlogincount' => $failedlogins);
-	if($failedlogins >= $failed_allowed) //block user for too many fail attempts
+	if ($failedlogins >= $failed_allowed) //block user for too many fail attempts
 	{
 		$fields['blockeduntil'] = time() + ($blocked_minutes * 60);
 	}
 
 	$modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
 
-	if($failedlogins < $failed_allowed) {
+	if ($failedlogins < $failed_allowed) {
 		//sleep to help prevent brute force attacks
 		$sleep = (int) $failedlogins / 2;
-		if($sleep > 5) {
+		if ($sleep > 5) {
 			$sleep = 5;
 		}
 		sleep($sleep);

manager/frames/mainmenu.php

Spacing +69 added lines, -69 removed lines

@@ -21,7 +21,7 @@ 
 $sitemenu['site'] = array(

 	'site',

 	'main',

-	'<i class="fa fa-home"></i>' . $_lang['home'],

+	'<i class="fa fa-home"></i>'.$_lang['home'],

 	'index.php?a=2',

 	$_lang['home'],

 	'',

@@ -32,11 +32,11 @@ 
 	'active'

 );

 

-if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {

+if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {

 	$sitemenu['elements'] = array(

 		'elements',

 		'main',

-		'<i class="fa fa-th"></i>' . $_lang['elements'],

+		'<i class="fa fa-th"></i>'.$_lang['elements'],

 		'javascript:;',

 		$_lang['elements'],

 		' return false;',

@@ -48,11 +48,11 @@ 
 	);

 }

 

-if($modx->hasPermission('exec_module')) {

+if ($modx->hasPermission('exec_module')) {

 	$sitemenu['modules'] = array(

 		'modules',

 		'main',

-		'<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['modules'],

+		'<i class="'.$_style['icons_modules'].'"></i>'.$_lang['modules'],

 		'javascript:;',

 		$_lang['modules'],

 		' return false;',

@@ -64,11 +64,11 @@ 
 	);

 }

 

-if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {

+if ($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {

 	$sitemenu['users'] = array(

 		'users',

 		'main',

-		'<i class="fa fa-users"></i>' . $_lang['users'],

+		'<i class="fa fa-users"></i>'.$_lang['users'],

 		'javascript:;',

 		$_lang['users'],

 		' return false;',

@@ -80,11 +80,11 @@ 
 	);

 }

 

-if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {

+if ($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {

 	$sitemenu['tools'] = array(

 		'tools',

 		'main',

-		'<i class="fa fa-wrench"></i>' . $_lang['tools'],

+		'<i class="fa fa-wrench"></i>'.$_lang['tools'],

 		'javascript:;',

 		$_lang['tools'],

 		' return false;',

@@ -97,12 +97,12 @@ 
 }

 

 $tab = 0;

-if($modx->hasPermission('edit_template')) {

+if ($modx->hasPermission('edit_template')) {

 	$sitemenu['element_templates'] = array(

 		'element_templates',

 		'elements',

-		'<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

+		'<i class="fa fa-newspaper-o"></i>'.$_lang['manage_templates'].'<i class="fa fa-angle-right toggle"></i>',

+		'index.php?a=76&tab='.$tab++,

 		$_lang['manage_templates'],

 		'',

 		'new_template,edit_template',

@@ -112,12 +112,12 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {

+if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {

 	$sitemenu['element_tplvars'] = array(

 		'element_tplvars',

 		'elements',

-		'<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

+		'<i class="fa fa-list-alt"></i>'.$_lang['tmplvars'].'<i class="fa fa-angle-right toggle"></i>',

+		'index.php?a=76&tab='.$tab++,

 		$_lang['tmplvars'],

 		'',

 		'new_template,edit_template',

@@ -127,12 +127,12 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_chunk')) {

+if ($modx->hasPermission('edit_chunk')) {

 	$sitemenu['element_htmlsnippets'] = array(

 		'element_htmlsnippets',

 		'elements',

-		'<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

+		'<i class="fa fa-th-large"></i>'.$_lang['manage_htmlsnippets'].'<i class="fa fa-angle-right toggle"></i>',

+		'index.php?a=76&tab='.$tab++,

 		$_lang['manage_htmlsnippets'],

 		'',

 		'new_chunk,edit_chunk',

@@ -142,12 +142,12 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_snippet')) {

+if ($modx->hasPermission('edit_snippet')) {

 	$sitemenu['element_snippets'] = array(

 		'element_snippets',

 		'elements',

-		'<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

+		'<i class="fa fa-code"></i>'.$_lang['manage_snippets'].'<i class="fa fa-angle-right toggle"></i>',

+		'index.php?a=76&tab='.$tab++,

 		$_lang['manage_snippets'],

 		'',

 		'new_snippet,edit_snippet',

@@ -157,12 +157,12 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_plugin')) {

+if ($modx->hasPermission('edit_plugin')) {

 	$sitemenu['element_plugins'] = array(

 		'element_plugins',

 		'elements',

-		'<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>',

-		'index.php?a=76&tab=' . $tab++,

+		'<i class="fa fa-plug"></i>'.$_lang['manage_plugins'].'<i class="fa fa-angle-right toggle"></i>',

+		'index.php?a=76&tab='.$tab++,

 		$_lang['manage_plugins'],

 		'',

 		'new_plugin,edit_plugin',

@@ -174,11 +174,11 @@ 
 }

 //$sitemenu['element_categories']     = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');

 

-if($modx->hasPermission('file_manager')) {

+if ($modx->hasPermission('file_manager')) {

 	$sitemenu['manage_files'] = array(

 		'manage_files',

 		'elements',

-		'<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'],

+		'<i class="fa fa-folder-open-o"></i>'.$_lang['manage_files'],

 		'index.php?a=31',

 		$_lang['manage_files'],

 		'',

@@ -189,11 +189,11 @@ 
 		''

 	);

 }

-if($modx->hasPermission('category_manager')) {

+if ($modx->hasPermission('category_manager')) {

 	$sitemenu['manage_categories'] = array(

 		'manage_categories',

 		'elements',

-		'<i class="fa fa-object-group"></i>' . $_lang['manage_categories'],

+		'<i class="fa fa-object-group"></i>'.$_lang['manage_categories'],

 		'index.php?a=120',

 		$_lang['manage_categories'],

 		'',

@@ -206,11 +206,11 @@ 
 }

 

 // Modules Menu Items

-if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {

+if ($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {

 	$sitemenu['new_module'] = array(

 		'new_module',

 		'modules',

-		'<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'],

+		'<i class="'.$_style['icons_modules'].'"></i>'.$_lang['module_management'],

 		'index.php?a=106',

 		$_lang['module_management'],

 		'',

@@ -222,24 +222,24 @@ 
 	);

 }

 

-if($modx->hasPermission('exec_module')) {

-	if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

+if ($modx->hasPermission('exec_module')) {

+	if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

 		$rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member

-				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm

-				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

-				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

-                WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

+				FROM ' . $modx->getFullTableName('site_modules').' AS sm

+				LEFT JOIN ' . $modx->getFullTableName('site_module_access').' AS sma ON sma.module = sm.id

+				LEFT JOIN ' . $modx->getFullTableName('member_groups').' AS mg ON sma.usergroup = mg.user_group

+                WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID().') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

 	} else {

 		$rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');

 	}

-	if($modx->db->getRecordCount($rs)) {

+	if ($modx->db->getRecordCount($rs)) {

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

-            $sitemenu['module' . $row['id']] = array(

-                'module' . $row['id'],

+            $sitemenu['module'.$row['id']] = array(

+                'module'.$row['id'],

                 'modules',

-                ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>') . $row['name'],

-                'index.php?a=112&id=' . $row['id'],

+                ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>').$row['name'],

+                'index.php?a=112&id='.$row['id'],

                 $row['name'],

                 '',

                 '',

@@ -254,11 +254,11 @@ 
 

 // security menu items (users)

 

-if($modx->hasPermission('edit_user')) {

+if ($modx->hasPermission('edit_user')) {

 	$sitemenu['user_management_title'] = array(

 		'user_management_title',

 		'users',

-		'<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',

+		'<i class="fa fa fa-user"></i>'.$_lang['user_management_title'].'<i class="fa fa-angle-right toggle"></i>',

 		'index.php?a=75',

 		$_lang['user_management_title'],

 		'',

@@ -270,11 +270,11 @@ 
 	);

 }

 

-if($modx->hasPermission('edit_web_user')) {

+if ($modx->hasPermission('edit_web_user')) {

 	$sitemenu['web_user_management_title'] = array(

 		'web_user_management_title',

 		'users',

-		'<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',

+		'<i class="fa fa-users"></i>'.$_lang['web_user_management_title'].'<i class="fa fa-angle-right toggle"></i>',

 		'index.php?a=99',

 		$_lang['web_user_management_title'],

 		'',

@@ -286,11 +286,11 @@ 
 	);

 }

 

-if($modx->hasPermission('edit_role')) {

+if ($modx->hasPermission('edit_role')) {

 	$sitemenu['role_management_title'] = array(

 		'role_management_title',

 		'users',

-		'<i class="fa fa-legal"></i>' . $_lang['role_management_title'],

+		'<i class="fa fa-legal"></i>'.$_lang['role_management_title'],

 		'index.php?a=86',

 		$_lang['role_management_title'],

 		'',

@@ -302,11 +302,11 @@ 
 	);

 }

 

-if($modx->hasPermission('access_permissions')) {

+if ($modx->hasPermission('access_permissions')) {

 	$sitemenu['manager_permissions'] = array(

 		'manager_permissions',

 		'users',

-		'<i class="fa fa-male"></i>' . $_lang['manager_permissions'],

+		'<i class="fa fa-male"></i>'.$_lang['manager_permissions'],

 		'index.php?a=40',

 		$_lang['manager_permissions'],

 		'',

@@ -318,11 +318,11 @@ 
 	);

 }

 

-if($modx->hasPermission('web_access_permissions')) {

+if ($modx->hasPermission('web_access_permissions')) {

 	$sitemenu['web_permissions'] = array(

 		'web_permissions',

 		'users',

-		'<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'],

+		'<i class="fa fa-universal-access"></i>'.$_lang['web_permissions'],

 		'index.php?a=91',

 		$_lang['web_permissions'],

 		'',

@@ -339,7 +339,7 @@ 
 $sitemenu['refresh_site'] = array(

     'refresh_site',

     'tools',

-    '<i class="fa fa-recycle"></i>' . $_lang['refresh_site'],

+    '<i class="fa fa-recycle"></i>'.$_lang['refresh_site'],

     'index.php?a=26',

     $_lang['refresh_site'],

     '',

@@ -353,7 +353,7 @@ 
             'a', // tag

             'javascript:;', // href

             'btn btn-secondary', // class or btn-success

-            'modx.popup({url:\'index.php?a=26\', title:\'' . $_lang['refresh_site'] . '\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick

+            'modx.popup({url:\'index.php?a=26\', title:\''.$_lang['refresh_site'].'\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick

             $_lang['refresh_site'], // title

             '<i class="fa fa-recycle"></i>' // innerHTML

         )

@@ -363,7 +363,7 @@ 
 $sitemenu['search'] = array(

 	'search',

 	'tools',

-	'<i class="fa fa-search"></i>' . $_lang['search'],

+	'<i class="fa fa-search"></i>'.$_lang['search'],

 	'index.php?a=71',

 	$_lang['search'],

 	'',

@@ -374,11 +374,11 @@ 
 	''

 );

 

-if($modx->hasPermission('bk_manager')) {

+if ($modx->hasPermission('bk_manager')) {

 	$sitemenu['bk_manager'] = array(

 		'bk_manager',

 		'tools',

-		'<i class="fa fa-database"></i>' . $_lang['bk_manager'],

+		'<i class="fa fa-database"></i>'.$_lang['bk_manager'],

 		'index.php?a=93',

 		$_lang['bk_manager'],

 		'',

@@ -390,11 +390,11 @@ 
 	);

 }

 

-if($modx->hasPermission('remove_locks')) {

+if ($modx->hasPermission('remove_locks')) {

 	$sitemenu['remove_locks'] = array(

 		'remove_locks',

 		'tools',

-		'<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'],

+		'<i class="fa fa-hourglass"></i>'.$_lang['remove_locks'],

 		'javascript:modx.removeLocks();',

 		$_lang['remove_locks'],

 		'',

@@ -406,11 +406,11 @@ 
 	);

 }

 

-if($modx->hasPermission('import_static')) {

+if ($modx->hasPermission('import_static')) {

 	$sitemenu['import_site'] = array(

 		'import_site',

 		'tools',

-		'<i class="fa fa-upload"></i>' . $_lang['import_site'],

+		'<i class="fa fa-upload"></i>'.$_lang['import_site'],

 		'index.php?a=95',

 		$_lang['import_site'],

 		'',

@@ -422,11 +422,11 @@ 
 	);

 }

 

-if($modx->hasPermission('export_static')) {

+if ($modx->hasPermission('export_static')) {

 	$sitemenu['export_site'] = array(

 		'export_site',

 		'tools',

-		'<i class="fa fa-download"></i>' . $_lang['export_site'],

+		'<i class="fa fa-download"></i>'.$_lang['export_site'],

 		'index.php?a=83',

 		$_lang['export_site'],

 		'',

@@ -439,20 +439,20 @@ 
 }

 

 $menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));

-if(is_array($menu)) {

+if (is_array($menu)) {

 	$newmenu = array();

-	foreach($menu as $item){

-		if(is_array(unserialize($item))){

+	foreach ($menu as $item) {

+		if (is_array(unserialize($item))) {

 			$newmenu = array_merge($newmenu, unserialize($item));

 		}

 	}

-	if(count($newmenu)> 0) $sitemenu = $newmenu;

+	if (count($newmenu) > 0) $sitemenu = $newmenu;

 }

 

-if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {

-	include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');

+if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/includes/menu.class.inc.php')) {

+	include_once(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/includes/menu.class.inc.php');

 } else {

-	include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');

+	include_once(MODX_MANAGER_PATH.'includes/menu.class.inc.php');

 }

 $menu = new EVOmenu();

 $menu->Build($sitemenu, array(

manager/media/calendar/datepicker.inc.php

Spacing +4 added lines, -4 removed lines

@@ -1,13 +1,13 @@
 <?php

 

-class DATEPICKER {

-	function __construct() {

+class DATEPICKER{

+	function __construct(){

 	}

 

-	function getDP() {

+	function getDP(){

 		global $modx, $_lang;

 

-		$tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');

+		$tpl = file_get_contents(dirname(__FILE__).'/datepicker.tpl');

 		return $modx->parseText($tpl, $_lang, '[%', '%]');

 	}

 }

manager/media/browser/mcpuk/core/types/type_img.php

Spacing +2 added lines, -2 removed lines

@@ -12,9 +12,9 @@
   *      @link http://kcfinder.sunhater.com
   */
 
-class type_img {
+class type_img{
 
-    public function checkFile($file, array $config) {
+    public function checkFile($file, array $config){
 
         $driver = isset($config['imageDriversPriority'])
             ? image::getDriver(explode(" ", $config['imageDriversPriority'])) : "gd";

manager/media/browser/mcpuk/core/types/type_mime.php

Spacing +4 added lines, -4 removed lines

@@ -12,9 +12,9 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class type_mime {
+class type_mime{
 
-    public function checkFile($file, array $config) {
+    public function checkFile($file, array $config){
         if (!class_exists("finfo"))
             return "Fileinfo PECL extension is missing.";
 
@@ -33,12 +33,12 @@ 
         $mimes = $config['params'];
         if (substr($mimes, 0, 1) == "!") {
             $mimes = trim(substr($mimes, 1));
-            return in_array($type , explode(" ", $mimes))
+            return in_array($type, explode(" ", $mimes))
                 ? "You can't upload such files."
                 : true;
         }
 
-        return !in_array($type , explode(" ", $mimes))
+        return !in_array($type, explode(" ", $mimes))
             ? "You can't upload such files."
             : true;
     }