evolution-cms / evolution

manager/processors/cache_sync.class.processor.php

Braces +4 added lines, -2 removed lines

@@ -46,7 +46,8 @@ 
     }
 
     function getParents($id, $path = '')
-    { // modx:returns child's parent
+    {
+// modx:returns child's parent
         global $modx;
         if (empty($this->aliases)) {
             $f = "id, IF(alias='', id, alias) AS alias, parent, alias_visible";
@@ -403,7 +404,8 @@ 
                         $_ = trim($_);
                     }
                     $lastChar = substr($_, -1);
-                    if (!in_array($lastChar, $chars)) {// ,320,327,288,284,289
+                    if (!in_array($lastChar, $chars)) {
+// ,320,327,288,284,289
                         if (!in_array($prev_token, array(T_FOREACH, T_WHILE, T_FOR, T_BOOLEAN_AND, T_BOOLEAN_OR, T_DOUBLE_ARROW))) {
                             $_ .= ' ';
                         }

manager/processors/save_user.processor.php

Braces +8 added lines, -4 removed lines

@@ -349,7 +349,8 @@ 
 }
 
 // Send an email to the user
-function sendMailMessage($email, $uid, $pwd, $ufn) {
+function sendMailMessage($email, $uid, $pwd, $ufn)
+{
 	global $modx, $_lang, $signupemail_message;
 	global $emailsubject, $emailsender;
 	global $site_name;
@@ -378,7 +379,8 @@ 
 }
 
 // Save User Settings
-function saveUserSettings($id) {
+function saveUserSettings($id)
+{
 	global $modx;
 	$tbl_user_settings = $modx->getFullTableName('user_settings');
 
@@ -462,7 +464,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);
@@ -470,7 +473,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);

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_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/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/mainmenu.php

Braces +35 added lines, -33 removed lines

@@ -32,7 +32,7 @@ 
 	'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',

@@ -48,7 +48,7 @@ 
 	);

 }

 

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

+if($modx->hasPermission('exec_module')) {
 	$sitemenu['modules'] = array(

 		'modules',

 		'main',

@@ -64,7 +64,7 @@ 
 	);

 }

 

-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',

@@ -80,7 +80,7 @@ 
 	);

 }

 

-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',

@@ -97,7 +97,7 @@ 
 }

 

 $tab = 0;

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

+if($modx->hasPermission('edit_template')) {
 	$sitemenu['element_templates'] = array(

 		'element_templates',

 		'elements',

@@ -112,7 +112,7 @@ 
 		'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',

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

 	);

 }

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

+if($modx->hasPermission('edit_chunk')) {
 	$sitemenu['element_htmlsnippets'] = array(

 		'element_htmlsnippets',

 		'elements',

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

 	);

 }

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

+if($modx->hasPermission('edit_snippet')) {
 	$sitemenu['element_snippets'] = array(

 		'element_snippets',

 		'elements',

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

 	);

 }

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

+if($modx->hasPermission('edit_plugin')) {
 	$sitemenu['element_plugins'] = array(

 		'element_plugins',

 		'elements',

@@ -174,7 +174,7 @@ 
 }

 //$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',

@@ -189,7 +189,7 @@ 
 		''

 	);

 }

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

+if($modx->hasPermission('category_manager')) {
 	$sitemenu['manage_categories'] = array(

 		'manage_categories',

 		'elements',

@@ -206,7 +206,7 @@ 
 }

 

 // 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',

@@ -222,19 +222,19 @@ 
 	);

 }

 

-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

                 ORDER BY sm.name');

-	} else {

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

 	}

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

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

+	if($modx->db->getRecordCount($rs)) {
+	    while ($row = $modx->db->getRow($rs)) {
             $sitemenu['module' . $row['id']] = array(

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

                 'modules',

@@ -254,7 +254,7 @@ 
 

 // security menu items (users)

 

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

+if($modx->hasPermission('edit_user')) {
 	$sitemenu['user_management_title'] = array(

 		'user_management_title',

 		'users',

@@ -270,7 +270,7 @@ 
 	);

 }

 

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

+if($modx->hasPermission('edit_web_user')) {
 	$sitemenu['web_user_management_title'] = array(

 		'web_user_management_title',

 		'users',

@@ -286,7 +286,7 @@ 
 	);

 }

 

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

+if($modx->hasPermission('edit_role')) {
 	$sitemenu['role_management_title'] = array(

 		'role_management_title',

 		'users',

@@ -302,7 +302,7 @@ 
 	);

 }

 

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

+if($modx->hasPermission('access_permissions')) {
 	$sitemenu['manager_permissions'] = array(

 		'manager_permissions',

 		'users',

@@ -318,7 +318,7 @@ 
 	);

 }

 

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

+if($modx->hasPermission('web_access_permissions')) {
 	$sitemenu['web_permissions'] = array(

 		'web_permissions',

 		'users',

@@ -374,7 +374,7 @@ 
 	''

 );

 

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

+if($modx->hasPermission('bk_manager')) {
 	$sitemenu['bk_manager'] = array(

 		'bk_manager',

 		'tools',

@@ -390,7 +390,7 @@ 
 	);

 }

 

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

+if($modx->hasPermission('remove_locks')) {
 	$sitemenu['remove_locks'] = array(

 		'remove_locks',

 		'tools',

@@ -406,7 +406,7 @@ 
 	);

 }

 

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

+if($modx->hasPermission('import_static')) {
 	$sitemenu['import_site'] = array(

 		'import_site',

 		'tools',

@@ -422,7 +422,7 @@ 
 	);

 }

 

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

+if($modx->hasPermission('export_static')) {
 	$sitemenu['export_site'] = array(

 		'export_site',

 		'tools',

@@ -439,19 +439,21 @@ 
 }

 

 $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')) {

+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 {

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

 }

 $menu = new EVOmenu();

manager/media/calendar/datepicker.inc.php

Braces +6 added lines, -3 removed lines

@@ -1,10 +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');

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

Braces +7 added lines, -4 removed lines

@@ -12,17 +12,20 @@
   *      @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";
 
         $img = image::factory($driver, $file);
 
-        if ($img->initError)
-            return "Unknown image format/encoding.";
+        if ($img->initError) {
+                    return "Unknown image format/encoding.";
+        }
 
         return true;
     }