evolution-cms / evolution

manager/processors/delete_snippet.processor.php

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(IN_MANAGER_MODE!="true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+if(IN_MANAGER_MODE!="true") {
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+}
 if(!$modx->hasPermission('delete_snippet')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }

manager/processors/execute_module.processor.php

Braces +10 added lines, -10 removed lines

@@ -1,6 +1,8 @@ 
 <?php
-if(IN_MANAGER_MODE!="true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
-if(!$modx->hasPermission('exec_module')) {	
+if(IN_MANAGER_MODE!="true") {
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+}
+if(!$modx->hasPermission('exec_module')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -10,7 +12,7 @@ 
 }
 
 // check if user has access permission, except admins
-if($_SESSION['mgrRole']!=1){
+if($_SESSION['mgrRole']!=1) {
 	$rs = $modx->db->select(
 		'sma.usergroup,mg.member',
 		$modx->getFullTableName("site_module_access")." sma
@@ -62,7 +64,8 @@ 
 include MODX_MANAGER_PATH."includes/sysalert.display.inc.php";
 
 // evalModule
-function evalModule($moduleCode,$params){
+function evalModule($moduleCode,$params)
+{
 	global $modx;
 	$modx->event->params = &$params; // store params inside event object
 	if(is_array($params)) {
@@ -72,11 +75,9 @@ 
 	$mod = eval($moduleCode);
 	$msg = ob_get_contents();
 	ob_end_clean();
-	if (isset($php_errormsg))
-	{
+	if (isset($php_errormsg)) {
 		$error_info = error_get_last();
-        switch($error_info['type'])
-        {
+        switch($error_info['type']) {
         	case E_NOTICE :
         		$error_level = 1;
         	case E_USER_NOTICE :
@@ -89,8 +90,7 @@ 
         	default:
         		$error_level = 99;
         }
-		if($modx->config['error_reporting']==='99' || 2<$error_level)
-		{
+		if($modx->config['error_reporting']==='99' || 2<$error_level) {
 			$modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], $_SESSION['itemname'] . ' - Module', $error_info['message'], $error_info['line'], $msg);
 			$modx->event->alert("An error occurred while loading. Please see the event log for more information<p>{$msg}</p>");
 		}

manager/processors/web_access_groups.processor.php

Braces +4 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(IN_MANAGER_MODE!="true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+if(IN_MANAGER_MODE!="true") {
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+}
 if(!$modx->hasPermission('web_access_permissions')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
@@ -115,7 +117,7 @@ 
 }
 
 // secure web documents - flag as private
-if($updategroupaccess==true){
+if($updategroupaccess==true) {
 	include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php";
 	secureWebDocument();
 

manager/processors/duplicate_module.processor.php

Braces +10 added lines, -4 removed lines

@@ -1,5 +1,7 @@ 
 <?php 
-if(IN_MANAGER_MODE!="true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+if(IN_MANAGER_MODE!="true") {
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+}
 if(!$modx->hasPermission('new_module')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
@@ -10,7 +12,8 @@ 
 }
 
 // create globally unique identifiers (guid)
-function createGUID(){
+function createGUID()
+{
 	srand((double)microtime()*1000000);
 	$r = rand() ;
 	$u = uniqid(getmypid() . $r . (double)microtime()*1000000,1);
@@ -21,8 +24,11 @@ 
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_modules'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_modules'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate module
 $newid = $modx->db->insert(

manager/processors/undelete_content.processor.php

Braces +6 added lines, -3 removed lines

@@ -1,6 +1,8 @@ 
 <?php 
-if(IN_MANAGER_MODE!="true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
-if(!$modx->hasPermission('delete_document')) {	
+if(IN_MANAGER_MODE!="true") {
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+}
+if(!$modx->hasPermission('delete_document')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -42,7 +44,8 @@ 
 
 $children = array();
 
-function getChildren($parent) {
+function getChildren($parent)
+{
 	
 	global $modx;
 	global $children;

manager/processors/save_settings.processor.php

Braces +21 added lines, -26 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(IN_MANAGER_MODE!="true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+if(IN_MANAGER_MODE!="true") {
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+}
 if(!$modx->hasPermission('settings')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
@@ -7,39 +9,27 @@ 
 // lose the POST now, gets rid of quirky issue with Safari 3 - see FS#972
 unset($_POST);
 
-if($data['friendly_urls']==='1' && strpos($_SERVER['SERVER_SOFTWARE'],'IIS')===false)
-{
+if($data['friendly_urls']==='1' && strpos($_SERVER['SERVER_SOFTWARE'],'IIS')===false) {
 	$htaccess        = $modx->config['base_path'] . '.htaccess';
 	$sample_htaccess = $modx->config['base_path'] . 'ht.access';
 	$dir = '/' . trim($modx->config['base_url'],'/');
-	if(is_file($htaccess))
-	{
+	if(is_file($htaccess)) {
 		$_ = file_get_contents($htaccess);
-		if(strpos($_,'RewriteBase')===false)
-		{
+		if(strpos($_,'RewriteBase')===false) {
 			$warnings[] = $_lang["settings_friendlyurls_alert2"];
-		}
-		elseif(is_writable($htaccess))
-		{
+		} elseif(is_writable($htaccess)) {
 			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
-			if(!@file_put_contents($htaccess,$_))
-			{
+			if(!@file_put_contents($htaccess,$_)) {
 				$warnings[] = $_lang["settings_friendlyurls_alert2"];
 			}
 		}
-	}
-	elseif(is_file($sample_htaccess))
-	{
-		if(!@rename($sample_htaccess,$htaccess))
-        {
+	} elseif(is_file($sample_htaccess)) {
+		if(!@rename($sample_htaccess,$htaccess)) {
         	$warnings[] = $_lang["settings_friendlyurls_alert"];
-		}
-		elseif($modx->config['base_url']!=='/')
-		{
+		} elseif($modx->config['base_url']!=='/') {
 			$_ = file_get_contents($htaccess);
 			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
-			if(!@file_put_contents($htaccess,$_))
-			{
+			if(!@file_put_contents($htaccess,$_)) {
 				$warnings[] = $_lang["settings_friendlyurls_alert2"];
 			}
 		}
@@ -68,7 +58,7 @@ 
 	foreach ($data as $k => $v) {
 		switch ($k) {
             case 'settings_version':{
-                if($modx->getVersionData('version')!=$data['settings_version']){
+                if($modx->getVersionData('version')!=$data['settings_version']) {
                     $modx->logEvent(17,2,'<pre>'.var_export($data['settings_version'],true).'</pre>','fake settings_version');
                     $v = $modx->getVersionData('version');
                 }
@@ -129,7 +119,9 @@ 
 		
 		$modx->config[$k] = $v;
 		
-		if(!empty($k)) $savethese[] = '(\''.$modx->db->escape($k).'\', \''.$modx->db->escape($v).'\')';
+		if(!empty($k)) {
+		    $savethese[] = '(\''.$modx->db->escape($k).'\', \''.$modx->db->escape($v).'\')';
+		}
 	}
 	
 	// Run a single query to save all the values
@@ -143,8 +135,11 @@ 
 		$oldtemplate = intval($data['old_template']);
 		$tbl = $modx->getFullTableName('site_content');
 		$reset = $data['reset_template'];
-		if($reset==1) $modx->db->update(array('template' => $newtemplate), $tbl, "type='document'");
-		else if($reset==2) $modx->db->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");
+		if($reset==1) {
+		    $modx->db->update(array('template' => $newtemplate), $tbl, "type='document'");
+		} else if($reset==2) {
+		    $modx->db->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");
+		}
 	}
 	
 	// empty cache

manager/processors/remove_installer.processor.php

Braces +10 added lines, -6 removed lines

@@ -17,20 +17,24 @@
 $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(!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) {   
+function rmdirRecursive($path,$followLinks=false)
+{
    $dir = opendir($path) ;
-   while ($entry = readdir($dir)) {       
+   while ($entry = readdir($dir)) {
 	   if (is_file("$path/$entry") || ((!$followLinks) && is_link("$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/save_content.processor.php

Braces +36 added lines, -25 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(IN_MANAGER_MODE!="true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+if(IN_MANAGER_MODE!="true") {
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+}
 if (!$modx->hasPermission('save_document')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
@@ -82,7 +84,7 @@ 
                 }
                 $alias = $tempAlias;
             }
-        }else{
+        } else {
             if ($modx->db->getValue($modx->db->select('COUNT(id)', $tbl_site_content, "id<>'$id' AND parent=$parent AND alias='$alias'")) != 0) {
                 $cnt = 1;
                 $tempAlias = $alias;
@@ -132,8 +134,7 @@ 
         }
         //end webber        
     }
-}
-elseif ($alias) {
+} elseif ($alias) {
     $alias = $modx->stripAlias($alias);
 }
 
@@ -147,8 +148,7 @@ 
 
     if ($pub_date < $currentdate) {
         $published = 1;
-    }
-    elseif ($pub_date > $currentdate) {
+    } elseif ($pub_date > $currentdate) {
         $published = 0;
     }
 }
@@ -276,8 +276,7 @@ 
     case 'new' :
 
         // invoke OnBeforeDocFormSave event
-        switch($modx->config['docid_incrmnt_method'])
-        {
+        switch($modx->config['docid_incrmnt_method']) {
             case '1':
                 $from = "{$tbl_site_content} AS T0 LEFT JOIN {$tbl_site_content} AS T1 ON T0.id + 1 = T1.id";
                 $where = "T1.id IS NULL";
@@ -308,7 +307,7 @@ 
         $publishedon = ($published ? $currentdate : 0);
         $publishedby = ($published ? $modx->getLoginUserID() : 0);
 
-        if ((!empty($pub_date))&&($published)){
+        if ((!empty($pub_date))&&($published)) {
             $publishedon=$pub_date;
         }
 
@@ -346,8 +345,9 @@ 
             "alias_visible"    => $aliasvisible
         );
 
-        if ($id != '')
-            $dbInsert["id"] = $id;
+        if ($id != '') {
+                    $dbInsert["id"] = $id;
+        }
 
         $key = $modx->db->insert( $dbInsert, $tbl_site_content);
 
@@ -423,11 +423,13 @@ 
         // redirect/stay options
         if ($_POST['stay'] != '') {
             // weblink
-            if ($_POST['mode'] == "72")
-                $a = ($_POST['stay'] == '2') ? "27&id=$key" : "72&pid=$parent";
+            if ($_POST['mode'] == "72") {
+                            $a = ($_POST['stay'] == '2') ? "27&id=$key" : "72&pid=$parent";
+            }
             // document
-            if ($_POST['mode'] == "4")
-                $a = ($_POST['stay'] == '2') ? "27&id=$key" : "4&pid=$parent";
+            if ($_POST['mode'] == "4") {
+                            $a = ($_POST['stay'] == '2') ? "27&id=$key" : "4&pid=$parent";
+            }
             $header = "Location: index.php?a=" . $a . "&r=1&stay=" . $_POST['stay'];
         } else {
             $header = "Location: index.php?a=3&id=$key&r=1";
@@ -488,10 +490,10 @@ 
         if (!$was_published && $published) {
             $publishedon = $currentdate;
             $publishedby = $modx->getLoginUserID();
-            }elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
+            } elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
             $publishedon = $pub_date;
             $publishedby = $modx->getLoginUserID();
-               }elseif ($was_published && !$published) {
+               } elseif ($was_published && !$published) {
             $publishedon = 0;
             $publishedby = 0;
         } else {
@@ -547,7 +549,9 @@ 
         $tvChanges = array();
         foreach ($tmplvars as $field => $value) {
             if (!is_array($value)) {
-                if (isset($tvIds[$value])) $tvDeletions[] = $tvIds[$value];
+                if (isset($tvIds[$value])) {
+                    $tvDeletions[] = $tvIds[$value];
+                }
             } else {
                 $tvId = $value[0];
                 $tvVal = $value[1];
@@ -595,7 +599,9 @@ 
                 "((1=".(int)$isManager." AND dgn.private_memgroup) OR (1=".(int)$isWeb." AND dgn.private_webgroup)) AND groups.document = '{$id}'"
                 );
             $old_groups = array();
-            while ($row = $modx->db->getRow($rs)) $old_groups[$row['document_group']] = $row['id'];
+            while ($row = $modx->db->getRow($rs)) {
+                $old_groups[$row['document_group']] = $row['id'];
+            }
 
             // update the permissions in the database
             $insertions = $deletions = array();
@@ -657,17 +663,22 @@ 
             $keys = array('alias','parent','published','isfolder','menuindex','alias_visible');
             $flag = '';
             foreach($keys as $key) {
-                if ($existingDocument[$key]===$_POST[$key]) continue;
+                if ($existingDocument[$key]===$_POST[$key]) {
+                    continue;
+                }
                 $flag = 'full';
                 break;
             }
-            if($flag==='full') $modx->clearCache('full');
-            else               $modx->clearCache($id);
+            if($flag==='full') {
+                $modx->clearCache('full');
+            } else {
+                $modx->clearCache($id);
+            }
         }
         
-        if ($_POST['refresh_preview'] == '1')
-            $header = "Location: ".MODX_SITE_URL."index.php?id=$id&z=manprev";
-        else {
+        if ($_POST['refresh_preview'] == '1') {
+                    $header = "Location: ".MODX_SITE_URL."index.php?id=$id&z=manprev";
+        } else {
             if ($_POST['stay'] != '2' && $id > 0) {
                 $modx->unlockElement(7, $id);
             }

manager/processors/empty_table.processor.php

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(IN_MANAGER_MODE!="true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+if(IN_MANAGER_MODE!="true") {
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+}
 if(!$modx->hasPermission('settings')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }