evolution-cms / evolution

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->db->escape($_REQUEST['messagesubject']);
-if($subject=="") $subject="(no subject)";
+if($subject=="") {
+    $subject="(no subject)";
+}
 $message = $modx->db->escape($_REQUEST['messagebody']);
-if($message=="") $message="(no message)";
+if($message=="") {
+    $message="(no message)";
+}
 $postdate = time();
 
 if($sendto=='u') {

manager/processors/access_groups.processor.php

Braces +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
 }
 
 // secure manager documents - flag as private
-if($updategroupaccess==true){
+if($updategroupaccess==true) {
 	include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php";
 	secureMgrDocument();
 

manager/index.php

Braces +37 added lines, -18 removed lines

@@ -61,9 +61,13 @@ 
 $mgr_dir   = substr($self_dir,strrpos($self_dir,'/')+1);
 $base_path = str_replace($mgr_dir . '/index.php','',$self);
 $site_mgr_path = $base_path . 'assets/cache/siteManager.php';
-if(is_file($site_mgr_path)) include_once($site_mgr_path);
+if(is_file($site_mgr_path)) {
+    include_once($site_mgr_path);
+}
 $site_hostnames_path = $base_path . 'assets/cache/siteHostnames.php';
-if(is_file($site_hostnames_path)) include_once($site_hostnames_path);
+if(is_file($site_hostnames_path)) {
+    include_once($site_hostnames_path);
+}
 if(!defined('MGR_DIR') || MGR_DIR!==$mgr_dir) {
 	$src = "<?php\n";
 	$src .= "define('MGR_DIR', '{$mgr_dir}');\n";
@@ -117,9 +121,15 @@ 
 $incPath = str_replace("\\","/",dirname(__FILE__)."/includes/"); // Mod by Raymond
 set_include_path(get_include_path() . PATH_SEPARATOR . $incPath);
 
-if (!defined('ENT_COMPAT')) define('ENT_COMPAT', 2);
-if (!defined('ENT_NOQUOTES')) define('ENT_NOQUOTES', 0);
-if (!defined('ENT_QUOTES')) define('ENT_QUOTES', 3);
+if (!defined('ENT_COMPAT')) {
+    define('ENT_COMPAT', 2);
+}
+if (!defined('ENT_NOQUOTES')) {
+    define('ENT_NOQUOTES', 0);
+}
+if (!defined('ENT_QUOTES')) {
+    define('ENT_QUOTES', 3);
+}
 
 // set the document_root :|
 if(!isset($_SERVER['DOCUMENT_ROOT']) || empty($_SERVER['DOCUMENT_ROOT'])) {
@@ -182,10 +192,11 @@ 
 
 $s = array('[+MGR_DIR+]');
 $r = array(MGR_DIR);
-foreach($_lang as $k=>$v)
-{
-	if(strpos($v,'[+')!==false) $_lang[$k] = str_replace($s, $r, $v);
-}
+foreach($_lang as $k=>$v) {
+	if(strpos($v,'[+')!==false) {
+	    $_lang[$k] = str_replace($s, $r, $v);
+	}
+	}
 
 // send the charset header
 header('Content-Type: text/html; charset='.$modx_manager_charset);
@@ -198,7 +209,7 @@ 
 include_once "accesscontrol.inc.php";
 
 // double check the session
-if(!isset($_SESSION['mgrValidated'])){
+if(!isset($_SESSION['mgrValidated'])) {
 	echo "Not Logged In!";
 	exit;
 }
@@ -215,7 +226,9 @@ 
 }
 
 // Initialize System Alert Message Queque
-if (!isset($_SESSION['SystemAlertMsgQueque'])) $_SESSION['SystemAlertMsgQueque'] = array();
+if (!isset($_SESSION['SystemAlertMsgQueque'])) {
+    $_SESSION['SystemAlertMsgQueque'] = array();
+}
 $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
 // first we check to see if this is a frameset request
@@ -223,7 +236,7 @@ 
 	// this looks to be a top-level frameset request, so let's serve up a frameset
 	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) {
 		include_once "media/style/".$manager_theme."/frames/1.php";
-	}else{
+	} else {
 		include_once "frames/1.php";
 	}
 	exit;
@@ -231,10 +244,15 @@ 
 
 // OK, let's retrieve the action directive from the request
 $option = array('min_range'=>1,'max_range'=>2000);
-if(isset($_GET['a']) && isset($_POST['a'])) $modx->webAlertAndQuit($_lang['error_double_action']);
-elseif(isset($_GET['a']))  $action = filter_input(INPUT_GET, 'a',FILTER_VALIDATE_INT,$option);
-elseif(isset($_POST['a'])) $action = filter_input(INPUT_POST,'a',FILTER_VALIDATE_INT,$option);
-else                       $action = null;
+if(isset($_GET['a']) && isset($_POST['a'])) {
+    $modx->webAlertAndQuit($_lang['error_double_action']);
+} elseif(isset($_GET['a'])) {
+    $action = filter_input(INPUT_GET, 'a',FILTER_VALIDATE_INT,$option);
+} elseif(isset($_POST['a'])) {
+    $action = filter_input(INPUT_POST,'a',FILTER_VALIDATE_INT,$option);
+} else {
+    $action = null;
+}
 
 if (isset($_POST['updateMsgCount']) && $modx->hasPermission('messages')) {
 	include_once 'messageCount.inc.php';
@@ -264,11 +282,12 @@ 
 $modx->invokeEvent("OnManagerPageInit", array("action" => $action));
 
 // return element filepath
-function includeFileProcessor ($filepath,$manager_theme) {
+function includeFileProcessor ($filepath,$manager_theme)
+{
 	$element = "";
 	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) {
 		$element = MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath;
-	}else{
+	} else {
 		$element = $filepath;
 	}
 	return $element;

manager/frames/tree.php

Braces +4 added lines, -4 removed lines

@@ -1,11 +1,11 @@ 
 <?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.");

 }

 

 // invoke OnManagerTreeInit event

 $evtOut = $modx->invokeEvent('OnManagerTreeInit', $_REQUEST);

-if(is_array($evtOut)) {

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

 }

 ?>

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

 		// invoke OnManagerTreePrerender event

 		$evtOut = $modx->invokeEvent('OnManagerTreePrerender', $modx->db->escape($_REQUEST));

-		if(is_array($evtOut)) {

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

 		}

 		?>

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

 		// invoke OnManagerTreeRender event

 		$evtOut = $modx->invokeEvent('OnManagerTreeRender', $modx->db->escape($_REQUEST));

-		if(is_array($evtOut)) {

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

 		}

 		?>

manager/actions/bkmanager.static.php

Braces +3 added lines, -1 removed lines

@@ -597,7 +597,9 @@
                 $insertdump = $lf;
                 $insertdump .= "INSERT INTO `{$tblval}` VALUES (";
                 $arr = $this->object2Array($row);
-                if( ! is_array($arr)) $arr = array();
+                if( ! is_array($arr)) {
+                    $arr = array();
+                }
                 foreach ($arr as $key => $value) {
                     if (is_null($value)) {
                         $value = 'NULL';

manager/includes/extenders/modifiers/mdf_moduser.inc.php

Braces +5 added lines, -2 removed lines

@@ -1,8 +1,11 @@
 <?php
 $userid = (int)$value;
 if (!isset($modx->filter->cache['ui'][$userid])) {
-    if ($userid < 0) $user = $modx->getWebUserInfo(abs($userid));
-    else             $user = $modx->getUserInfo($userid);
+    if ($userid < 0) {
+        $user = $modx->getWebUserInfo(abs($userid));
+    } else {
+        $user = $modx->getUserInfo($userid);
+    }
     $modx->filter->cache['ui'][$userid] = $user;
 } else {
     $user = $modx->filter->cache['ui'][$userid];

manager/includes/extenders/modifiers/mdf_summary.inc.php

Braces +28 added lines, -13 removed lines

@@ -1,9 +1,11 @@ 
 <?php
-if(strpos($opt,',')) list($limit,$delim) = explode(',', $opt);
-elseif(preg_match('/^[1-9][0-9]*$/',$opt)) {$limit=$opt;$delim='';}
-else {$limit=124;$delim='';}
+if(strpos($opt,',')) {
+    list($limit,$delim) = explode(',', $opt);
+} elseif(preg_match('/^[1-9][0-9]*$/',$opt)) {$limit=$opt;$delim='';} else {$limit=124;$delim='';}
 
-if($delim==='') $delim = $modx->config['manager_language']==='japanese-utf8' ? '。' : '.';
+if($delim==='') {
+    $delim = $modx->config['manager_language']==='japanese-utf8' ? '。' : '.';
+}
 $limit = (int)$limit;
 
 $content = $modx->filter->parseDocumentSource($value);
@@ -11,8 +13,9 @@ 
 $content = strip_tags($content);
 
 $content = str_replace(array("\r\n","\r","\n","\t",'&nbsp;'),' ',$content);
-if(preg_match('/\s+/',$content))
+if(preg_match('/\s+/',$content)) {
     $content = preg_replace('/\s+/',' ',$content);
+}
 $content = trim($content);
 
 $pos = $modx->filter->strpos($content, $delim);
@@ -21,23 +24,35 @@ 
     $_ = explode($delim, $content);
     $text = '';
     foreach($_ as $v) {
-        if($limit <= $modx->filter->strlen($text.$v.$delim)) break;
+        if($limit <= $modx->filter->strlen($text.$v.$delim)) {
+            break;
+        }
         $text .= $v.$delim;
     }
-    if($text) $content = $text;
-}
+    if($text) {
+        $content = $text;
+    }
+    }
 
 if($limit<$modx->filter->strlen($content) && strpos($content,' ')!==false) {
     $_ = explode(' ', $content);
     $text = '';
     foreach($_ as $v) {
-        if($limit <= $modx->filter->strlen($text.$v.' ')) break;
+        if($limit <= $modx->filter->strlen($text.$v.' ')) {
+            break;
+        }
         $text .= $v . ' ';
     }
-    if($text!=='') $content = $text;
-}
+    if($text!=='') {
+        $content = $text;
+    }
+    }
 
-if($limit < $modx->filter->strlen($content)) $content = $modx->filter->substr($content, 0, $limit);
-if($modx->filter->substr($content,-1)==$delim) $content = rtrim($content,$delim) . $delim;
+if($limit < $modx->filter->strlen($content)) {
+    $content = $modx->filter->substr($content, 0, $limit);
+}
+if($modx->filter->substr($content,-1)==$delim) {
+    $content = rtrim($content,$delim) . $delim;
+}
 
 return $content;

manager/includes/controls/contextmenu.php

Braces +12 added lines, -6 removed lines

@@ -3,7 +3,8 @@ 
 global $ContextMenuCnt;
 $ContextMenuCnt = 0;
 
-class ContextMenu {
+class ContextMenu
+{
 	public $id;
     /**
      * @var string
@@ -18,7 +19,8 @@ 
      */
 	public $width = 120;
 
-    public function __construct($id = '', $width = 120, $visible = false) {
+    public function __construct($id = '', $width = 120, $visible = false)
+    {
 		global $ContextMenuCnt;
 		$ContextMenuCnt++;
 		$this->html = "";
@@ -27,7 +29,8 @@ 
 		$this->id = $id ? $id : "cntxMnu" . $ContextMenuCnt;    // set id
 	}
 
-    public function addItem($text, $action = "", $img = "", $disabled = 0) {
+    public function addItem($text, $action = "", $img = "", $disabled = 0)
+    {
 		global $base_url, $_style;
         if($disabled) {
             return;
@@ -52,13 +55,15 @@ 
 		$this->html .= $img . '&nbsp;' . $text . '</div>';
 	}
 
-    public function addSeparator() {
+    public function addSeparator()
+    {
 		$this->html .= "
 			<div class='cntxMnuSeparator'></div>
 		";
 	}
 
-    public function render() {
+    public function render()
+    {
 		global $ContextMenuScript;
 
 		$html = $ContextMenuScript . "<div id='" . $this->id . "' class='contextMenu' style='width:" . $this->width . "px; visibility:" . ($this->visible ? 'visible' : 'hidden') . "'>" . $this->html . "</div>";
@@ -66,7 +71,8 @@ 
 		return $html;
 	}
 
-    public function getClientScriptObject() {
+    public function getClientScriptObject()
+    {
 		return "getCntxMenu('" . $this->id . "')";
 	}
 }

manager/actions/mutate_module.dynamic.php

Braces +22 added lines, -21 removed lines

@@ -1,15 +1,15 @@ 
 <?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.");

 }

-switch($modx->manager->action) {

+switch($modx->manager->action) {
 	case 107:

-		if(!$modx->hasPermission('new_module')) {

+		if(!$modx->hasPermission('new_module')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 		}

 		break;

 	case 108:

-		if(!$modx->hasPermission('edit_module')) {

+		if(!$modx->hasPermission('edit_module')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 		}

 		break;

@@ -33,7 +33,8 @@ 
  *

  * @return string

  */

-function createGUID() {

+function createGUID()
+{
 	srand((double) microtime() * 1000000);

 	$r = rand();

 	$u = uniqid(getmypid() . $r . (double) microtime() * 1000000, 1);

@@ -42,7 +43,7 @@ 
 }

 

 // check to see the module editor isn't locked

-if($lockedEl = $modx->elementIsLocked(6, $id)) {

+if($lockedEl = $modx->elementIsLocked(6, $id)) {
 	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['module']));

 }

 // end check for lock

@@ -50,22 +51,22 @@ 
 // Lock snippet for other users to edit

 $modx->lockElement(6, $id);

 

-if(isset($_GET['id'])) {

+if(isset($_GET['id'])) {
 	$rs = $modx->db->select('*', $tbl_site_modules, "id='{$id}'");

 	$content = $modx->db->getRow($rs);

-	if(!$content) {

+	if(!$content) {
 		$modx->webAlertAndQuit("Module not found for id '{$id}'.");

 	}

 	$content['properties'] = str_replace("&", "&amp;", $content['properties']);

 	$_SESSION['itemname'] = $content['name'];

-	if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {

+	if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 	}

-} else {

+} else {
 	$_SESSION['itemname'] = $_lang["new_module"];

 	$content['wrap'] = '1';

 }

-if($modx->manager->hasFormValues()) {

+if($modx->manager->hasFormValues()) {
 	$modx->manager->loadFormValues();

 }

 

@@ -439,7 +440,7 @@ 
 	<?php

 	// invoke OnModFormPrerender event

 	$evtOut = $modx->invokeEvent('OnModFormPrerender', array('id' => $id));

-	if(is_array($evtOut)) {

+	if(is_array($evtOut)) {
 		echo implode('', $evtOut);

 	}

 

@@ -502,7 +503,7 @@ 
 								<option>&nbsp;</option>

 								<?php

 								include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');

-								foreach(getCategories() as $n => $v) {

+								foreach(getCategories() as $n => $v) {
 									echo "\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . "</option>\n";

 								}

 								?>

@@ -654,7 +655,7 @@ 
 					$rs = $modx->db->select('usergroup', $tbl_site_module_access, "module='{$id}'");

 					$groupsarray = $modx->db->getColumn('usergroup', $rs);

 

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

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

 						<!-- User Group Access Permissions -->

 						<script type="text/javascript">

@@ -682,21 +683,21 @@ 
 					}

 					$chk = '';

 					$rs = $modx->db->select('name, id', $tbl_membergroup_names, '', 'name');

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

+					while($row = $modx->db->getRow($rs)) {
 						$groupsarray = is_numeric($id) && $id > 0 ? $groupsarray : array();

 						$checked = in_array($row['id'], $groupsarray);

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

-							if($checked) {

+						if($modx->hasPermission('access_permissions')) {
+							if($checked) {
 								$notPublic = true;

 							}

 							$chks .= '<label><input type="checkbox" name="usrgroups[]" value="' . $row['id'] . '"' . ($checked ? ' checked="checked"' : '') . ' onclick="makePublic(false)" /> ' . $row['name'] . "</label><br />\n";

-						} else {

-							if($checked) {

+						} else {
+							if($checked) {
 								$chks = '<input type="hidden" name="usrgroups[]"  value="' . $row['id'] . '" />' . "\n" . $chks;

 							}

 						}

 					}

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

+					if($modx->hasPermission('access_permissions')) {
 						$chks = '<label><input type="checkbox" name="chkallgroups"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true)" /><span class="warning"> ' . $_lang['all_usr_groups'] . '</span></label><br />' . "\n" . $chks;

 					}

 					echo $chks;

@@ -718,7 +719,7 @@ 
 		<?php

 		// invoke OnModFormRender event

 		$evtOut = $modx->invokeEvent('OnModFormRender', array('id' => $id));

-		if(is_array($evtOut)) {

+		if(is_array($evtOut)) {
 			echo implode('', $evtOut);

 		}

 		?>