evolution-cms / evolution

manager/processors/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('access_permissions')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
@@ -117,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/processors/save_web_user.processor.php

Braces +12 added lines, -6 removed lines

@@ -335,7 +335,8 @@ 
 }
 
 // in case any plugins include a quoted_printable function
-function save_user_quoted_printable($string) {
+function save_user_quoted_printable($string)
+{
 	$crlf = "\n";
 	$string = preg_replace('!(\r\n|\r|\n)!', $crlf, $string) . $crlf;
 	$f[] = '/([\000-\010\013\014\016-\037\075\177-\377])/e';
@@ -347,7 +348,8 @@ 
 }
 
 // Send an email to the user
-function sendMailMessage($email, $uid, $pwd, $ufn) {
+function sendMailMessage($email, $uid, $pwd, $ufn)
+{
 	global $modx, $_lang, $websignupemail_message;
 	global $emailsubject, $emailsender;
 	global $site_name, $site_url;
@@ -375,7 +377,8 @@ 
 }
 
 // Save User Settings
-function saveUserSettings($id) {
+function saveUserSettings($id)
+{
 	global $modx;
 	$tbl_web_user_settings = $modx->getFullTableName('web_user_settings');
 
@@ -404,7 +407,8 @@ 
 }
 
 // Web alert -  sends an alert to web browser
-function webAlertAndQuit($msg) {
+function webAlertAndQuit($msg)
+{
 	global $id, $modx;
 	$mode = $_POST['mode'];
 	$modx->manager->saveFormValues($mode);
@@ -412,7 +416,8 @@ 
 }
 
 // Generate password
-function generate_password($length = 10) {
+function generate_password($length = 10)
+{
 	$allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
 	$ps_len = strlen($allowable_characters);
 	mt_srand((double) microtime() * 1000000);
@@ -423,7 +428,8 @@ 
 	return $pass;
 }
 
-function sanitize($str = '', $safecount = 0) {
+function sanitize($str = '', $safecount = 0)
+{
 	global $modx;
 	$safecount++;
 	if(1000 < $safecount) {

manager/processors/duplicate_tmplvars.processor.php

Braces +8 added lines, -3 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('edit_template')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
@@ -12,8 +14,11 @@ 
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_tmplvars'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_tmplvars'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate TV
 $newid = $modx->db->insert(

manager/processors/delete_eventlog.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_eventlog')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }

manager/processors/export_site.processor.php

Braces +12 added lines, -6 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('export_static')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
@@ -10,16 +12,20 @@ 
 $modx->loadExtension('EXPORT_SITE');
 
 
-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->export->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->export->generate_mode = $_POST['generate_mode'];
 

manager/processors/send_message.processor.php

Braces +9 added lines, -3 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('messages')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
@@ -8,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/login.processor.php

Braces +15 added lines, -7 removed lines

@@ -292,7 +292,8 @@ 
 }
 
 // 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>";
@@ -301,12 +302,14 @@ 
 	}
 }
 
-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);
@@ -329,7 +332,8 @@ 
 	return true;
 }
 
-function loginMD5($internalKey, $givenPassword, $dbasePassword, $username) {
+function loginMD5($internalKey, $givenPassword, $dbasePassword, $username)
+{
 	global $modx;
 
 	if($dbasePassword != md5($givenPassword)) {
@@ -339,7 +343,8 @@ 
 	return true;
 }
 
-function updateNewHash($username, $password) {
+function updateNewHash($username, $password)
+{
 	global $modx;
 
 	$field = array();
@@ -347,16 +352,19 @@ 
 	$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}'");
 

manager/frames/nodes.functions.inc.php

Braces +22 added lines, -11 removed lines

@@ -10,7 +10,8 @@ 
  * @param $theme
  * @param string $hereid
  */
-function makeHTML($indent, $parent, $expandAll, $theme, $hereid = '') {
+function makeHTML($indent, $parent, $expandAll, $theme, $hereid = '')
+{
 	global $modx;
 	global $icons, $iconsPrivate, $_style;
 	global $_lang, $opened, $opened2, $closed2; //added global vars
@@ -450,7 +451,8 @@ 
 	return $output;
 }
 
-function getIconInfo($_style) {
+function getIconInfo($_style)
+{
 	if(!isset($_style['tree_page_gif'])) {
 		$_style['tree_page_gif'] = $_style['tree_page'];
 	}
@@ -477,7 +479,8 @@ 
 	return $icons;
 }
 
-function getPrivateIconInfo($_style) {
+function getPrivateIconInfo($_style)
+{
 	if(!isset($_style['tree_page_gif_secure'])) {
 		$_style['tree_page_gif_secure'] = $_style['tree_page_secure'];
 	}
@@ -504,7 +507,8 @@ 
 	return $iconsPrivate;
 }
 
-function getNodeTitle($nodeNameSource, $row) {
+function getNodeTitle($nodeNameSource, $row)
+{
 	global $modx;
 
 	switch($nodeNameSource) {
@@ -550,7 +554,8 @@ 
 	return $nodetitle;
 }
 
-function isDateNode($nodeNameSource) {
+function isDateNode($nodeNameSource)
+{
 	switch($nodeNameSource) {
 		case 'createdon':
 		case 'editedon':
@@ -563,13 +568,15 @@ 
 	}
 }
 
-function checkIsFolder($parent = 0, $isfolder = 1) {
+function checkIsFolder($parent = 0, $isfolder = 1)
+{
 	global $modx;
 
 	return (int) $modx->db->getValue($modx->db->query('SELECT count(*) FROM ' . $modx->getFullTableName('site_content') . ' WHERE parent=' . $parent . ' AND isfolder=' . $isfolder . ' '));
 }
 
-function _htmlentities($array) {
+function _htmlentities($array)
+{
 	global $modx;
 
 	$array = json_encode($array, JSON_UNESCAPED_UNICODE);
@@ -578,7 +585,8 @@ 
 	return $array;
 }
 
-function getTplSingleNode() {
+function getTplSingleNode()
+{
 	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
@@ -602,7 +610,8 @@ 
         title="[+title+]">[+nodetitleDisplay+][+weblinkDisplay+]</span>[+pageIdDisplay+]</a></div>';
 }
 
-function getTplFolderNode() {
+function getTplFolderNode()
+{
 	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
@@ -638,7 +647,8 @@ 
         title="[+title+]">[+nodetitleDisplay+][+weblinkDisplay+]</span>[+pageIdDisplay+]</a><div>';
 }
 
-function getTplFolderNodeNotChildren() {
+function getTplFolderNodeNotChildren()
+{
 	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
@@ -670,7 +680,8 @@ 
         title="[+title+]">[+nodetitleDisplay+][+weblinkDisplay+]</span>[+pageIdDisplay+]</a><div>';
 }
 
-function dbug($str, $flag = false) {
+function dbug($str, $flag = false)
+{
 	print('<pre>');
 	print_r($str);
 	print('</pre>');

manager/frames/1.php

Braces +29 added lines, -26 removed lines

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

 

-if (IN_MANAGER_MODE != "true") {

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

 }

 header("X-XSS-Protection: 0");

@@ -12,22 +12,22 @@ 
 

 $mxla = $modx_lang_attribute ? $modx_lang_attribute : 'en';

 

-if (!isset($modx->config['manager_menu_height'])) {

+if (!isset($modx->config['manager_menu_height'])) {
     $modx->config['manager_menu_height'] = 2.2; // rem

 }

 

-if (!isset($modx->config['manager_tree_width'])) {

+if (!isset($modx->config['manager_tree_width'])) {
     $modx->config['manager_tree_width'] = 20; // rem

 }

 

-if (isset($_SESSION['onLoginForwardToAction']) && is_int($_SESSION['onLoginForwardToAction'])) {

+if (isset($_SESSION['onLoginForwardToAction']) && is_int($_SESSION['onLoginForwardToAction'])) {
     $initMainframeAction = $_SESSION['onLoginForwardToAction'];

     unset($_SESSION['onLoginForwardToAction']);

-} else {

+} else {
     $initMainframeAction = 2; // welcome.static

 }

 

-if (!isset($_SESSION['tree_show_only_folders'])) {

+if (!isset($_SESSION['tree_show_only_folders'])) {
     $_SESSION['tree_show_only_folders'] = 0;

 }

 

@@ -36,21 +36,21 @@ 
 $tree_width = $modx->config['manager_tree_width'];

 $tree_min_width = 0;

 

-if (isset($_COOKIE['MODX_widthSideBar'])) {

+if (isset($_COOKIE['MODX_widthSideBar'])) {
     $MODX_widthSideBar = $_COOKIE['MODX_widthSideBar'];

-} else {

+} else {
     $MODX_widthSideBar = $tree_width;

 }

 

-if (!$MODX_widthSideBar) {

+if (!$MODX_widthSideBar) {
     $body_class .= 'sidebar-closed';

 }

 

-if (isset($_COOKIE['MODX_themeColor'])) {

+if (isset($_COOKIE['MODX_themeColor'])) {
     $body_class .= ' ' . $_COOKIE['MODX_themeColor'];

 }

 

-if (isset($modx->pluginCache['ElementsInTree'])) {

+if (isset($modx->pluginCache['ElementsInTree'])) {
     $body_class .= ' ElementsInTree';

 }

 

@@ -66,19 +66,19 @@ 
     'type8' => $_lang["lock_element_type_8"]

 );

 

-foreach ($unlockTranslations as $key => $value) {

+foreach ($unlockTranslations as $key => $value) {
     $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);

 }

 

 $user = $modx->getUserInfo($modx->getLoginUserID());

-if ($user['which_browser'] == 'default') {

+if ($user['which_browser'] == 'default') {
     $user['which_browser'] = $modx->config['which_browser'];

 }

 

 $css = 'media/style/' . $modx->config['manager_theme'] . '/css/page.css?v=' . $lastInstallTime;

 

-if ($modx->config['manager_theme'] == 'default') {

-    if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {

+if ($modx->config['manager_theme'] == 'default') {
+    if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
         require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';

         $minifier = new Formatter\CSSMinify();

         $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css');

@@ -95,7 +95,7 @@ 
         $css = $minifier->minify();

         file_put_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css', $css);

     }

-    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {

+    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
         $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;

     }

 }

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

     // invoke OnManagerTopPrerender event

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

-    if (is_array($evtOut)) {

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

     }

     ?>

@@ -420,9 +420,12 @@ 
             <div id="evo-tab-page-home" class="evo-tab-page show">

                 <iframe id="mainframe" src="index.php?a=<?= $initMainframeAction ?>" scrolling="auto" frameborder="0" onload="modx.main.onload(event);"></iframe>

             </div>

-        <?php else: ?>

+        <?php else {
+    : ?>

             <iframe id="mainframe" name="main" src="index.php?a=<?= $initMainframeAction ?>" scrolling="auto" frameborder="0" onload="modx.main.onload(event);"></iframe>

-        <?php endif; ?>

+        <?php endif;
+}
+?>

         <div id="mainloader"></div>

     </div>

     <div id="resizer"></div>

@@ -435,11 +438,11 @@ 
             'tree_sortdir',

             'tree_nodename'

         );

-        foreach ($sortParams as $param) {

-            if (isset($_REQUEST[$param])) {

+        foreach ($sortParams as $param) {
+            if (isset($_REQUEST[$param])) {
                 $modx->manager->saveLastUserSetting($param, $_REQUEST[$param]);

                 $_SESSION[$param] = $_REQUEST[$param];

-            } else if (!isset($_SESSION[$param])) {

+            } else if (!isset($_SESSION[$param])) {
                 $_SESSION[$param] = $modx->manager->getLastUserSetting($param);

             }

         }

@@ -519,9 +522,9 @@ 
     </div>

 

     <?php

-    function constructLink($action, $img, $text, $allowed)

-    {

-        if ($allowed == 1) {

+    function constructLink($action, $img, $text, $allowed)
+    {
+        if ($allowed == 1) {
             echo sprintf('<div class="menuLink" id="item%s" onclick="modx.tree.menuHandler(%s);">', $action, $action);

             echo sprintf('<i class="%s"></i> %s</div>', $img, $text);

         }

@@ -626,7 +629,7 @@ 
     ?>

 

 </div>

-<?php if ($modx->config['show_picker'] != "0") {

+<?php if ($modx->config['show_picker'] != "0") {
     include('media/style/' . $modx->config['manager_theme'] . '/color.switcher.php');

 } ?>

 </body>