evolution-cms / evolution

manager/processors/delete_role.processor.php

Braces +2 added lines, -2 removed lines

@@ -11,13 +11,13 @@
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
-if($id==1){
+if($id==1) {
 	$modx->webAlertAndQuit("The role you are trying to delete is the admin role. This role cannot be deleted!");
 }
 
 $rs = $modx->getDatabase()->select('COUNT(*)', $modx->getFullTableName('user_attributes'), "role='{$id}'");
 $count=$modx->getDatabase()->getValue($rs);
-if($count>0){
+if($count>0) {
 	$modx->webAlertAndQuit("There are users with this role. It can't be deleted.");
 }
 

manager/processors/send_message.processor.php

Braces +6 added lines, -2 removed lines

@@ -10,9 +10,13 @@
 $userid = $_REQUEST['user'];
 $groupid = $_REQUEST['group'];
 $subject = $modx->getDatabase()->escape($_REQUEST['messagesubject']);
-if($subject=="") $subject="(no subject)";
+if($subject=="") {
+    $subject="(no subject)";
+}
 $message = $modx->getDatabase()->escape($_REQUEST['messagebody']);
-if($message=="") $message="(no message)";
+if($message=="") {
+    $message="(no message)";
+}
 $postdate = time();
 
 if($sendto=='u') {

manager/processors/export_site.processor.php

Braces +9 added lines, -5 removed lines

@@ -10,16 +10,20 @@
 @set_time_limit($maxtime);
 
 
-if(is_dir(MODX_BASE_PATH . 'temp'))       $export_dir = MODX_BASE_PATH . 'temp/export';
-elseif(is_dir(MODX_BASE_PATH . 'assets')) $export_dir = MODX_BASE_PATH . 'assets/export';
+if(is_dir(MODX_BASE_PATH . 'temp')) {
+    $export_dir = MODX_BASE_PATH . 'temp/export';
+} elseif(is_dir(MODX_BASE_PATH . 'assets')) {
+    $export_dir = MODX_BASE_PATH . 'assets/export';
+}
 $modx->getExportSite()->targetDir = $export_dir;
 
-if(strpos($modx->config['base_path'],"{$export_dir}/")===0 && 0 <= strlen(str_replace("{$export_dir}/",'',$modx->config['base_path'])))
+if(strpos($modx->config['base_path'],"{$export_dir}/")===0 && 0 <= strlen(str_replace("{$export_dir}/",'',$modx->config['base_path']))) {
 	return $_lang['export_site.static.php6'];
-elseif($modx->config['rb_base_dir'] === $export_dir . '/')
+} elseif($modx->config['rb_base_dir'] === $export_dir . '/') {
 	return $modx->parsePlaceholder($_lang['export_site.static.php7'],'rb_base_url=' . $modx->config['base_url'] . $modx->config['rb_base_url']);
-elseif(!is_writable($export_dir))
+} elseif(!is_writable($export_dir)) {
 	return $_lang['export_site_target_unwritable'];
+}
 
 $modx->getExportSite()->generate_mode = $_POST['generate_mode'];
 

manager/processors/duplicate_module.processor.php

Braces +5 added lines, -2 removed lines

@@ -13,8 +13,11 @@
 // count duplicates
 $name = $modx->getDatabase()->getValue($modx->getDatabase()->select('name', $modx->getFullTableName('site_modules'), "id='{$id}'"));
 $count = $modx->getDatabase()->getRecordCount($modx->getDatabase()->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->getDatabase()->insert(

manager/processors/save_content.processor.php

Braces +23 added lines, -19 removed lines

@@ -134,8 +134,7 @@ 
         }
         //end webber
     }
-}
-elseif ($alias) {
+} elseif ($alias) {
     $alias = $modx->stripAlias($alias);
 }
 
@@ -149,8 +148,7 @@ 
 
     if ($pub_date < $currentdate) {
         $published = 1;
-    }
-    elseif ($pub_date > $currentdate) {
+    } elseif ($pub_date > $currentdate) {
         $published = 0;
     }
 }
@@ -277,8 +275,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";
@@ -346,8 +343,9 @@ 
             "alias_visible"    => $aliasvisible
         );
 
-        if ($id != '')
-            $dbInsert["id"] = $id;
+        if ($id != '') {
+                    $dbInsert["id"] = $id;
+        }
 
         $key = $modx->getDatabase()->insert($dbInsert, $tbl_site_content);
 
@@ -423,11 +421,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 +488,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 +547,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 +597,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->getDatabase()->getRow($rs)) $old_groups[$row['document_group']] = $row['id'];
+                while ($row = $modx->getDatabase()->getRow($rs)) {
+                    $old_groups[$row['document_group']] = $row['id'];
+                }
 
                 // update the permissions in the database
                 $insertions = $deletions = array();
@@ -657,9 +661,9 @@ 
                 $modx->clearCache('full');
             }
 
-            if ($_POST['refresh_preview'] == '1')
-                $header = "Location: ".MODX_SITE_URL."index.php?id=$id&z=manprev";
-            else {
+            if ($_POST['refresh_preview'] == '1') {
+                            $header = "Location: ".MODX_SITE_URL."index.php?id=$id&z=manprev";
+            } else {
                 if ($_POST['stay'] != '2' && $id > 0) {
                     $modx->unlockElement(7, $id);
                 }

manager/processors/duplicate_htmlsnippet.processor.php

Braces +5 added lines, -2 removed lines

@@ -14,8 +14,11 @@
 // count duplicates
 $name = $modx->getDatabase()->getValue($modx->getDatabase()->select('name', $modx->getFullTableName('site_htmlsnippets'), "id='{$id}'"));
 $count = $modx->getDatabase()->getRecordCount($modx->getDatabase()->select('name', $modx->getFullTableName('site_htmlsnippets'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate htmlsnippet
 $newid = $modx->getDatabase()->insert(

manager/processors/move_document.processor.php

Braces +14 added lines, -6 removed lines

@@ -12,12 +12,20 @@ 
 // ok, two things to check.
 // first, document cannot be moved to itself
 // second, new parent must be a folder. If not, set it to folder.
-if($documentID==$newParentID) $modx->webAlertAndQuit($_lang["error_movedocument1"]);
-if($documentID <= 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
-if($newParentID < 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+if($documentID==$newParentID) {
+    $modx->webAlertAndQuit($_lang["error_movedocument1"]);
+}
+if($documentID <= 0) {
+    $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+}
+if($newParentID < 0) {
+    $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+}
 
 $parents = $modx->getParentIds($newParentID);
-if (in_array($documentID, $parents))  $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+if (in_array($documentID, $parents)) {
+    $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+}
 
 $rs = $modx->getDatabase()->select('parent', $modx->getFullTableName('site_content'), "id='{$documentID}'");
 $oldparent = $modx->getDatabase()->getValue($rs);
@@ -42,11 +50,11 @@ 
 	"old_parent" => $oldparent,
 	"new_parent" => $newParentID
 ));
-if (is_array($evtOut) && count($evtOut) > 0){
+if (is_array($evtOut) && count($evtOut) > 0) {
 	$newParent = array_pop($evtOut);
 	if($newParent == $oldparent) {
 		$modx->webAlertAndQuit($_lang["error_movedocument2"]);
-	}else{
+	} else {
 		$newParentID = $newParent;
 	}
 }

manager/processors/save_settings.processor.php

Braces +18 added lines, -25 removed lines

@@ -9,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"];
 			}
 		}
@@ -73,7 +61,7 @@ 
 				$v = htmlspecialchars($v);
 				break;
             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');
                 }
@@ -134,7 +122,9 @@ 
 
 		$modx->config[$k] = $v;
 
-		if(!empty($k)) $savethese[] = '(\''.$modx->getDatabase()->escape($k).'\', \''.$modx->getDatabase()->escape($v).'\')';
+		if(!empty($k)) {
+		    $savethese[] = '(\''.$modx->getDatabase()->escape($k).'\', \''.$modx->getDatabase()->escape($v).'\')';
+		}
 	}
 
 	// Run a single query to save all the values
@@ -148,8 +138,11 @@ 
 		$oldtemplate = (int)$data['old_template'];
 		$tbl = $modx->getFullTableName('site_content');
 		$reset = $data['reset_template'];
-		if($reset==1) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "type='document'");
-		else if($reset==2) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");
+		if($reset==1) {
+		    $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "type='document'");
+		} else if($reset==2) {
+		    $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");
+		}
 	}
 
 	// empty cache

manager/processors/duplicate_plugin.processor.php

Braces +5 added lines, -2 removed lines

@@ -14,8 +14,11 @@
 // count duplicates
 $name = $modx->getDatabase()->getValue($modx->getDatabase()->select('name', $modx->getFullTableName('site_plugins'), "id='{$id}'"));
 $count = $modx->getDatabase()->getRecordCount($modx->getDatabase()->select('name', $modx->getFullTableName('site_plugins'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate Plugin
 $newid = $modx->getDatabase()->insert(