evolution-cms / evolution

manager/processors/save_content.processor.php

Indentation +1 added lines, -1 removed lines

@@ -491,7 +491,7 @@
             }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 {

Switch Indentation +220 added lines, -220 removed lines

@@ -273,11 +273,11 @@ 
 }
 
 switch ($actionToTake) {
-    case 'new' :
+        case 'new' :
 
-        // invoke OnBeforeDocFormSave event
-        switch($modx->config['docid_incrmnt_method'])
-        {
+            // invoke OnBeforeDocFormSave event
+            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";
@@ -291,7 +291,7 @@ 
             
             default:
                 $id = '';
-        }
+            }
         
         $modx->invokeEvent("OnBeforeDocFormSave", array (
             "mode" => "new",
@@ -442,256 +442,256 @@ 
 
 
         break;
-    case 'edit' :
+        case 'edit' :
 
-        // get the document's current parent
-        $oldparent = $existingDocument['parent'];
-        $doctype = $existingDocument['type'];
+            // get the document's current parent
+            $oldparent = $existingDocument['parent'];
+            $doctype = $existingDocument['type'];
 
-        if ($id == $site_start && $published == 0) {
-            $modx->manager->saveFormValues(27);
-            $modx->webAlertAndQuit("Document is linked to site_start variable and cannot be unpublished!");
-        }
-        $today = $_SERVER['REQUEST_TIME'] + $modx->config['server_offset_time'];
-        if ($id == $site_start && ($pub_date > $today || $unpub_date != "0")) {
-            $modx->manager->saveFormValues(27);
-            $modx->webAlertAndQuit("Document is linked to site_start variable and cannot have publish or unpublish dates set!");
-        }
-        if ($parent == $id) {
-            $modx->manager->saveFormValues(27);
-            $modx->webAlertAndQuit("Document can not be it's own parent!");
-        }
+            if ($id == $site_start && $published == 0) {
+                $modx->manager->saveFormValues(27);
+                $modx->webAlertAndQuit("Document is linked to site_start variable and cannot be unpublished!");
+            }
+            $today = $_SERVER['REQUEST_TIME'] + $modx->config['server_offset_time'];
+            if ($id == $site_start && ($pub_date > $today || $unpub_date != "0")) {
+                $modx->manager->saveFormValues(27);
+                $modx->webAlertAndQuit("Document is linked to site_start variable and cannot have publish or unpublish dates set!");
+            }
+            if ($parent == $id) {
+                $modx->manager->saveFormValues(27);
+                $modx->webAlertAndQuit("Document can not be it's own parent!");
+            }
 
-        $parents = $modx->getParentIds($parent);
-        if (in_array($id, $parents)) {
-            $modx->webAlertAndQuit("Document descendant can not be it's parent!");
-        }
+            $parents = $modx->getParentIds($parent);
+            if (in_array($id, $parents)) {
+                $modx->webAlertAndQuit("Document descendant can not be it's parent!");
+            }
         
-        // check to see document is a folder
-        $rs = $modx->db->select('count(id)', $tbl_site_content, "parent='{$id}'");
-        $count = $modx->db->getValue($rs);
-        if ($count > 0) {
-            $isfolder = 1;
-        }
-
-        // set publishedon and publishedby
-        $was_published = $existingDocument['published'];
-
-        // keep original publish state, if change is not permitted
-        if (!$modx->hasPermission('publish_document')) {
-            $published = $was_published;
-            $pub_date = 'pub_date';
-            $unpub_date = 'unpub_date';
-        }
+            // check to see document is a folder
+            $rs = $modx->db->select('count(id)', $tbl_site_content, "parent='{$id}'");
+            $count = $modx->db->getValue($rs);
+            if ($count > 0) {
+                $isfolder = 1;
+            }
 
-        // if it was changed from unpublished to published
-        if (!$was_published && $published) {
-            $publishedon = $currentdate;
-            $publishedby = $modx->getLoginUserID();
-            }elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
-            $publishedon = $pub_date;
-            $publishedby = $modx->getLoginUserID();
-               }elseif ($was_published && !$published) {
-            $publishedon = 0;
-            $publishedby = 0;
-        } else {
-            $publishedon = 'publishedon';
-            $publishedby = 'publishedby';
-        }
+            // set publishedon and publishedby
+            $was_published = $existingDocument['published'];
 
-        // invoke OnBeforeDocFormSave event
-        $modx->invokeEvent("OnBeforeDocFormSave", array (
-            "mode" => "upd",
-            "id" => $id
-        ));
+            // keep original publish state, if change is not permitted
+            if (!$modx->hasPermission('publish_document')) {
+                $published = $was_published;
+                $pub_date = 'pub_date';
+                $unpub_date = 'unpub_date';
+            }
 
-        // update the document
-        $modx->db->update(
-            "introtext='{$introtext}', "
-            . "content='{$content}', "
-            . "pagetitle='{$pagetitle}', "
-            . "longtitle='{$longtitle}', "
-            . "type='{$type}', "
-            . "description='{$description}', "
-            . "alias='{$alias}', "
-            . "link_attributes='{$link_attributes}', "
-            . "isfolder={$isfolder}, "
-            . "richtext={$richtext}, "
-            . "published={$published}, "
-            . "pub_date={$pub_date}, "
-            . "unpub_date={$unpub_date}, "
-            . "parent={$parent}, "
-            . "template={$template}, "
-            . "menuindex={$menuindex}, "
-            . "searchable={$searchable}, "
-            . "cacheable={$cacheable}, "
-            . "editedby=" . $modx->getLoginUserID() . ", "
-            . "editedon={$currentdate}, "
-            . "publishedon={$publishedon}, "
-            . "publishedby={$publishedby}, "
-            . "contentType='{$contentType}', "
-            . "content_dispo={$contentdispo}, "
-            . "donthit={$donthit}, "
-            . "menutitle='{$menutitle}', "
-            . "hidemenu={$hidemenu}, "
-            . "alias_visible={$aliasvisible}"
-            , $tbl_site_content, "id='{$id}'");
-
-        // update template variables
-        $rs = $modx->db->select('id, tmplvarid', $tbl_site_tmplvar_contentvalues, "contentid='{$id}'");
-        $tvIds = array ();
-        while ($row = $modx->db->getRow($rs)) {
-            $tvIds[$row['tmplvarid']] = $row['id'];
-        }
-        $tvDeletions = array();
-        $tvChanges = array();
-        foreach ($tmplvars as $field => $value) {
-            if (!is_array($value)) {
-                if (isset($tvIds[$value])) $tvDeletions[] = $tvIds[$value];
+            // if it was changed from unpublished to published
+            if (!$was_published && $published) {
+                $publishedon = $currentdate;
+                $publishedby = $modx->getLoginUserID();
+                }elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
+                $publishedon = $pub_date;
+                $publishedby = $modx->getLoginUserID();
+                   }elseif ($was_published && !$published) {
+                $publishedon = 0;
+                $publishedby = 0;
             } else {
-                $tvId = $value[0];
-                $tvVal = $value[1];
+                $publishedon = 'publishedon';
+                $publishedby = 'publishedby';
+            }
 
-                if (isset($tvIds[$tvId])) {
-                    $tvChanges[] = array(array('tmplvarid' => $tvId, 'contentid' => $id, 'value' => $modx->db->escape($tvVal)), array('id' => $tvIds[$tvId]));
+            // invoke OnBeforeDocFormSave event
+            $modx->invokeEvent("OnBeforeDocFormSave", array (
+                "mode" => "upd",
+                "id" => $id
+            ));
+
+            // update the document
+            $modx->db->update(
+                "introtext='{$introtext}', "
+                . "content='{$content}', "
+                . "pagetitle='{$pagetitle}', "
+                . "longtitle='{$longtitle}', "
+                . "type='{$type}', "
+                . "description='{$description}', "
+                . "alias='{$alias}', "
+                . "link_attributes='{$link_attributes}', "
+                . "isfolder={$isfolder}, "
+                . "richtext={$richtext}, "
+                . "published={$published}, "
+                . "pub_date={$pub_date}, "
+                . "unpub_date={$unpub_date}, "
+                . "parent={$parent}, "
+                . "template={$template}, "
+                . "menuindex={$menuindex}, "
+                . "searchable={$searchable}, "
+                . "cacheable={$cacheable}, "
+                . "editedby=" . $modx->getLoginUserID() . ", "
+                . "editedon={$currentdate}, "
+                . "publishedon={$publishedon}, "
+                . "publishedby={$publishedby}, "
+                . "contentType='{$contentType}', "
+                . "content_dispo={$contentdispo}, "
+                . "donthit={$donthit}, "
+                . "menutitle='{$menutitle}', "
+                . "hidemenu={$hidemenu}, "
+                . "alias_visible={$aliasvisible}"
+                , $tbl_site_content, "id='{$id}'");
+
+            // update template variables
+            $rs = $modx->db->select('id, tmplvarid', $tbl_site_tmplvar_contentvalues, "contentid='{$id}'");
+            $tvIds = array ();
+            while ($row = $modx->db->getRow($rs)) {
+                $tvIds[$row['tmplvarid']] = $row['id'];
+            }
+            $tvDeletions = array();
+            $tvChanges = array();
+            foreach ($tmplvars as $field => $value) {
+                if (!is_array($value)) {
+                    if (isset($tvIds[$value])) $tvDeletions[] = $tvIds[$value];
                 } else {
-                    $tvAdded[] = array('tmplvarid' => $tvId, 'contentid' => $id, 'value' => $modx->db->escape($tvVal));
+                    $tvId = $value[0];
+                    $tvVal = $value[1];
+
+                    if (isset($tvIds[$tvId])) {
+                        $tvChanges[] = array(array('tmplvarid' => $tvId, 'contentid' => $id, 'value' => $modx->db->escape($tvVal)), array('id' => $tvIds[$tvId]));
+                    } else {
+                        $tvAdded[] = array('tmplvarid' => $tvId, 'contentid' => $id, 'value' => $modx->db->escape($tvVal));
+                    }
                 }
             }
-        }
 
-        if (!empty($tvDeletions)) {
-            $modx->db->delete($tbl_site_tmplvar_contentvalues, 'id IN('.implode(',', $tvDeletions).')');
-        }
+            if (!empty($tvDeletions)) {
+                $modx->db->delete($tbl_site_tmplvar_contentvalues, 'id IN('.implode(',', $tvDeletions).')');
+            }
             
-        if (!empty($tvAdded)) {
-            foreach ($tvAdded as $tv) {
-                $modx->db->insert($tv, $tbl_site_tmplvar_contentvalues);
+            if (!empty($tvAdded)) {
+                foreach ($tvAdded as $tv) {
+                    $modx->db->insert($tv, $tbl_site_tmplvar_contentvalues);
+                }
             }
-        }
         
-        if (!empty($tvChanges)) {
-            foreach ($tvChanges as $tv) {
-                $modx->db->update($tv[0], $tbl_site_tmplvar_contentvalues, "id='{$tv[1]['id']}'");
+            if (!empty($tvChanges)) {
+                foreach ($tvChanges as $tv) {
+                    $modx->db->update($tv[0], $tbl_site_tmplvar_contentvalues, "id='{$tv[1]['id']}'");
+                }
             }
-        }
 
-        // set document permissions
-        if ($use_udperms == 1 && is_array($document_groups)) {
-            $new_groups = array();
-            // process the new input
-            foreach ($document_groups as $value_pair) {
-                list($group, $link_id) = explode(',', $value_pair); // @see actions/mutate_content.dynamic.php @ line 1138 (permissions list)
-                $new_groups[$group] = $link_id;
-            }
+            // set document permissions
+            if ($use_udperms == 1 && is_array($document_groups)) {
+                $new_groups = array();
+                // process the new input
+                foreach ($document_groups as $value_pair) {
+                    list($group, $link_id) = explode(',', $value_pair); // @see actions/mutate_content.dynamic.php @ line 1138 (permissions list)
+                    $new_groups[$group] = $link_id;
+                }
 
-            // grab the current set of permissions on this document the user can access
-            $isManager = $modx->hasPermission('access_permissions');
-            $isWeb     = $modx->hasPermission('web_access_permissions');
-            $rs = $modx->db->select(
-                'groups.id, groups.document_group',
-                "{$tbl_document_groups} AS groups
+                // grab the current set of permissions on this document the user can access
+                $isManager = $modx->hasPermission('access_permissions');
+                $isWeb     = $modx->hasPermission('web_access_permissions');
+                $rs = $modx->db->select(
+                    'groups.id, groups.document_group',
+                    "{$tbl_document_groups} AS groups
                     LEFT JOIN {$tbl_documentgroup_names} AS dgn ON dgn.id = groups.document_group",
-                "((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'];
-
-            // update the permissions in the database
-            $insertions = $deletions = array();
-            foreach ($new_groups as $group => $link_id) {
-                if (array_key_exists($group, $old_groups)) {
-                    unset($old_groups[$group]);
-                    continue;
-                } elseif ($link_id == 'new') {
-                    $insertions[] = '('.(int)$group.','.$id.')';
+                    "((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'];
+
+                // update the permissions in the database
+                $insertions = $deletions = array();
+                foreach ($new_groups as $group => $link_id) {
+                    if (array_key_exists($group, $old_groups)) {
+                        unset($old_groups[$group]);
+                        continue;
+                    } elseif ($link_id == 'new') {
+                        $insertions[] = '('.(int)$group.','.$id.')';
+                    }
+                }
+                if (!empty($insertions)) {
+                    $modx->db->query("INSERT INTO {$tbl_document_groups} (document_group, document) VALUES ".implode(',', $insertions));
+                }
+                if (!empty($old_groups)) {
+                    $modx->db->delete($tbl_document_groups, "id IN (".implode(',', $old_groups).")");
+                }
+                // necessary to remove all permissions as document is public
+                if ((isset($_POST['chkalldocs']) && $_POST['chkalldocs'] == 'on')) {
+                    $modx->db->delete($tbl_document_groups, "document='{$id}'");
                 }
             }
-            if (!empty($insertions)) {
-                $modx->db->query("INSERT INTO {$tbl_document_groups} (document_group, document) VALUES ".implode(',', $insertions));
-            }
-            if (!empty($old_groups)) {
-                $modx->db->delete($tbl_document_groups, "id IN (".implode(',', $old_groups).")");
-            }
-            // necessary to remove all permissions as document is public
-            if ((isset($_POST['chkalldocs']) && $_POST['chkalldocs'] == 'on')) {
-                $modx->db->delete($tbl_document_groups, "document='{$id}'");
+
+            // do the parent stuff
+            if ($parent != 0) {
+                $fields = array('isfolder' => 1);
+                $modx->db->update($fields, $tbl_site_content, "id='{$_REQUEST['parent']}'");
             }
-        }
 
-        // do the parent stuff
-        if ($parent != 0) {
-            $fields = array('isfolder' => 1);
-            $modx->db->update($fields, $tbl_site_content, "id='{$_REQUEST['parent']}'");
-        }
+            // finished moving the document, now check to see if the old_parent should no longer be a folder
+            $rs = $modx->db->select('COUNT(id)', $tbl_site_content, "parent='{$oldparent}'");
+            $limit = $modx->db->getValue($rs);
 
-        // finished moving the document, now check to see if the old_parent should no longer be a folder
-        $rs = $modx->db->select('COUNT(id)', $tbl_site_content, "parent='{$oldparent}'");
-        $limit = $modx->db->getValue($rs);
+            if ($limit == 0) {
+                $fields = array('isfolder' => 0);
+                $modx->db->update($fields, $tbl_site_content, "id='{$oldparent}'");
+            }
 
-        if ($limit == 0) {
-            $fields = array('isfolder' => 0);
-            $modx->db->update($fields, $tbl_site_content, "id='{$oldparent}'");
-        }
 
+            // invoke OnDocFormSave event
+            $modx->invokeEvent("OnDocFormSave", array (
+                "mode" => "upd",
+                "id" => $id
+            ));
 
-        // invoke OnDocFormSave event
-        $modx->invokeEvent("OnDocFormSave", array (
-            "mode" => "upd",
-            "id" => $id
-        ));
+            // secure web documents - flag as private
+            include MODX_MANAGER_PATH . "includes/secure_web_documents.inc.php";
+            secureWebDocument($id);
 
-        // secure web documents - flag as private
-        include MODX_MANAGER_PATH . "includes/secure_web_documents.inc.php";
-        secureWebDocument($id);
+            // secure manager documents - flag as private
+            include MODX_MANAGER_PATH . "includes/secure_mgr_documents.inc.php";
+            secureMgrDocument($id);
 
-        // secure manager documents - flag as private
-        include MODX_MANAGER_PATH . "includes/secure_mgr_documents.inc.php";
-        secureMgrDocument($id);
-
-        // Set the item name for logger
-        $_SESSION['itemname'] = $no_esc_pagetitle;
+            // Set the item name for logger
+            $_SESSION['itemname'] = $no_esc_pagetitle;
 
-        if ($syncsite == 1) {
-            // empty cache
-            $keys = array('alias','parent','published','isfolder','menuindex','alias_visible');
-            $flag = '';
-            foreach($keys as $key) {
-                if ($existingDocument[$key]===$_POST[$key]) continue;
-                $flag = 'full';
-                break;
+            if ($syncsite == 1) {
+                // empty cache
+                $keys = array('alias','parent','published','isfolder','menuindex','alias_visible');
+                $flag = '';
+                foreach($keys as $key) {
+                    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['stay'] != '2' && $id > 0) {
-                $modx->unlockElement(7, $id);
-            }
-            if ($_POST['stay'] != '') {
-                $id = $_REQUEST['id'];
-                if ($type == "reference") {
-                    // weblink
-                    $a = ($_POST['stay'] == '2') ? "27&id=$id" : "72&pid=$parent";
+            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);
+                }
+                if ($_POST['stay'] != '') {
+                    $id = $_REQUEST['id'];
+                    if ($type == "reference") {
+                        // weblink
+                        $a = ($_POST['stay'] == '2') ? "27&id=$id" : "72&pid=$parent";
+                    } else {
+                        // document
+                        $a = ($_POST['stay'] == '2') ? "27&id=$id" : "4&pid=$parent";
+                    }
+                    $header = "Location: index.php?a=" . $a . "&r=1&stay=" . $_POST['stay'].$add_path;
                 } else {
-                    // document
-                    $a = ($_POST['stay'] == '2') ? "27&id=$id" : "4&pid=$parent";
+                    $header = "Location: index.php?a=3&id=$id&r=1".$add_path;
                 }
-                $header = "Location: index.php?a=" . $a . "&r=1&stay=" . $_POST['stay'].$add_path;
+            }
+            if (headers_sent()) {
+                $header = str_replace('Location: ','',$header);
+                echo "<script>document.location.href='$header';</script>\n";
             } else {
-                $header = "Location: index.php?a=3&id=$id&r=1".$add_path;
+                header($header);
             }
-        }
-        if (headers_sent()) {
-            $header = str_replace('Location: ','',$header);
-            echo "<script>document.location.href='$header';</script>\n";
-        } else {
-            header($header);
-        }
-        break;
-    default :
-        $modx->webAlertAndQuit("No operation set in request.");
+            break;
+        default :
+            $modx->webAlertAndQuit("No operation set in request.");
 }

Spacing +84 added lines, -85 removed lines

@@ -1,5 +1,5 @@ 
 <?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"]);
 }
@@ -34,10 +34,10 @@ 
 $aliasvisible = $_POST['alias_visible'];
 
 /************* webber ********/
-$sd=isset($_POST['dir'])?'&dir='.$_POST['dir']:'&dir=DESC';
-$sb=isset($_POST['sort'])?'&sort='.$_POST['sort']:'&sort=pub_date';
-$pg=isset($_POST['page'])?'&page='.(int)$_POST['page']:'';
-$add_path=$sd.$sb.$pg;
+$sd = isset($_POST['dir']) ? '&dir='.$_POST['dir'] : '&dir=DESC';
+$sb = isset($_POST['sort']) ? '&sort='.$_POST['sort'] : '&sort=pub_date';
+$pg = isset($_POST['page']) ? '&page='.(int) $_POST['page'] : '';
+$add_path = $sd.$sb.$pg;
 
 
 
@@ -71,7 +71,7 @@ 
     // auto assign alias
     if (!$alias && $automatic_alias) {
         $alias = strtolower($modx->stripAlias(trim($pagetitle)));
-        if(!$allow_duplicate_alias) {
+        if (!$allow_duplicate_alias) {
             if ($modx->db->getValue($modx->db->select('COUNT(id)', $tbl_site_content, "id<>'$id' AND alias='$alias'")) != 0) {
                 $cnt = 1;
                 $tempAlias = $alias;
@@ -82,7 +82,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;
@@ -163,19 +163,19 @@ 
 }
 
 // get document groups for current user
-$tmplvars = array ();
+$tmplvars = array();
 if ($_SESSION['mgrDocgroups']) {
     $docgrp = implode(",", $_SESSION['mgrDocgroups']);
 }
 
 // ensure that user has not made this document inaccessible to themselves
-if($_SESSION['mgrRole'] != 1 && is_array($document_groups)) {
+if ($_SESSION['mgrRole'] != 1 && is_array($document_groups)) {
     $document_group_list = implode(',', $document_groups);
-    $document_group_list = implode(',', array_filter(explode(',',$document_group_list), 'is_numeric'));
-    if(!empty($document_group_list)) {
+    $document_group_list = implode(',', array_filter(explode(',', $document_group_list), 'is_numeric'));
+    if (!empty($document_group_list)) {
         $rs = $modx->db->select('COUNT(mg.id)', "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg", "mga.membergroup = mg.user_group AND mga.documentgroup IN({$document_group_list}) AND mg.member = {$_SESSION['mgrInternalKey']}");
         $count = $modx->db->getValue($rs);
-        if($count == 0) {
+        if ($count == 0) {
             if ($actionToTake == 'edit') {
                 $modx->manager->saveFormValues(27);
                 $modx->webAlertAndQuit(sprintf($_lang["resource_permissions_error"]), "index.php?a=27&id={$id}");
@@ -193,45 +193,45 @@ 
         INNER JOIN {$tbl_site_tmplvar_templates} AS tvtpl ON tvtpl.tmplvarid = tv.id
         LEFT JOIN {$tbl_site_tmplvar_contentvalues} AS tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$id}'
         LEFT JOIN {$tbl_site_tmplvar_access} AS tva ON tva.tmplvarid=tv.id",
-    "tvtpl.templateid = '{$template}' AND (1='{$_SESSION['mgrRole']}' OR ISNULL(tva.documentgroup)" . ((!$docgrp) ? "" : " OR tva.documentgroup IN ($docgrp)") . ")",
+    "tvtpl.templateid = '{$template}' AND (1='{$_SESSION['mgrRole']}' OR ISNULL(tva.documentgroup)".((!$docgrp) ? "" : " OR tva.documentgroup IN ($docgrp)").")",
     "tv.rank"
     );
 while ($row = $modx->db->getRow($rs)) {
     $tmplvar = '';
     switch ($row['type']) {
         case 'url':
-            $tmplvar = $_POST["tv" . $row['id']];
-            if ($_POST["tv" . $row['id'] . '_prefix'] != '--') {
-                $tmplvar = str_replace(array (
+            $tmplvar = $_POST["tv".$row['id']];
+            if ($_POST["tv".$row['id'].'_prefix'] != '--') {
+                $tmplvar = str_replace(array(
                     "feed://",
                     "ftp://",
                     "http://",
                     "https://",
                     "mailto:"
                 ), "", $tmplvar);
-                $tmplvar = $_POST["tv" . $row['id'] . '_prefix'] . $tmplvar;
+                $tmplvar = $_POST["tv".$row['id'].'_prefix'].$tmplvar;
             }
         break;
         case 'file':
-            $tmplvar = $_POST["tv" . $row['id']];
+            $tmplvar = $_POST["tv".$row['id']];
         break;
         default:
-            if (is_array($_POST["tv" . $row['id']])) {
+            if (is_array($_POST["tv".$row['id']])) {
                 // handles checkboxes & multiple selects elements
-                $feature_insert = array ();
-                $lst = $_POST["tv" . $row['id']];
+                $feature_insert = array();
+                $lst = $_POST["tv".$row['id']];
                 while (list ($featureValue, $feature_item) = each($lst)) {
                     $feature_insert[count($feature_insert)] = $feature_item;
                 }
                 $tmplvar = implode("||", $feature_insert);
             } else {
-                $tmplvar = $_POST["tv" . $row['id']];
+                $tmplvar = $_POST["tv".$row['id']];
             }
         break;
     }
     // save value if it was modified
     if (strlen($tmplvar) > 0 && $tmplvar != $row['default_text']) {
-        $tmplvars[$row['id']] = array (
+        $tmplvars[$row['id']] = array(
             $row['id'],
             $tmplvar
         );
@@ -254,7 +254,7 @@ 
 // check to see if the user is allowed to save the document in the place he wants to save it in
 if ($use_udperms == 1) {
     if ($existingDocument['parent'] != $parent) {
-        include_once MODX_MANAGER_PATH ."processors/user_documents_permissions.class.php";
+        include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
         $udperms = new udperms();
         $udperms->user = $modx->getLoginUserID();
         $udperms->document = $parent;
@@ -276,7 +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";
@@ -285,7 +285,7 @@ 
                 $id = $modx->db->getValue($rs);
                 break;
             case '2':
-                $rs = $modx->db->select('MAX(id)+1',$tbl_site_content);
+                $rs = $modx->db->select('MAX(id)+1', $tbl_site_content);
                 $id = $modx->db->getValue($rs);
             break;
             
@@ -293,7 +293,7 @@ 
                 $id = '';
         }
         
-        $modx->invokeEvent("OnBeforeDocFormSave", array (
+        $modx->invokeEvent("OnBeforeDocFormSave", array(
             "mode" => "new",
             "id" => $id
         ));
@@ -308,48 +308,47 @@ 
         $publishedon = ($published ? $currentdate : 0);
         $publishedby = ($published ? $modx->getLoginUserID() : 0);
 
-        if ((!empty($pub_date))&&($published)){
-            $publishedon=$pub_date;
-        }
-
-        $dbInsert = array
-        (
-            "introtext"        => $introtext ,
-            "content"          => $content ,
-            "pagetitle"        => $pagetitle ,
-            "longtitle"        => $longtitle ,
-            "type"             => $type ,
-            "description"      => $description ,
-            "alias"            => $alias ,
-            "link_attributes"  => $link_attributes ,
-            "isfolder"         => $isfolder ,
-            "richtext"         => $richtext ,
-            "published"        => $published ,
-            "parent"           => $parent ,
-            "template"         => $template ,
-            "menuindex"        => $menuindex ,
-            "searchable"       => $searchable ,
-            "cacheable"        => $cacheable ,
-            "createdby"        => $modx->getLoginUserID() ,
-            "createdon"        => $currentdate ,
-            "editedby"         => $modx->getLoginUserID() ,
-            "editedon"         => $currentdate ,
-            "publishedby"      => $publishedby ,
-            "publishedon"      => $publishedon ,
-            "pub_date"         => $pub_date ,
-            "unpub_date"       => $unpub_date ,
-            "contentType"      => $contentType ,
-            "content_dispo"    => $contentdispo ,
-            "donthit"          => $donthit ,
-            "menutitle"        => $menutitle ,
-            "hidemenu"         => $hidemenu ,
+        if ((!empty($pub_date)) && ($published)) {
+            $publishedon = $pub_date;
+        }
+
+        $dbInsert = array(
+            "introtext"        => $introtext,
+            "content"          => $content,
+            "pagetitle"        => $pagetitle,
+            "longtitle"        => $longtitle,
+            "type"             => $type,
+            "description"      => $description,
+            "alias"            => $alias,
+            "link_attributes"  => $link_attributes,
+            "isfolder"         => $isfolder,
+            "richtext"         => $richtext,
+            "published"        => $published,
+            "parent"           => $parent,
+            "template"         => $template,
+            "menuindex"        => $menuindex,
+            "searchable"       => $searchable,
+            "cacheable"        => $cacheable,
+            "createdby"        => $modx->getLoginUserID(),
+            "createdon"        => $currentdate,
+            "editedby"         => $modx->getLoginUserID(),
+            "editedon"         => $currentdate,
+            "publishedby"      => $publishedby,
+            "publishedon"      => $publishedon,
+            "pub_date"         => $pub_date,
+            "unpub_date"       => $unpub_date,
+            "contentType"      => $contentType,
+            "content_dispo"    => $contentdispo,
+            "donthit"          => $donthit,
+            "menutitle"        => $menutitle,
+            "hidemenu"         => $hidemenu,
             "alias_visible"    => $aliasvisible
         );
 
         if ($id != '')
             $dbInsert["id"] = $id;
 
-        $key = $modx->db->insert( $dbInsert, $tbl_site_content);
+        $key = $modx->db->insert($dbInsert, $tbl_site_content);
 
         $tvChanges = array();
         foreach ($tmplvars as $field => $value) {
@@ -371,7 +370,7 @@ 
             foreach ($document_groups as $value_pair) {
                 // first, split the pair (this is a new document, so ignore the second value
                 list($group) = explode(',', $value_pair); // @see actions/mutate_content.dynamic.php @ line 1138 (permissions list)
-                $new_groups[] = '('.(int)$group.','.$key.')';
+                $new_groups[] = '('.(int) $group.','.$key.')';
             }
             $saved = true;
             if (!empty($new_groups)) {
@@ -380,7 +379,7 @@ 
         } else {
             $isManager = $modx->hasPermission('access_permissions');
             $isWeb     = $modx->hasPermission('web_access_permissions');
-            if($use_udperms && !($isManager || $isWeb) && $parent != 0) {
+            if ($use_udperms && !($isManager || $isWeb) && $parent != 0) {
                 // inherit document access permissions
                 $modx->db->insert(
                     array(
@@ -399,17 +398,17 @@ 
         }
 
         // invoke OnDocFormSave event
-        $modx->invokeEvent("OnDocFormSave", array (
+        $modx->invokeEvent("OnDocFormSave", array(
             "mode" => "new",
             "id" => $key
         ));
 
         // secure web documents - flag as private
-        include MODX_MANAGER_PATH . "includes/secure_web_documents.inc.php";
+        include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php";
         secureWebDocument($key);
 
         // secure manager documents - flag as private
-        include MODX_MANAGER_PATH . "includes/secure_mgr_documents.inc.php";
+        include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php";
         secureMgrDocument($key);
 
         // Set the item name for logger
@@ -428,13 +427,13 @@ 
             // document
             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'];
+            $header = "Location: index.php?a=".$a."&r=1&stay=".$_POST['stay'];
         } else {
             $header = "Location: index.php?a=3&id=$key&r=1";
         }
         
         if (headers_sent()) {
-            $header = str_replace('Location: ','',$header);
+            $header = str_replace('Location: ', '', $header);
             echo "<script>document.location.href='$header';</script>\n";
         } else {
             header($header);
@@ -488,7 +487,7 @@ 
         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) {
@@ -500,7 +499,7 @@ 
         }
 
         // invoke OnBeforeDocFormSave event
-        $modx->invokeEvent("OnBeforeDocFormSave", array (
+        $modx->invokeEvent("OnBeforeDocFormSave", array(
             "mode" => "upd",
             "id" => $id
         ));
@@ -525,7 +524,7 @@ 
             . "menuindex={$menuindex}, "
             . "searchable={$searchable}, "
             . "cacheable={$cacheable}, "
-            . "editedby=" . $modx->getLoginUserID() . ", "
+            . "editedby=".$modx->getLoginUserID().", "
             . "editedon={$currentdate}, "
             . "publishedon={$publishedon}, "
             . "publishedby={$publishedby}, "
@@ -539,7 +538,7 @@ 
 
         // update template variables
         $rs = $modx->db->select('id, tmplvarid', $tbl_site_tmplvar_contentvalues, "contentid='{$id}'");
-        $tvIds = array ();
+        $tvIds = array();
         while ($row = $modx->db->getRow($rs)) {
             $tvIds[$row['tmplvarid']] = $row['id'];
         }
@@ -592,7 +591,7 @@ 
                 'groups.id, groups.document_group',
                 "{$tbl_document_groups} AS groups
                     LEFT JOIN {$tbl_documentgroup_names} AS dgn ON dgn.id = groups.document_group",
-                "((1=".(int)$isManager." AND dgn.private_memgroup) OR (1=".(int)$isWeb." AND dgn.private_webgroup)) AND groups.document = '{$id}'"
+                "((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'];
@@ -604,7 +603,7 @@ 
                     unset($old_groups[$group]);
                     continue;
                 } elseif ($link_id == 'new') {
-                    $insertions[] = '('.(int)$group.','.$id.')';
+                    $insertions[] = '('.(int) $group.','.$id.')';
                 }
             }
             if (!empty($insertions)) {
@@ -636,17 +635,17 @@ 
 
 
         // invoke OnDocFormSave event
-        $modx->invokeEvent("OnDocFormSave", array (
+        $modx->invokeEvent("OnDocFormSave", array(
             "mode" => "upd",
             "id" => $id
         ));
 
         // secure web documents - flag as private
-        include MODX_MANAGER_PATH . "includes/secure_web_documents.inc.php";
+        include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php";
         secureWebDocument($id);
 
         // secure manager documents - flag as private
-        include MODX_MANAGER_PATH . "includes/secure_mgr_documents.inc.php";
+        include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php";
         secureMgrDocument($id);
 
         // Set the item name for logger
@@ -654,14 +653,14 @@ 
 
         if ($syncsite == 1) {
             // empty cache
-            $keys = array('alias','parent','published','isfolder','menuindex','alias_visible');
+            $keys = array('alias', 'parent', 'published', 'isfolder', 'menuindex', 'alias_visible');
             $flag = '';
-            foreach($keys as $key) {
-                if ($existingDocument[$key]===$_POST[$key]) continue;
+            foreach ($keys as $key) {
+                if ($existingDocument[$key] === $_POST[$key]) continue;
                 $flag = 'full';
                 break;
             }
-            if($flag==='full') $modx->clearCache('full');
+            if ($flag === 'full') $modx->clearCache('full');
             else               $modx->clearCache($id);
         }
         
@@ -680,13 +679,13 @@ 
                     // document
                     $a = ($_POST['stay'] == '2') ? "27&id=$id" : "4&pid=$parent";
                 }
-                $header = "Location: index.php?a=" . $a . "&r=1&stay=" . $_POST['stay'].$add_path;
+                $header = "Location: index.php?a=".$a."&r=1&stay=".$_POST['stay'].$add_path;
             } else {
                 $header = "Location: index.php?a=3&id=$id&r=1".$add_path;
             }
         }
         if (headers_sent()) {
-            $header = str_replace('Location: ','',$header);
+            $header = str_replace('Location: ', '', $header);
             echo "<script>document.location.href='$header';</script>\n";
         } else {
             header($header);

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

Indentation +1 added lines, -1 removed lines

@@ -1,7 +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(!$modx->hasPermission('settings')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $modx->db->truncate($modx->getFullTableName('manager_log'));

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@
 <?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('settings')) {
+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"]);
 }
 
 $modx->db->truncate($modx->getFullTableName('manager_log'));
 
-$header="Location: index.php?a=13";
+$header = "Location: index.php?a=13";
 header($header);

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"]);
 }

manager/processors/delete_module.processor.php

Indentation +8 added lines, -8 removed lines

@@ -1,12 +1,12 @@ 
 <?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_module')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? intval($_GET['id']) : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // Set the item name for logger
@@ -15,9 +15,9 @@ 
 
 // invoke OnBeforeModFormDelete event
 $modx->invokeEvent("OnBeforeModFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // delete the module.
 $modx->db->delete($modx->getFullTableName('site_modules'), "id='{$id}'");
@@ -30,9 +30,9 @@ 
 
 // invoke OnModFormDelete event
 $modx->invokeEvent("OnModFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // empty cache
 $modx->clearCache('full');

Spacing +5 added lines, -5 removed lines

@@ -1,11 +1,11 @@ 
 <?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_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('delete_module')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? intval($_GET['id']) : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
@@ -38,5 +38,5 @@ 
 $modx->clearCache('full');
 
 // finished emptying cache - redirect
-$header="Location: index.php?a=106&r=2";
+$header = "Location: index.php?a=106&r=2";
 header($header);

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_module')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }

manager/processors/save_password.processor.php

Indentation +14 added lines, -14 removed lines

@@ -1,7 +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(!$modx->hasPermission('save_password')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = $_POST['id'];
@@ -9,26 +9,26 @@ 
 $pass2 = $_POST['pass2'];
 
 if($pass1!=$pass2){
-	$modx->webAlertAndQuit("Passwords don't match!");
+    $modx->webAlertAndQuit("Passwords don't match!");
 }
 
 if(strlen($pass1)<6){
-	$modx->webAlertAndQuit("Password is too short. Please specify a password of at least 6 characters.");
+    $modx->webAlertAndQuit("Password is too short. Please specify a password of at least 6 characters.");
 }
 
     $pass1 = $modx->htmlspecialchars($pass1, ENT_NOQUOTES);
-	$tbl_manager_users = $modx->getFullTableName('manager_users');
-	$uid = $modx->getLoginUserID();
-	$modx->loadExtension('phpass');
-	$f['password'] = $modx->phpass->HashPassword($pass1);
-	$modx->db->update($f,$tbl_manager_users,"id='{$uid}'");
+    $tbl_manager_users = $modx->getFullTableName('manager_users');
+    $uid = $modx->getLoginUserID();
+    $modx->loadExtension('phpass');
+    $f['password'] = $modx->phpass->HashPassword($pass1);
+    $modx->db->update($f,$tbl_manager_users,"id='{$uid}'");
 
-	// invoke OnManagerChangePassword event
-	$modx->invokeEvent('OnManagerChangePassword', array (
-		'userid' => $uid,
-		'username' => $_SESSION['mgrShortname'],
-		'userpassword' => $pass1
-	));
+    // invoke OnManagerChangePassword event
+    $modx->invokeEvent('OnManagerChangePassword', array (
+        'userid' => $uid,
+        'username' => $_SESSION['mgrShortname'],
+        'userpassword' => $pass1
+    ));
 
 $header="Location: index.php?a=2";
 header($header);

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?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('save_password')) {
+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_password')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -8,11 +8,11 @@ 
 $pass1 = $_POST['pass1'];
 $pass2 = $_POST['pass2'];
 
-if($pass1!=$pass2){
+if ($pass1 != $pass2) {
 	$modx->webAlertAndQuit("Passwords don't match!");
 }
 
-if(strlen($pass1)<6){
+if (strlen($pass1) < 6) {
 	$modx->webAlertAndQuit("Password is too short. Please specify a password of at least 6 characters.");
 }
 
@@ -21,14 +21,14 @@ 
 	$uid = $modx->getLoginUserID();
 	$modx->loadExtension('phpass');
 	$f['password'] = $modx->phpass->HashPassword($pass1);
-	$modx->db->update($f,$tbl_manager_users,"id='{$uid}'");
+	$modx->db->update($f, $tbl_manager_users, "id='{$uid}'");
 
 	// invoke OnManagerChangePassword event
-	$modx->invokeEvent('OnManagerChangePassword', array (
+	$modx->invokeEvent('OnManagerChangePassword', array(
 		'userid' => $uid,
 		'username' => $_SESSION['mgrShortname'],
 		'userpassword' => $pass1
 	));
 
-$header="Location: index.php?a=2";
+$header = "Location: index.php?a=2";
 header($header);

Braces +5 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('save_password')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
@@ -8,11 +10,11 @@ 
 $pass1 = $_POST['pass1'];
 $pass2 = $_POST['pass2'];
 
-if($pass1!=$pass2){
+if($pass1!=$pass2) {
 	$modx->webAlertAndQuit("Passwords don't match!");
 }
 
-if(strlen($pass1)<6){
+if(strlen($pass1)<6) {
 	$modx->webAlertAndQuit("Password is too short. Please specify a password of at least 6 characters.");
 }
 

manager/processors/delete_htmlsnippet.processor.php

Indentation +8 added lines, -8 removed lines

@@ -1,12 +1,12 @@ 
 <?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_snippet')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? intval($_GET['id']) : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // Set the item name for logger
@@ -15,18 +15,18 @@ 
 
 // invoke OnBeforeChunkFormDelete event
 $modx->invokeEvent("OnBeforeChunkFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // delete the chunk.
 $modx->db->delete($modx->getFullTableName('site_htmlsnippets'), "id='{$id}'");
 
 // invoke OnChunkFormDelete event
 $modx->invokeEvent("OnChunkFormDelete",
-	array(
-		"id"	=> $id
-	));
+    array(
+        "id"	=> $id
+    ));
 
 // empty cache
 $modx->clearCache('full');

Spacing +5 added lines, -5 removed lines

@@ -1,11 +1,11 @@ 
 <?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_snippet')) {
+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"]);
 }
 
-$id = isset($_GET['id'])? intval($_GET['id']) : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
@@ -32,5 +32,5 @@ 
 $modx->clearCache('full');
 
 // finished emptying cache - redirect
-$header="Location: index.php?a=76&r=2";
+$header = "Location: index.php?a=76&r=2";
 header($header);

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/access_groups.processor.php

Indentation +95 added lines, -95 removed lines

@@ -1,7 +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(!$modx->hasPermission('access_permissions')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // access group processor.
@@ -18,113 +18,113 @@ 
 $operation = $_REQUEST['operation'];
 
 switch ($operation) {
-	case "add_user_group" :
-		$newgroup = $_REQUEST['newusergroup'];
-		if(empty($newgroup)) {
-			$modx->webAlertAndQuit("No group name specified.");
-		} else {
-			$id = $modx->db->insert(array('name' => $modx->db->escape($newgroup)), $tbl_membergroup_names);
+    case "add_user_group" :
+        $newgroup = $_REQUEST['newusergroup'];
+        if(empty($newgroup)) {
+            $modx->webAlertAndQuit("No group name specified.");
+        } else {
+            $id = $modx->db->insert(array('name' => $modx->db->escape($newgroup)), $tbl_membergroup_names);
 
-			// invoke OnManagerCreateGroup event
-			$modx->invokeEvent('OnManagerCreateGroup', array(
-				'groupid'   => $id,
-				'groupname' => $newgroup,
-			));
-		}
-	break;
-	case "add_document_group" :
-		$newgroup = $_REQUEST['newdocgroup'];
-		if(empty($newgroup)) {
-			$modx->webAlertAndQuit("No group name specified.");
-		} else {
-			$id = $modx->db->insert(array('name' => $modx->db->escape($newgroup)), $tbl_documentgroup_names);
+            // invoke OnManagerCreateGroup event
+            $modx->invokeEvent('OnManagerCreateGroup', array(
+                'groupid'   => $id,
+                'groupname' => $newgroup,
+            ));
+        }
+    break;
+    case "add_document_group" :
+        $newgroup = $_REQUEST['newdocgroup'];
+        if(empty($newgroup)) {
+            $modx->webAlertAndQuit("No group name specified.");
+        } else {
+            $id = $modx->db->insert(array('name' => $modx->db->escape($newgroup)), $tbl_documentgroup_names);
 
-			// invoke OnCreateDocGroup event
-			$modx->invokeEvent('OnCreateDocGroup', array(
-				'groupid'   => $id,
-				'groupname' => $newgroup,
-			));
-		}
-	break;
-	case "delete_user_group" :
-		$updategroupaccess = true;
-		$usergroup = intval($_REQUEST['usergroup']);
-		if(empty($usergroup)) {
-			$modx->webAlertAndQuit("No user group id specified for deletion.");
-		} else {
-			$modx->db->delete($tbl_membergroup_names, "id='{$usergroup}'");
+            // invoke OnCreateDocGroup event
+            $modx->invokeEvent('OnCreateDocGroup', array(
+                'groupid'   => $id,
+                'groupname' => $newgroup,
+            ));
+        }
+    break;
+    case "delete_user_group" :
+        $updategroupaccess = true;
+        $usergroup = intval($_REQUEST['usergroup']);
+        if(empty($usergroup)) {
+            $modx->webAlertAndQuit("No user group id specified for deletion.");
+        } else {
+            $modx->db->delete($tbl_membergroup_names, "id='{$usergroup}'");
 			
-			$modx->db->delete($tbl_membergroup_access, "membergroup='{$usergroup}'");
+            $modx->db->delete($tbl_membergroup_access, "membergroup='{$usergroup}'");
 			
-			$modx->db->delete($tbl_member_groups, "user_group='{$usergroup}'");
-		}
-	break;
-	case "delete_document_group" :
-		$group = intval($_REQUEST['documentgroup']);
-		if(empty($group)) {
-			$modx->webAlertAndQuit("No document group id specified for deletion.");
-		} else {
-			$modx->db->delete($tbl_documentgroup_names, "id='{$group}'");
+            $modx->db->delete($tbl_member_groups, "user_group='{$usergroup}'");
+        }
+    break;
+    case "delete_document_group" :
+        $group = intval($_REQUEST['documentgroup']);
+        if(empty($group)) {
+            $modx->webAlertAndQuit("No document group id specified for deletion.");
+        } else {
+            $modx->db->delete($tbl_documentgroup_names, "id='{$group}'");
 			
-			$modx->db->delete($tbl_membergroup_access, "documentgroup='{$group}'");
+            $modx->db->delete($tbl_membergroup_access, "documentgroup='{$group}'");
 			
-			$modx->db->delete($tbl_document_groups, "document_group='{$group}'");
-		}
-	break;
-	case "rename_user_group" :
-		$newgroupname = $_REQUEST['newgroupname'];
-		if(empty($newgroupname)) {
-			$modx->webAlertAndQuit("No group name specified.");
-		}
-		$groupid = intval($_REQUEST['groupid']);
-		if(empty($groupid)) {
-			$modx->webAlertAndQuit("No group id specified for rename.");
-		}
+            $modx->db->delete($tbl_document_groups, "document_group='{$group}'");
+        }
+    break;
+    case "rename_user_group" :
+        $newgroupname = $_REQUEST['newgroupname'];
+        if(empty($newgroupname)) {
+            $modx->webAlertAndQuit("No group name specified.");
+        }
+        $groupid = intval($_REQUEST['groupid']);
+        if(empty($groupid)) {
+            $modx->webAlertAndQuit("No group id specified for rename.");
+        }
 
-		$modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_membergroup_names, "id='{$groupid}'");
-	break;
-	case "rename_document_group" :
-		$newgroupname = $_REQUEST['newgroupname'];
-		if(empty($newgroupname)) {
-			$modx->webAlertAndQuit("No group name specified.");
-		}
-		$groupid = intval($_REQUEST['groupid']);
-		if(empty($groupid)) {
-			$modx->webAlertAndQuit("No group id specified for rename.");
-		}
+        $modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_membergroup_names, "id='{$groupid}'");
+    break;
+    case "rename_document_group" :
+        $newgroupname = $_REQUEST['newgroupname'];
+        if(empty($newgroupname)) {
+            $modx->webAlertAndQuit("No group name specified.");
+        }
+        $groupid = intval($_REQUEST['groupid']);
+        if(empty($groupid)) {
+            $modx->webAlertAndQuit("No group id specified for rename.");
+        }
 
-		$modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_documentgroup_names, "id='{$groupid}'");
-	break;
-	case "add_document_group_to_user_group" :
-		$updategroupaccess = true;
-		$usergroup = intval($_REQUEST['usergroup']);
-		$docgroup = intval($_REQUEST['docgroup']);
-		$rs = $modx->db->select('COUNT(*)', $tbl_membergroup_access, "membergroup='{$usergroup}' AND documentgroup='{$docgroup}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit<=0) {
-			$modx->db->insert(array('membergroup' => $usergroup, 'documentgroup' => $docgroup), $tbl_membergroup_access);
-		} else {
-			//alert user that coupling already exists?
-		}
-	break;
-	case "remove_document_group_from_user_group" :
-		$updategroupaccess = true;
-		$coupling = intval($_REQUEST['coupling']);
-		$modx->db->delete($tbl_membergroup_access, "id='{$coupling}'");
-	break;
-	default :
-		$modx->webAlertAndQuit("No operation set in request.");
+        $modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_documentgroup_names, "id='{$groupid}'");
+    break;
+    case "add_document_group_to_user_group" :
+        $updategroupaccess = true;
+        $usergroup = intval($_REQUEST['usergroup']);
+        $docgroup = intval($_REQUEST['docgroup']);
+        $rs = $modx->db->select('COUNT(*)', $tbl_membergroup_access, "membergroup='{$usergroup}' AND documentgroup='{$docgroup}'");
+        $limit = $modx->db->getValue($rs);
+        if($limit<=0) {
+            $modx->db->insert(array('membergroup' => $usergroup, 'documentgroup' => $docgroup), $tbl_membergroup_access);
+        } else {
+            //alert user that coupling already exists?
+        }
+    break;
+    case "remove_document_group_from_user_group" :
+        $updategroupaccess = true;
+        $coupling = intval($_REQUEST['coupling']);
+        $modx->db->delete($tbl_membergroup_access, "id='{$coupling}'");
+    break;
+    default :
+        $modx->webAlertAndQuit("No operation set in request.");
 }
 
 // secure manager documents - flag as private
 if($updategroupaccess==true){
-	include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php";
-	secureMgrDocument();
+    include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php";
+    secureMgrDocument();
 
-	// Update the private group column
-	$modx->db->update(
-		'dgn.private_memgroup = (mga.membergroup IS NOT NULL)',
-		"{$tbl_documentgroup_names} AS dgn LEFT JOIN {$tbl_membergroup_access} AS mga ON mga.documentgroup = dgn.id");
+    // Update the private group column
+    $modx->db->update(
+        'dgn.private_memgroup = (mga.membergroup IS NOT NULL)',
+        "{$tbl_documentgroup_names} AS dgn LEFT JOIN {$tbl_membergroup_access} AS mga ON mga.documentgroup = dgn.id");
 }
 
 $header = "Location: index.php?a=40";

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?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('access_permissions')) {
+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"]);
 }
 
@@ -20,7 +20,7 @@ 
 switch ($operation) {
 	case "add_user_group" :
 		$newgroup = $_REQUEST['newusergroup'];
-		if(empty($newgroup)) {
+		if (empty($newgroup)) {
 			$modx->webAlertAndQuit("No group name specified.");
 		} else {
 			$id = $modx->db->insert(array('name' => $modx->db->escape($newgroup)), $tbl_membergroup_names);
@@ -34,7 +34,7 @@ 
 	break;
 	case "add_document_group" :
 		$newgroup = $_REQUEST['newdocgroup'];
-		if(empty($newgroup)) {
+		if (empty($newgroup)) {
 			$modx->webAlertAndQuit("No group name specified.");
 		} else {
 			$id = $modx->db->insert(array('name' => $modx->db->escape($newgroup)), $tbl_documentgroup_names);
@@ -49,7 +49,7 @@ 
 	case "delete_user_group" :
 		$updategroupaccess = true;
 		$usergroup = intval($_REQUEST['usergroup']);
-		if(empty($usergroup)) {
+		if (empty($usergroup)) {
 			$modx->webAlertAndQuit("No user group id specified for deletion.");
 		} else {
 			$modx->db->delete($tbl_membergroup_names, "id='{$usergroup}'");
@@ -61,7 +61,7 @@ 
 	break;
 	case "delete_document_group" :
 		$group = intval($_REQUEST['documentgroup']);
-		if(empty($group)) {
+		if (empty($group)) {
 			$modx->webAlertAndQuit("No document group id specified for deletion.");
 		} else {
 			$modx->db->delete($tbl_documentgroup_names, "id='{$group}'");
@@ -73,11 +73,11 @@ 
 	break;
 	case "rename_user_group" :
 		$newgroupname = $_REQUEST['newgroupname'];
-		if(empty($newgroupname)) {
+		if (empty($newgroupname)) {
 			$modx->webAlertAndQuit("No group name specified.");
 		}
 		$groupid = intval($_REQUEST['groupid']);
-		if(empty($groupid)) {
+		if (empty($groupid)) {
 			$modx->webAlertAndQuit("No group id specified for rename.");
 		}
 
@@ -85,11 +85,11 @@ 
 	break;
 	case "rename_document_group" :
 		$newgroupname = $_REQUEST['newgroupname'];
-		if(empty($newgroupname)) {
+		if (empty($newgroupname)) {
 			$modx->webAlertAndQuit("No group name specified.");
 		}
 		$groupid = intval($_REQUEST['groupid']);
-		if(empty($groupid)) {
+		if (empty($groupid)) {
 			$modx->webAlertAndQuit("No group id specified for rename.");
 		}
 
@@ -101,7 +101,7 @@ 
 		$docgroup = intval($_REQUEST['docgroup']);
 		$rs = $modx->db->select('COUNT(*)', $tbl_membergroup_access, "membergroup='{$usergroup}' AND documentgroup='{$docgroup}'");
 		$limit = $modx->db->getValue($rs);
-		if($limit<=0) {
+		if ($limit <= 0) {
 			$modx->db->insert(array('membergroup' => $usergroup, 'documentgroup' => $docgroup), $tbl_membergroup_access);
 		} else {
 			//alert user that coupling already exists?
@@ -117,7 +117,7 @@ 
 }
 
 // secure manager documents - flag as private
-if($updategroupaccess==true){
+if ($updategroupaccess == true) {
 	include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php";
 	secureMgrDocument();
 

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

Indentation +277 added lines, -277 removed lines

@@ -1,9 +1,9 @@ 
 <?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.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('save_web_user')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $tbl_web_users = $modx->getFullTableName('web_users');
@@ -12,10 +12,10 @@ 
 
 $input = $_POST;
 foreach($input as $k => $v) {
-	if($k !== 'comment') {
-		$v = sanitize($v);
-	}
-	$input[$k] = $v;
+    if($k !== 'comment') {
+        $v = sanitize($v);
+    }
+    $input[$k] = $v;
 }
 
 $id = intval($input['id']);
@@ -51,80 +51,80 @@ 
 
 // verify password
 if($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) {
-	webAlertAndQuit("Password typed is mismatched");
+    webAlertAndQuit("Password typed is mismatched");
 }
 
 // verify email
 if($email == '' || !preg_match("/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i", $email)) {
-	webAlertAndQuit("E-mail address doesn't seem to be valid!");
+    webAlertAndQuit("E-mail address doesn't seem to be valid!");
 }
 
 switch($input['mode']) {
-	case '87' : // new user
-		// check if this user name already exist
-		$rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("User name is already in use!");
-		}
-
-		// check if the email address already exist
-		$rs = $modx->db->select('count(id)', $tbl_web_user_attributes, "email='{$esc_email}' AND id!='{$id}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("Email is already in use!");
-		}
-
-		// generate a new password for this user
-		if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-			if(strlen($specifiedpassword) < 6) {
-				webAlertAndQuit("Password is too short!");
-			} else {
-				$newpassword = $specifiedpassword;
-			}
-		} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-			webAlertAndQuit("You didn't specify a password for this user!");
-		} elseif($passwordgenmethod == 'g') {
-			$newpassword = generate_password(8);
-		} else {
-			webAlertAndQuit("No password generation method specified!");
-		}
-
-		// invoke OnBeforeWUsrFormSave event
-		$modx->invokeEvent("OnBeforeWUsrFormSave", array(
-			"mode" => "new",
-		));
-
-		// create the user account
-		$field = array();
-		$field['username'] = $esc_newusername;
-		$field['password'] = md5($newpassword);
-		$internalKey = $modx->db->insert($field, $tbl_web_users);
-
-		$field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
-		$field = $modx->db->escape($field);
-		$modx->db->insert($field, $tbl_web_user_attributes);
-
-		// Save User Settings
-		saveUserSettings($internalKey);
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
-					$f = array();
-					$f['webgroup'] = intval($user_groups[$i]);
-					$f['webuser'] = $internalKey;
-					$modx->db->insert($f, $tbl_web_groups);
-				}
-			}
-		}
-		// end of user_groups stuff!
+    case '87' : // new user
+        // check if this user name already exist
+        $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}'");
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("User name is already in use!");
+        }
+
+        // check if the email address already exist
+        $rs = $modx->db->select('count(id)', $tbl_web_user_attributes, "email='{$esc_email}' AND id!='{$id}'");
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("Email is already in use!");
+        }
+
+        // generate a new password for this user
+        if($specifiedpassword != "" && $passwordgenmethod == "spec") {
+            if(strlen($specifiedpassword) < 6) {
+                webAlertAndQuit("Password is too short!");
+            } else {
+                $newpassword = $specifiedpassword;
+            }
+        } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+            webAlertAndQuit("You didn't specify a password for this user!");
+        } elseif($passwordgenmethod == 'g') {
+            $newpassword = generate_password(8);
+        } else {
+            webAlertAndQuit("No password generation method specified!");
+        }
+
+        // invoke OnBeforeWUsrFormSave event
+        $modx->invokeEvent("OnBeforeWUsrFormSave", array(
+            "mode" => "new",
+        ));
+
+        // create the user account
+        $field = array();
+        $field['username'] = $esc_newusername;
+        $field['password'] = md5($newpassword);
+        $internalKey = $modx->db->insert($field, $tbl_web_users);
+
+        $field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
+        $field = $modx->db->escape($field);
+        $modx->db->insert($field, $tbl_web_user_attributes);
+
+        // Save User Settings
+        saveUserSettings($internalKey);
+
+        // Set the item name for logger
+        $_SESSION['itemname'] = $newusername;
+
+        /*******************************************************************************/
+        // put the user in the user_groups he/ she should be in
+        // first, check that up_perms are switched on!
+        if($use_udperms == 1) {
+            if(!empty($user_groups)) {
+                for($i = 0; $i < count($user_groups); $i++) {
+                    $f = array();
+                    $f['webgroup'] = intval($user_groups[$i]);
+                    $f['webuser'] = $internalKey;
+                    $modx->db->insert($f, $tbl_web_groups);
+                }
+            }
+        }
+        // end of user_groups stuff!
 
         // invoke OnWebSaveUser event
         $modx->invokeEvent("OnWebSaveUser", array(
@@ -142,26 +142,26 @@ 
             "id" => $internalKey
         ));
 
-		if($passwordnotifymethod == 'e') {
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
-				header($header);
-			} else {
-				$header = "Location: index.php?a=99&r=2";
-				header($header);
-			}
-		} else {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
-			} else {
-				$stayUrl = "index.php?a=99&r=2";
-			}
-
-			include_once "header.inc.php";
-			?>
+        if($passwordnotifymethod == 'e') {
+            sendMailMessage($email, $newusername, $newpassword, $fullname);
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
+                $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+                header($header);
+            } else {
+                $header = "Location: index.php?a=99&r=2";
+                header($header);
+            }
+        } else {
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
+                $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+            } else {
+                $stayUrl = "index.php?a=99&r=2";
+            }
+
+            include_once "header.inc.php";
+            ?>
 
 			<h1><?php echo $_lang['web_user_title']; ?></h1>
 
@@ -183,84 +183,84 @@ 
 			</div>
 			<?php
 
-			include_once "footer.inc.php";
-		}
-		break;
-	case '88' : // edit user
-		// generate a new password for this user
-		if($genpassword == 1) {
-			if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-				if(strlen($specifiedpassword) < 6) {
-					webAlertAndQuit("Password is too short!");
-				} else {
-					$newpassword = $specifiedpassword;
-				}
-			} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-				webAlertAndQuit("You didn't specify a password for this user!");
-			} elseif($passwordgenmethod == 'g') {
-				$newpassword = generate_password(8);
-			} else {
-				webAlertAndQuit("No password generation method specified!");
-			}
-		}
-		if($passwordnotifymethod == 'e') {
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
-		}
-
-		// check if the username already exist
-		$rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}' AND id!='{$id}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("User name is already in use!");
-		}
-
-		// check if the email address already exists
-		$rs = $modx->db->select('count(internalKey)', $tbl_web_user_attributes, "email='{$esc_email}' AND internalKey!='{$id}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("Email is already in use!");
-		}
-
-		// invoke OnBeforeWUsrFormSave event
-		$modx->invokeEvent("OnBeforeWUsrFormSave", array(
-			"mode" => "upd",
-			"id" => $id
-		));
-
-		// update user name and password
-		$field = array();
-		$field['username'] = $esc_newusername;
-		if($genpassword == 1) {
-			$field['password'] = md5($newpassword);
-		}
-		$modx->db->update($field, $tbl_web_users, "id='{$id}'");
-		$field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
-		$field = $modx->db->escape($field);
-		$modx->db->update($field, $tbl_web_user_attributes, "internalKey='{$id}'");
-
-		// Save User Settings
-		saveUserSettings($id);
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			// as this is an existing user, delete his/ her entries in the groups before saving the new groups
-			$modx->db->delete($tbl_web_groups, "webuser='{$id}'");
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
-					$field = array();
-					$field['webgroup'] = intval($user_groups[$i]);
-					$field['webuser'] = $id;
-					$modx->db->insert($field, $tbl_web_groups);
-				}
-			}
-		}
-		// end of user_groups stuff!
-		/*******************************************************************************/
+            include_once "footer.inc.php";
+        }
+        break;
+    case '88' : // edit user
+        // generate a new password for this user
+        if($genpassword == 1) {
+            if($specifiedpassword != "" && $passwordgenmethod == "spec") {
+                if(strlen($specifiedpassword) < 6) {
+                    webAlertAndQuit("Password is too short!");
+                } else {
+                    $newpassword = $specifiedpassword;
+                }
+            } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+                webAlertAndQuit("You didn't specify a password for this user!");
+            } elseif($passwordgenmethod == 'g') {
+                $newpassword = generate_password(8);
+            } else {
+                webAlertAndQuit("No password generation method specified!");
+            }
+        }
+        if($passwordnotifymethod == 'e') {
+            sendMailMessage($email, $newusername, $newpassword, $fullname);
+        }
+
+        // check if the username already exist
+        $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}' AND id!='{$id}'");
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("User name is already in use!");
+        }
+
+        // check if the email address already exists
+        $rs = $modx->db->select('count(internalKey)', $tbl_web_user_attributes, "email='{$esc_email}' AND internalKey!='{$id}'");
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("Email is already in use!");
+        }
+
+        // invoke OnBeforeWUsrFormSave event
+        $modx->invokeEvent("OnBeforeWUsrFormSave", array(
+            "mode" => "upd",
+            "id" => $id
+        ));
+
+        // update user name and password
+        $field = array();
+        $field['username'] = $esc_newusername;
+        if($genpassword == 1) {
+            $field['password'] = md5($newpassword);
+        }
+        $modx->db->update($field, $tbl_web_users, "id='{$id}'");
+        $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
+        $field = $modx->db->escape($field);
+        $modx->db->update($field, $tbl_web_user_attributes, "internalKey='{$id}'");
+
+        // Save User Settings
+        saveUserSettings($id);
+
+        // Set the item name for logger
+        $_SESSION['itemname'] = $newusername;
+
+        /*******************************************************************************/
+        // put the user in the user_groups he/ she should be in
+        // first, check that up_perms are switched on!
+        if($use_udperms == 1) {
+            // as this is an existing user, delete his/ her entries in the groups before saving the new groups
+            $modx->db->delete($tbl_web_groups, "webuser='{$id}'");
+            if(!empty($user_groups)) {
+                for($i = 0; $i < count($user_groups); $i++) {
+                    $field = array();
+                    $field['webgroup'] = intval($user_groups[$i]);
+                    $field['webuser'] = $id;
+                    $modx->db->insert($field, $tbl_web_groups);
+                }
+            }
+        }
+        // end of user_groups stuff!
+        /*******************************************************************************/
 
         // invoke OnWebSaveUser event
         $modx->invokeEvent("OnWebSaveUser", array(
@@ -289,16 +289,16 @@ 
             "id" => $id
         ));
 
-		if($genpassword == 1 && $passwordnotifymethod == 's') {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
-			} else {
-				$stayUrl = "index.php?a=99&r=2";
-			}
+        if($genpassword == 1 && $passwordnotifymethod == 's') {
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
+                $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+            } else {
+                $stayUrl = "index.php?a=99&r=2";
+            }
 
-			include_once "header.inc.php";
-			?>
+            include_once "header.inc.php";
+            ?>
 
 			<h1><?php echo $_lang['web_user_title']; ?></h1>
 
@@ -318,124 +318,124 @@ 
 			</div>
 			<?php
 
-			include_once "footer.inc.php";
-		} else {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
-				header($header);
-			} else {
-				$header = "Location: index.php?a=99&r=2";
-				header($header);
-			}
-		}
-		break;
-	default :
-		webAlertAndQuit("No operation set in request.");
+            include_once "footer.inc.php";
+        } else {
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
+                $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+                header($header);
+            } else {
+                $header = "Location: index.php?a=99&r=2";
+                header($header);
+            }
+        }
+        break;
+    default :
+        webAlertAndQuit("No operation set in request.");
 }
 
 // in case any plugins include a quoted_printable function
 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';
-	$r[] = "'=' . sprintf('%02X', ord('\\1'))";
-	$f[] = '/([\011\040])' . $crlf . '/e';
-	$r[] = "'=' . sprintf('%02X', ord('\\1')) . '" . $crlf . "'";
-	$string = preg_replace($f, $r, $string);
-	return trim(wordwrap($string, 70, ' =' . $crlf));
+    $crlf = "\n";
+    $string = preg_replace('!(\r\n|\r|\n)!', $crlf, $string) . $crlf;
+    $f[] = '/([\000-\010\013\014\016-\037\075\177-\377])/e';
+    $r[] = "'=' . sprintf('%02X', ord('\\1'))";
+    $f[] = '/([\011\040])' . $crlf . '/e';
+    $r[] = "'=' . sprintf('%02X', ord('\\1')) . '" . $crlf . "'";
+    $string = preg_replace($f, $r, $string);
+    return trim(wordwrap($string, 70, ' =' . $crlf));
 }
 
 // Send an email to the user
 function sendMailMessage($email, $uid, $pwd, $ufn) {
-	global $modx, $_lang, $websignupemail_message;
-	global $emailsubject, $emailsender;
-	global $site_name, $site_url;
-	$message = sprintf($websignupemail_message, $uid, $pwd); // use old method
-	// replace placeholders
-	$message = str_replace("[+uid+]", $uid, $message);
-	$message = str_replace("[+pwd+]", $pwd, $message);
-	$message = str_replace("[+ufn+]", $ufn, $message);
-	$message = str_replace("[+sname+]", $site_name, $message);
-	$message = str_replace("[+saddr+]", $emailsender, $message);
-	$message = str_replace("[+semail+]", $emailsender, $message);
-	$message = str_replace("[+surl+]", $site_url, $message);
-
-	$param = array();
-	$param['from'] = "{$site_name}<{$emailsender}>";
-	$param['subject'] = $emailsubject;
-	$param['body'] = $message;
-	$param['to'] = $email;
-	$param['type'] = 'text';
-	$rs = $modx->sendmail($param);
-	if(!$rs) {
-		$modx->manager->saveFormValues();
-		$modx->messageQuit("{$email} - {$_lang['error_sending_email']}");
-	}
+    global $modx, $_lang, $websignupemail_message;
+    global $emailsubject, $emailsender;
+    global $site_name, $site_url;
+    $message = sprintf($websignupemail_message, $uid, $pwd); // use old method
+    // replace placeholders
+    $message = str_replace("[+uid+]", $uid, $message);
+    $message = str_replace("[+pwd+]", $pwd, $message);
+    $message = str_replace("[+ufn+]", $ufn, $message);
+    $message = str_replace("[+sname+]", $site_name, $message);
+    $message = str_replace("[+saddr+]", $emailsender, $message);
+    $message = str_replace("[+semail+]", $emailsender, $message);
+    $message = str_replace("[+surl+]", $site_url, $message);
+
+    $param = array();
+    $param['from'] = "{$site_name}<{$emailsender}>";
+    $param['subject'] = $emailsubject;
+    $param['body'] = $message;
+    $param['to'] = $email;
+    $param['type'] = 'text';
+    $rs = $modx->sendmail($param);
+    if(!$rs) {
+        $modx->manager->saveFormValues();
+        $modx->messageQuit("{$email} - {$_lang['error_sending_email']}");
+    }
 }
 
 // Save User Settings
 function saveUserSettings($id) {
-	global $modx;
-	$tbl_web_user_settings = $modx->getFullTableName('web_user_settings');
-
-	$settings = array(
-		"login_home",
-		"allowed_ip",
-		"allowed_days"
-	);
-
-	$modx->db->delete($tbl_web_user_settings, "webuser='{$id}'");
-
-	foreach($settings as $n) {
-		$vl = $_POST[$n];
-		if(is_array($vl)) {
-			$vl = implode(",", $vl);
-		}
-		if($vl != '') {
-			$f = array();
-			$f['webuser'] = $id;
-			$f['setting_name'] = $n;
-			$f['setting_value'] = $vl;
-			$f = $modx->db->escape($f);
-			$modx->db->insert($f, $tbl_web_user_settings);
-		}
-	}
+    global $modx;
+    $tbl_web_user_settings = $modx->getFullTableName('web_user_settings');
+
+    $settings = array(
+        "login_home",
+        "allowed_ip",
+        "allowed_days"
+    );
+
+    $modx->db->delete($tbl_web_user_settings, "webuser='{$id}'");
+
+    foreach($settings as $n) {
+        $vl = $_POST[$n];
+        if(is_array($vl)) {
+            $vl = implode(",", $vl);
+        }
+        if($vl != '') {
+            $f = array();
+            $f['webuser'] = $id;
+            $f['setting_name'] = $n;
+            $f['setting_value'] = $vl;
+            $f = $modx->db->escape($f);
+            $modx->db->insert($f, $tbl_web_user_settings);
+        }
+    }
 }
 
 // Web alert -  sends an alert to web browser
 function webAlertAndQuit($msg) {
-	global $id, $modx;
-	$mode = $_POST['mode'];
-	$modx->manager->saveFormValues($mode);
-	$modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '88' ? "&id={$id}" : ''));
+    global $id, $modx;
+    $mode = $_POST['mode'];
+    $modx->manager->saveFormValues($mode);
+    $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '88' ? "&id={$id}" : ''));
 }
 
 // Generate password
 function generate_password($length = 10) {
-	$allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
-	$ps_len = strlen($allowable_characters);
-	mt_srand((double) microtime() * 1000000);
-	$pass = "";
-	for($i = 0; $i < $length; $i++) {
-		$pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];
-	}
-	return $pass;
+    $allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
+    $ps_len = strlen($allowable_characters);
+    mt_srand((double) microtime() * 1000000);
+    $pass = "";
+    for($i = 0; $i < $length; $i++) {
+        $pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];
+    }
+    return $pass;
 }
 
 function sanitize($str = '', $safecount = 0) {
-	global $modx;
-	$safecount++;
-	if(1000 < $safecount) {
-		exit("error too many loops '{$safecount}'");
-	}
-	if(is_array($str)) {
-		foreach($str as $i => $v) {
-			$str[$i] = sanitize($v, $safecount);
-		}
-	} else {
-		// $str = strip_tags($str); // LEAVE < and > intact
-		$str = htmlspecialchars($str, ENT_NOQUOTES, $modx->config['modx_charset']);
-	}
-	return $str;
+    global $modx;
+    $safecount++;
+    if(1000 < $safecount) {
+        exit("error too many loops '{$safecount}'");
+    }
+    if(is_array($str)) {
+        foreach($str as $i => $v) {
+            $str[$i] = sanitize($v, $safecount);
+        }
+    } else {
+        // $str = strip_tags($str); // LEAVE < and > intact
+        $str = htmlspecialchars($str, ENT_NOQUOTES, $modx->config['modx_charset']);
+    }
+    return $str;
 }

Switch Indentation +224 added lines, -224 removed lines

@@ -60,108 +60,108 @@ 
 }
 
 switch($input['mode']) {
-	case '87' : // new user
-		// check if this user name already exist
-		$rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("User name is already in use!");
-		}
-
-		// check if the email address already exist
-		$rs = $modx->db->select('count(id)', $tbl_web_user_attributes, "email='{$esc_email}' AND id!='{$id}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("Email is already in use!");
-		}
+	    case '87' : // new user
+		    // check if this user name already exist
+		    $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}'");
+		    $limit = $modx->db->getValue($rs);
+		    if($limit > 0) {
+			    webAlertAndQuit("User name is already in use!");
+		    }
+
+		    // check if the email address already exist
+		    $rs = $modx->db->select('count(id)', $tbl_web_user_attributes, "email='{$esc_email}' AND id!='{$id}'");
+		    $limit = $modx->db->getValue($rs);
+		    if($limit > 0) {
+			    webAlertAndQuit("Email is already in use!");
+		    }
+
+		    // generate a new password for this user
+		    if($specifiedpassword != "" && $passwordgenmethod == "spec") {
+			    if(strlen($specifiedpassword) < 6) {
+				    webAlertAndQuit("Password is too short!");
+			    } else {
+				    $newpassword = $specifiedpassword;
+			    }
+		    } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+			    webAlertAndQuit("You didn't specify a password for this user!");
+		    } elseif($passwordgenmethod == 'g') {
+			    $newpassword = generate_password(8);
+		    } else {
+			    webAlertAndQuit("No password generation method specified!");
+		    }
+
+		    // invoke OnBeforeWUsrFormSave event
+		    $modx->invokeEvent("OnBeforeWUsrFormSave", array(
+			    "mode" => "new",
+		    ));
+
+		    // create the user account
+		    $field = array();
+		    $field['username'] = $esc_newusername;
+		    $field['password'] = md5($newpassword);
+		    $internalKey = $modx->db->insert($field, $tbl_web_users);
+
+		    $field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
+		    $field = $modx->db->escape($field);
+		    $modx->db->insert($field, $tbl_web_user_attributes);
+
+		    // Save User Settings
+		    saveUserSettings($internalKey);
+
+		    // Set the item name for logger
+		    $_SESSION['itemname'] = $newusername;
+
+		    /*******************************************************************************/
+		    // put the user in the user_groups he/ she should be in
+		    // first, check that up_perms are switched on!
+		    if($use_udperms == 1) {
+			    if(!empty($user_groups)) {
+				    for($i = 0; $i < count($user_groups); $i++) {
+					    $f = array();
+					    $f['webgroup'] = intval($user_groups[$i]);
+					    $f['webuser'] = $internalKey;
+					    $modx->db->insert($f, $tbl_web_groups);
+				    }
+			    }
+		    }
+		    // end of user_groups stuff!
+
+            // invoke OnWebSaveUser event
+            $modx->invokeEvent("OnWebSaveUser", array(
+                "mode" => "new",
+                "userid" => $internalKey,
+                "username" => $newusername,
+                "userpassword" => $newpassword,
+                "useremail" => $email,
+                "userfullname" => $fullname
+            ));
 
-		// generate a new password for this user
-		if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-			if(strlen($specifiedpassword) < 6) {
-				webAlertAndQuit("Password is too short!");
-			} else {
-				$newpassword = $specifiedpassword;
-			}
-		} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-			webAlertAndQuit("You didn't specify a password for this user!");
-		} elseif($passwordgenmethod == 'g') {
-			$newpassword = generate_password(8);
-		} else {
-			webAlertAndQuit("No password generation method specified!");
-		}
+            // invoke OnWUsrFormSave event
+            $modx->invokeEvent("OnWUsrFormSave", array(
+                "mode" => "new",
+                "id" => $internalKey
+            ));
 
-		// invoke OnBeforeWUsrFormSave event
-		$modx->invokeEvent("OnBeforeWUsrFormSave", array(
-			"mode" => "new",
-		));
-
-		// create the user account
-		$field = array();
-		$field['username'] = $esc_newusername;
-		$field['password'] = md5($newpassword);
-		$internalKey = $modx->db->insert($field, $tbl_web_users);
-
-		$field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
-		$field = $modx->db->escape($field);
-		$modx->db->insert($field, $tbl_web_user_attributes);
-
-		// Save User Settings
-		saveUserSettings($internalKey);
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
-					$f = array();
-					$f['webgroup'] = intval($user_groups[$i]);
-					$f['webuser'] = $internalKey;
-					$modx->db->insert($f, $tbl_web_groups);
-				}
-			}
-		}
-		// end of user_groups stuff!
-
-        // invoke OnWebSaveUser event
-        $modx->invokeEvent("OnWebSaveUser", array(
-            "mode" => "new",
-            "userid" => $internalKey,
-            "username" => $newusername,
-            "userpassword" => $newpassword,
-            "useremail" => $email,
-            "userfullname" => $fullname
-        ));
-
-        // invoke OnWUsrFormSave event
-        $modx->invokeEvent("OnWUsrFormSave", array(
-            "mode" => "new",
-            "id" => $internalKey
-        ));
-
-		if($passwordnotifymethod == 'e') {
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
-				header($header);
-			} else {
-				$header = "Location: index.php?a=99&r=2";
-				header($header);
-			}
-		} else {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
-			} else {
-				$stayUrl = "index.php?a=99&r=2";
-			}
-
-			include_once "header.inc.php";
-			?>
+		    if($passwordnotifymethod == 'e') {
+			    sendMailMessage($email, $newusername, $newpassword, $fullname);
+			    if($input['stay'] != '') {
+				    $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
+				    $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+				    header($header);
+			    } else {
+				    $header = "Location: index.php?a=99&r=2";
+				    header($header);
+			    }
+		    } else {
+			    if($input['stay'] != '') {
+				    $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
+				    $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+			    } else {
+				    $stayUrl = "index.php?a=99&r=2";
+			    }
+
+			    include_once "header.inc.php";
+			    ?>
 
 			<h1><?php echo $_lang['web_user_title']; ?></h1>
 
@@ -183,122 +183,122 @@ 
 			</div>
 			<?php
 
-			include_once "footer.inc.php";
-		}
-		break;
-	case '88' : // edit user
-		// generate a new password for this user
-		if($genpassword == 1) {
-			if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-				if(strlen($specifiedpassword) < 6) {
-					webAlertAndQuit("Password is too short!");
-				} else {
-					$newpassword = $specifiedpassword;
-				}
-			} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-				webAlertAndQuit("You didn't specify a password for this user!");
-			} elseif($passwordgenmethod == 'g') {
-				$newpassword = generate_password(8);
-			} else {
-				webAlertAndQuit("No password generation method specified!");
-			}
-		}
-		if($passwordnotifymethod == 'e') {
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
-		}
-
-		// check if the username already exist
-		$rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}' AND id!='{$id}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("User name is already in use!");
-		}
-
-		// check if the email address already exists
-		$rs = $modx->db->select('count(internalKey)', $tbl_web_user_attributes, "email='{$esc_email}' AND internalKey!='{$id}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("Email is already in use!");
-		}
-
-		// invoke OnBeforeWUsrFormSave event
-		$modx->invokeEvent("OnBeforeWUsrFormSave", array(
-			"mode" => "upd",
-			"id" => $id
-		));
-
-		// update user name and password
-		$field = array();
-		$field['username'] = $esc_newusername;
-		if($genpassword == 1) {
-			$field['password'] = md5($newpassword);
-		}
-		$modx->db->update($field, $tbl_web_users, "id='{$id}'");
-		$field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
-		$field = $modx->db->escape($field);
-		$modx->db->update($field, $tbl_web_user_attributes, "internalKey='{$id}'");
-
-		// Save User Settings
-		saveUserSettings($id);
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			// as this is an existing user, delete his/ her entries in the groups before saving the new groups
-			$modx->db->delete($tbl_web_groups, "webuser='{$id}'");
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
-					$field = array();
-					$field['webgroup'] = intval($user_groups[$i]);
-					$field['webuser'] = $id;
-					$modx->db->insert($field, $tbl_web_groups);
-				}
-			}
-		}
-		// end of user_groups stuff!
-		/*******************************************************************************/
-
-        // invoke OnWebSaveUser event
-        $modx->invokeEvent("OnWebSaveUser", array(
-            "mode" => "upd",
-            "userid" => $id,
-            "username" => $newusername,
-            "userpassword" => $newpassword,
-            "useremail" => $email,
-            "userfullname" => $fullname,
-            "oldusername" => (($oldusername != $newusername) ? $oldusername : ""),
-            "olduseremail" => (($oldemail != $email) ? $oldemail : "")
-        ));
-
-        // invoke OnWebChangePassword event
-        if($genpassword == 1) {
-            $modx->invokeEvent("OnWebChangePassword", array(
+			    include_once "footer.inc.php";
+		    }
+		    break;
+	    case '88' : // edit user
+		    // generate a new password for this user
+		    if($genpassword == 1) {
+			    if($specifiedpassword != "" && $passwordgenmethod == "spec") {
+				    if(strlen($specifiedpassword) < 6) {
+					    webAlertAndQuit("Password is too short!");
+				    } else {
+					    $newpassword = $specifiedpassword;
+				    }
+			    } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+				    webAlertAndQuit("You didn't specify a password for this user!");
+			    } elseif($passwordgenmethod == 'g') {
+				    $newpassword = generate_password(8);
+			    } else {
+				    webAlertAndQuit("No password generation method specified!");
+			    }
+		    }
+		    if($passwordnotifymethod == 'e') {
+			    sendMailMessage($email, $newusername, $newpassword, $fullname);
+		    }
+
+		    // check if the username already exist
+		    $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}' AND id!='{$id}'");
+		    $limit = $modx->db->getValue($rs);
+		    if($limit > 0) {
+			    webAlertAndQuit("User name is already in use!");
+		    }
+
+		    // check if the email address already exists
+		    $rs = $modx->db->select('count(internalKey)', $tbl_web_user_attributes, "email='{$esc_email}' AND internalKey!='{$id}'");
+		    $limit = $modx->db->getValue($rs);
+		    if($limit > 0) {
+			    webAlertAndQuit("Email is already in use!");
+		    }
+
+		    // invoke OnBeforeWUsrFormSave event
+		    $modx->invokeEvent("OnBeforeWUsrFormSave", array(
+			    "mode" => "upd",
+			    "id" => $id
+		    ));
+
+		    // update user name and password
+		    $field = array();
+		    $field['username'] = $esc_newusername;
+		    if($genpassword == 1) {
+			    $field['password'] = md5($newpassword);
+		    }
+		    $modx->db->update($field, $tbl_web_users, "id='{$id}'");
+		    $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
+		    $field = $modx->db->escape($field);
+		    $modx->db->update($field, $tbl_web_user_attributes, "internalKey='{$id}'");
+
+		    // Save User Settings
+		    saveUserSettings($id);
+
+		    // Set the item name for logger
+		    $_SESSION['itemname'] = $newusername;
+
+		    /*******************************************************************************/
+		    // put the user in the user_groups he/ she should be in
+		    // first, check that up_perms are switched on!
+		    if($use_udperms == 1) {
+			    // as this is an existing user, delete his/ her entries in the groups before saving the new groups
+			    $modx->db->delete($tbl_web_groups, "webuser='{$id}'");
+			    if(!empty($user_groups)) {
+				    for($i = 0; $i < count($user_groups); $i++) {
+					    $field = array();
+					    $field['webgroup'] = intval($user_groups[$i]);
+					    $field['webuser'] = $id;
+					    $modx->db->insert($field, $tbl_web_groups);
+				    }
+			    }
+		    }
+		    // end of user_groups stuff!
+		    /*******************************************************************************/
+
+            // invoke OnWebSaveUser event
+            $modx->invokeEvent("OnWebSaveUser", array(
+                "mode" => "upd",
                 "userid" => $id,
                 "username" => $newusername,
-                "userpassword" => $newpassword
+                "userpassword" => $newpassword,
+                "useremail" => $email,
+                "userfullname" => $fullname,
+                "oldusername" => (($oldusername != $newusername) ? $oldusername : ""),
+                "olduseremail" => (($oldemail != $email) ? $oldemail : "")
             ));
-        }
 
-        // invoke OnWUsrFormSave event
-        $modx->invokeEvent("OnWUsrFormSave", array(
-            "mode" => "upd",
-            "id" => $id
-        ));
+            // invoke OnWebChangePassword event
+            if($genpassword == 1) {
+                $modx->invokeEvent("OnWebChangePassword", array(
+                    "userid" => $id,
+                    "username" => $newusername,
+                    "userpassword" => $newpassword
+                ));
+            }
+
+            // invoke OnWUsrFormSave event
+            $modx->invokeEvent("OnWUsrFormSave", array(
+                "mode" => "upd",
+                "id" => $id
+            ));
 
-		if($genpassword == 1 && $passwordnotifymethod == 's') {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
-			} else {
-				$stayUrl = "index.php?a=99&r=2";
-			}
+		    if($genpassword == 1 && $passwordnotifymethod == 's') {
+			    if($input['stay'] != '') {
+				    $a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
+				    $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+			    } else {
+				    $stayUrl = "index.php?a=99&r=2";
+			    }
 
-			include_once "header.inc.php";
-			?>
+			    include_once "header.inc.php";
+			    ?>
 
 			<h1><?php echo $_lang['web_user_title']; ?></h1>
 
@@ -318,20 +318,20 @@ 
 			</div>
 			<?php
 
-			include_once "footer.inc.php";
-		} else {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
-				header($header);
-			} else {
-				$header = "Location: index.php?a=99&r=2";
-				header($header);
-			}
-		}
-		break;
-	default :
-		webAlertAndQuit("No operation set in request.");
+			    include_once "footer.inc.php";
+		    } else {
+			    if($input['stay'] != '') {
+				    $a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
+				    $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+				    header($header);
+			    } else {
+				    $header = "Location: index.php?a=99&r=2";
+				    header($header);
+			    }
+		    }
+		    break;
+	    default :
+		    webAlertAndQuit("No operation set in request.");
 }
 
 // in case any plugins include a quoted_printable function

Spacing +58 added lines, -58 removed lines

@@ -1,8 +1,8 @@ 
 <?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.");
 }
-if(!$modx->hasPermission('save_web_user')) {
+if (!$modx->hasPermission('save_web_user')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -11,8 +11,8 @@ 
 $tbl_web_groups = $modx->getFullTableName('web_groups');
 
 $input = $_POST;
-foreach($input as $k => $v) {
-	if($k !== 'comment') {
+foreach ($input as $k => $v) {
+	if ($k !== 'comment') {
 		$v = sanitize($v);
 	}
 	$input[$k] = $v;
@@ -50,41 +50,41 @@ 
 $user_groups = $input['user_groups'];
 
 // verify password
-if($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) {
+if ($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) {
 	webAlertAndQuit("Password typed is mismatched");
 }
 
 // verify email
-if($email == '' || !preg_match("/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i", $email)) {
+if ($email == '' || !preg_match("/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i", $email)) {
 	webAlertAndQuit("E-mail address doesn't seem to be valid!");
 }
 
-switch($input['mode']) {
+switch ($input['mode']) {
 	case '87' : // new user
 		// check if this user name already exist
 		$rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}'");
 		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
+		if ($limit > 0) {
 			webAlertAndQuit("User name is already in use!");
 		}
 
 		// check if the email address already exist
 		$rs = $modx->db->select('count(id)', $tbl_web_user_attributes, "email='{$esc_email}' AND id!='{$id}'");
 		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
+		if ($limit > 0) {
 			webAlertAndQuit("Email is already in use!");
 		}
 
 		// generate a new password for this user
-		if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-			if(strlen($specifiedpassword) < 6) {
+		if ($specifiedpassword != "" && $passwordgenmethod == "spec") {
+			if (strlen($specifiedpassword) < 6) {
 				webAlertAndQuit("Password is too short!");
 			} else {
 				$newpassword = $specifiedpassword;
 			}
-		} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+		} elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {
 			webAlertAndQuit("You didn't specify a password for this user!");
-		} elseif($passwordgenmethod == 'g') {
+		} elseif ($passwordgenmethod == 'g') {
 			$newpassword = generate_password(8);
 		} else {
 			webAlertAndQuit("No password generation method specified!");
@@ -114,9 +114,9 @@ 
 		/*******************************************************************************/
 		// put the user in the user_groups he/ she should be in
 		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
+		if ($use_udperms == 1) {
+			if (!empty($user_groups)) {
+				for ($i = 0; $i < count($user_groups); $i++) {
 					$f = array();
 					$f['webgroup'] = intval($user_groups[$i]);
 					$f['webuser'] = $internalKey;
@@ -142,20 +142,20 @@ 
             "id" => $internalKey
         ));
 
-		if($passwordnotifymethod == 'e') {
+		if ($passwordnotifymethod == 'e') {
 			sendMailMessage($email, $newusername, $newpassword, $fullname);
-			if($input['stay'] != '') {
+			if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+				$header = "Location: index.php?a={$a}&r=2&stay=".$input['stay'];
 				header($header);
 			} else {
 				$header = "Location: index.php?a=99&r=2";
 				header($header);
 			}
 		} else {
-			if($input['stay'] != '') {
+			if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+				$stayUrl = "index.php?a={$a}&r=2&stay=".$input['stay'];
 			} else {
 				$stayUrl = "index.php?a=99&r=2";
 			}
@@ -188,36 +188,36 @@ 
 		break;
 	case '88' : // edit user
 		// generate a new password for this user
-		if($genpassword == 1) {
-			if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-				if(strlen($specifiedpassword) < 6) {
+		if ($genpassword == 1) {
+			if ($specifiedpassword != "" && $passwordgenmethod == "spec") {
+				if (strlen($specifiedpassword) < 6) {
 					webAlertAndQuit("Password is too short!");
 				} else {
 					$newpassword = $specifiedpassword;
 				}
-			} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+			} elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {
 				webAlertAndQuit("You didn't specify a password for this user!");
-			} elseif($passwordgenmethod == 'g') {
+			} elseif ($passwordgenmethod == 'g') {
 				$newpassword = generate_password(8);
 			} else {
 				webAlertAndQuit("No password generation method specified!");
 			}
 		}
-		if($passwordnotifymethod == 'e') {
+		if ($passwordnotifymethod == 'e') {
 			sendMailMessage($email, $newusername, $newpassword, $fullname);
 		}
 
 		// check if the username already exist
 		$rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}' AND id!='{$id}'");
 		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
+		if ($limit > 0) {
 			webAlertAndQuit("User name is already in use!");
 		}
 
 		// check if the email address already exists
 		$rs = $modx->db->select('count(internalKey)', $tbl_web_user_attributes, "email='{$esc_email}' AND internalKey!='{$id}'");
 		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
+		if ($limit > 0) {
 			webAlertAndQuit("Email is already in use!");
 		}
 
@@ -230,7 +230,7 @@ 
 		// update user name and password
 		$field = array();
 		$field['username'] = $esc_newusername;
-		if($genpassword == 1) {
+		if ($genpassword == 1) {
 			$field['password'] = md5($newpassword);
 		}
 		$modx->db->update($field, $tbl_web_users, "id='{$id}'");
@@ -247,11 +247,11 @@ 
 		/*******************************************************************************/
 		// put the user in the user_groups he/ she should be in
 		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
+		if ($use_udperms == 1) {
 			// as this is an existing user, delete his/ her entries in the groups before saving the new groups
 			$modx->db->delete($tbl_web_groups, "webuser='{$id}'");
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
+			if (!empty($user_groups)) {
+				for ($i = 0; $i < count($user_groups); $i++) {
 					$field = array();
 					$field['webgroup'] = intval($user_groups[$i]);
 					$field['webuser'] = $id;
@@ -275,7 +275,7 @@ 
         ));
 
         // invoke OnWebChangePassword event
-        if($genpassword == 1) {
+        if ($genpassword == 1) {
             $modx->invokeEvent("OnWebChangePassword", array(
                 "userid" => $id,
                 "username" => $newusername,
@@ -289,10 +289,10 @@ 
             "id" => $id
         ));
 
-		if($genpassword == 1 && $passwordnotifymethod == 's') {
-			if($input['stay'] != '') {
+		if ($genpassword == 1 && $passwordnotifymethod == 's') {
+			if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+				$stayUrl = "index.php?a={$a}&r=2&stay=".$input['stay'];
 			} else {
 				$stayUrl = "index.php?a=99&r=2";
 			}
@@ -320,9 +320,9 @@ 
 
 			include_once "footer.inc.php";
 		} else {
-			if($input['stay'] != '') {
+			if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+				$header = "Location: index.php?a={$a}&r=2&stay=".$input['stay'];
 				header($header);
 			} else {
 				$header = "Location: index.php?a=99&r=2";
@@ -335,19 +335,19 @@ 
 }
 
 // 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;
+	$string = preg_replace('!(\r\n|\r|\n)!', $crlf, $string).$crlf;
 	$f[] = '/([\000-\010\013\014\016-\037\075\177-\377])/e';
 	$r[] = "'=' . sprintf('%02X', ord('\\1'))";
-	$f[] = '/([\011\040])' . $crlf . '/e';
-	$r[] = "'=' . sprintf('%02X', ord('\\1')) . '" . $crlf . "'";
+	$f[] = '/([\011\040])'.$crlf.'/e';
+	$r[] = "'=' . sprintf('%02X', ord('\\1')) . '".$crlf."'";
 	$string = preg_replace($f, $r, $string);
-	return trim(wordwrap($string, 70, ' =' . $crlf));
+	return trim(wordwrap($string, 70, ' ='.$crlf));
 }
 
 // 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;
@@ -368,14 +368,14 @@ 
 	$param['to'] = $email;
 	$param['type'] = 'text';
 	$rs = $modx->sendmail($param);
-	if(!$rs) {
+	if (!$rs) {
 		$modx->manager->saveFormValues();
 		$modx->messageQuit("{$email} - {$_lang['error_sending_email']}");
 	}
 }
 
 // Save User Settings
-function saveUserSettings($id) {
+function saveUserSettings($id){
 	global $modx;
 	$tbl_web_user_settings = $modx->getFullTableName('web_user_settings');
 
@@ -387,12 +387,12 @@ 
 
 	$modx->db->delete($tbl_web_user_settings, "webuser='{$id}'");
 
-	foreach($settings as $n) {
+	foreach ($settings as $n) {
 		$vl = $_POST[$n];
-		if(is_array($vl)) {
+		if (is_array($vl)) {
 			$vl = implode(",", $vl);
 		}
-		if($vl != '') {
+		if ($vl != '') {
 			$f = array();
 			$f['webuser'] = $id;
 			$f['setting_name'] = $n;
@@ -404,33 +404,33 @@ 
 }
 
 // Web alert -  sends an alert to web browser
-function webAlertAndQuit($msg) {
+function webAlertAndQuit($msg){
 	global $id, $modx;
 	$mode = $_POST['mode'];
 	$modx->manager->saveFormValues($mode);
-	$modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '88' ? "&id={$id}" : ''));
+	$modx->webAlertAndQuit($msg, "index.php?a={$mode}".($mode == '88' ? "&id={$id}" : ''));
 }
 
 // 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);
 	$pass = "";
-	for($i = 0; $i < $length; $i++) {
+	for ($i = 0; $i < $length; $i++) {
 		$pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];
 	}
 	return $pass;
 }
 
-function sanitize($str = '', $safecount = 0) {
+function sanitize($str = '', $safecount = 0){
 	global $modx;
 	$safecount++;
-	if(1000 < $safecount) {
+	if (1000 < $safecount) {
 		exit("error too many loops '{$safecount}'");
 	}
-	if(is_array($str)) {
-		foreach($str as $i => $v) {
+	if (is_array($str)) {
+		foreach ($str as $i => $v) {
 			$str[$i] = sanitize($v, $safecount);
 		}
 	} else {

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

Indentation +26 added lines, -26 removed lines

@@ -1,12 +1,12 @@ 
 <?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('edit_template')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? intval($_GET['id']) : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
@@ -17,37 +17,37 @@ 
 
 // duplicate TV
 $newid = $modx->db->insert(
-	array(
-		'type'=>'',
-		'name'=>'',
-		'caption'=>'',
-		'description'=>'',
-		'default_text'=>'',
-		'elements'=>'',
-		'rank'=>'',
-		'display'=>'',
-		'display_params'=>'',
-		'category'=>'',
-		), $modx->getFullTableName('site_tmplvars'), // Insert into
-	"type, CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, CONCAT(caption, ' Duplicate{$count}') AS caption, description, default_text, elements, rank, display, display_params, category", $modx->getFullTableName('site_tmplvars'), "id='{$id}'"); // Copy from
+    array(
+        'type'=>'',
+        'name'=>'',
+        'caption'=>'',
+        'description'=>'',
+        'default_text'=>'',
+        'elements'=>'',
+        'rank'=>'',
+        'display'=>'',
+        'display_params'=>'',
+        'category'=>'',
+        ), $modx->getFullTableName('site_tmplvars'), // Insert into
+    "type, CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, CONCAT(caption, ' Duplicate{$count}') AS caption, description, default_text, elements, rank, display, display_params, category", $modx->getFullTableName('site_tmplvars'), "id='{$id}'"); // Copy from
 
 
 // duplicate TV Template Access Permissions
 $modx->db->insert(
-	array(
-		'tmplvarid'=>'',
-		'templateid'=>'',
-		'rank'=>'',
-		), $modx->getFullTableName('site_tmplvar_templates'), // Insert into
-	"'{$newid}', templateid, rank", $modx->getFullTableName('site_tmplvar_templates'), "tmplvarid='{$id}'"); // Copy from
+    array(
+        'tmplvarid'=>'',
+        'templateid'=>'',
+        'rank'=>'',
+        ), $modx->getFullTableName('site_tmplvar_templates'), // Insert into
+    "'{$newid}', templateid, rank", $modx->getFullTableName('site_tmplvar_templates'), "tmplvarid='{$id}'"); // Copy from
 
 // duplicate TV Access Permissions
 $modx->db->insert(
-	array(
-		'tmplvarid'=>'',
-		'documentgroup'=>'',
-		), $modx->getFullTableName('site_tmplvar_access'), // Insert into
-	"'{$newid}', documentgroup", $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'"); // Copy from
+    array(
+        'tmplvarid'=>'',
+        'documentgroup'=>'',
+        ), $modx->getFullTableName('site_tmplvar_access'), // Insert into
+    "'{$newid}', documentgroup", $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'"); // Copy from
 
 // Set the item name for logger
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_tmplvars'), "id='{$newid}'"));

Spacing +6 added lines, -6 removed lines

@@ -1,18 +1,18 @@ 
 <?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('edit_template')) {
+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"]);
 }
 
-$id = isset($_GET['id'])? intval($_GET['id']) : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // 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);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate TV
@@ -54,5 +54,5 @@ 
 $_SESSION['itemname'] = $name;
 
 // finish duplicating - redirect to new variable
-$header="Location: index.php?r=2&a=301&id=$newid";
+$header = "Location: index.php?r=2&a=301&id=$newid";
 header($header);

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

Indentation +7 added lines, -7 removed lines

@@ -1,17 +1,17 @@
 <?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_eventlog')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 if (isset($_GET['cls']) && $_GET['cls']==1) {
-	$where = '';
+    $where = '';
 } else {
-	$id = isset($_GET['id'])? intval($_GET['id']) : 0;
-	if($id==0) {
-		$modx->webAlertAndQuit($_lang["error_no_id"]);
-	}
-	$where = "id='{$id}'";
+    $id = isset($_GET['id'])? intval($_GET['id']) : 0;
+    if($id==0) {
+        $modx->webAlertAndQuit($_lang["error_no_id"]);
+    }
+    $where = "id='{$id}'";
 }
 
 // delete event log

Spacing +6 added lines, -6 removed lines

@@ -1,14 +1,14 @@ 
 <?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_eventlog')) {
+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"]);
 }
 
-if (isset($_GET['cls']) && $_GET['cls']==1) {
+if (isset($_GET['cls']) && $_GET['cls'] == 1) {
 	$where = '';
 } else {
-	$id = isset($_GET['id'])? intval($_GET['id']) : 0;
-	if($id==0) {
+	$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+	if ($id == 0) {
 		$modx->webAlertAndQuit($_lang["error_no_id"]);
 	}
 	$where = "id='{$id}'";
@@ -17,5 +17,5 @@ 
 // delete event log
 $modx->db->delete($modx->getFullTableName('event_log'), $where);
 
-$header="Location: index.php?a=114";
+$header = "Location: index.php?a=114";
 header($header);

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"]);
 }