evolution-cms / evolution

manager/processors/save_snippet.processor.php

Switch Indentation +107 added lines, -107 removed lines

@@ -66,111 +66,111 @@
 }
 
 switch ($_POST['mode']) {
-    case '23': // Save new snippet
-
-        // invoke OnBeforeSnipFormSave event
-        $modx->invokeEvent("OnBeforeSnipFormSave", array(
-            "mode" => "new",
-            "id" => $id
-        ));
-
-        // disallow duplicate names for new snippets
-        $rs = $modx->db->select('COUNT(id)', $modx->getFullTableName('site_snippets'), "name='{$name}'");
-        $count = $modx->db->getValue($rs);
-        if ($count > 0) {
-            $modx->manager->saveFormValues(23);
-            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=23");
-        }
-
-        //do stuff to save the new doc
-        $newid = $modx->db->insert(array(
-            'name' => $name,
-            'description' => $description,
-            'snippet' => $snippet,
-            'moduleguid' => $moduleguid,
-            'locked' => $locked,
-            'properties' => $properties,
-            'category' => $categoryid,
-            'disabled' => $disabled,
-            'createdon' => $currentdate,
-            'editedon' => $currentdate
-        ), $modx->getFullTableName('site_snippets'));
-
-        // invoke OnSnipFormSave event
-        $modx->invokeEvent("OnSnipFormSave", array(
-            "mode" => "new",
-            "id" => $newid
-        ));
-
-        // Set the item name for logger
-        $_SESSION['itemname'] = $name;
-
-        // empty cache
-        $modx->clearCache('full');
-
-        // finished emptying cache - redirect
-        if ($_POST['stay'] != '') {
-            $a = ($_POST['stay'] == '2') ? "22&id=$newid" : "23";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
-            header($header);
-        } else {
-            $header = "Location: index.php?a=76&r=2";
-            header($header);
-        }
-        break;
-    case '22': // Save existing snippet
-        // invoke OnBeforeSnipFormSave event
-        $modx->invokeEvent("OnBeforeSnipFormSave", array(
-            "mode" => "upd",
-            "id" => $id
-        ));
-
-        // disallow duplicate names for snippets
-        $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_snippets'), "name='{$name}' AND id!='{$id}'");
-        if ($modx->db->getValue($rs) > 0) {
-            $modx->manager->saveFormValues(22);
-            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=22&id={$id}");
-        }
-
-        //do stuff to save the edited doc
-        $modx->db->update(array(
-            'name' => $name,
-            'description' => $description,
-            'snippet' => $snippet,
-            'moduleguid' => $moduleguid,
-            'locked' => $locked,
-            'properties' => $properties,
-            'category' => $categoryid,
-            'disabled' => $disabled,
-            'editedon' => $currentdate
-        ), $modx->getFullTableName('site_snippets'), "id='{$id}'");
-
-        // invoke OnSnipFormSave event
-        $modx->invokeEvent("OnSnipFormSave", array(
-            "mode" => "upd",
-            "id" => $id
-        ));
-
-        // Set the item name for logger
-        $_SESSION['itemname'] = $name;
-
-        // empty cache
-        $modx->clearCache('full');
-
-        if ($_POST['runsnippet']) {
-            run_snippet($snippet);
-        }
-        // finished emptying cache - redirect
-        if ($_POST['stay'] != '') {
-            $a = ($_POST['stay'] == '2') ? "22&id=$id" : "23";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
-            header($header);
-        } else {
-            $modx->unlockElement(4, $id);
-            $header = "Location: index.php?a=76&r=2";
-            header($header);
-        }
-        break;
-    default:
-        $modx->webAlertAndQuit("No operation set in request.");
+        case '23': // Save new snippet
+
+            // invoke OnBeforeSnipFormSave event
+            $modx->invokeEvent("OnBeforeSnipFormSave", array(
+                "mode" => "new",
+                "id" => $id
+            ));
+
+            // disallow duplicate names for new snippets
+            $rs = $modx->db->select('COUNT(id)', $modx->getFullTableName('site_snippets'), "name='{$name}'");
+            $count = $modx->db->getValue($rs);
+            if ($count > 0) {
+                $modx->manager->saveFormValues(23);
+                $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=23");
+            }
+
+            //do stuff to save the new doc
+            $newid = $modx->db->insert(array(
+                'name' => $name,
+                'description' => $description,
+                'snippet' => $snippet,
+                'moduleguid' => $moduleguid,
+                'locked' => $locked,
+                'properties' => $properties,
+                'category' => $categoryid,
+                'disabled' => $disabled,
+                'createdon' => $currentdate,
+                'editedon' => $currentdate
+            ), $modx->getFullTableName('site_snippets'));
+
+            // invoke OnSnipFormSave event
+            $modx->invokeEvent("OnSnipFormSave", array(
+                "mode" => "new",
+                "id" => $newid
+            ));
+
+            // Set the item name for logger
+            $_SESSION['itemname'] = $name;
+
+            // empty cache
+            $modx->clearCache('full');
+
+            // finished emptying cache - redirect
+            if ($_POST['stay'] != '') {
+                $a = ($_POST['stay'] == '2') ? "22&id=$newid" : "23";
+                $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+                header($header);
+            } else {
+                $header = "Location: index.php?a=76&r=2";
+                header($header);
+            }
+            break;
+        case '22': // Save existing snippet
+            // invoke OnBeforeSnipFormSave event
+            $modx->invokeEvent("OnBeforeSnipFormSave", array(
+                "mode" => "upd",
+                "id" => $id
+            ));
+
+            // disallow duplicate names for snippets
+            $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_snippets'), "name='{$name}' AND id!='{$id}'");
+            if ($modx->db->getValue($rs) > 0) {
+                $modx->manager->saveFormValues(22);
+                $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=22&id={$id}");
+            }
+
+            //do stuff to save the edited doc
+            $modx->db->update(array(
+                'name' => $name,
+                'description' => $description,
+                'snippet' => $snippet,
+                'moduleguid' => $moduleguid,
+                'locked' => $locked,
+                'properties' => $properties,
+                'category' => $categoryid,
+                'disabled' => $disabled,
+                'editedon' => $currentdate
+            ), $modx->getFullTableName('site_snippets'), "id='{$id}'");
+
+            // invoke OnSnipFormSave event
+            $modx->invokeEvent("OnSnipFormSave", array(
+                "mode" => "upd",
+                "id" => $id
+            ));
+
+            // Set the item name for logger
+            $_SESSION['itemname'] = $name;
+
+            // empty cache
+            $modx->clearCache('full');
+
+            if ($_POST['runsnippet']) {
+                run_snippet($snippet);
+            }
+            // finished emptying cache - redirect
+            if ($_POST['stay'] != '') {
+                $a = ($_POST['stay'] == '2') ? "22&id=$id" : "23";
+                $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+                header($header);
+            } else {
+                $modx->unlockElement(4, $id);
+                $header = "Location: index.php?a=76&r=2";
+                header($header);
+            }
+            break;
+        default:
+            $modx->webAlertAndQuit("No operation set in request.");
 }

install/actions/action_options.php

Switch Indentation +42 added lines, -42 removed lines

@@ -190,53 +190,53 @@
 }
 
 switch($installMode){
-    case 0:
-    case 2:
-        $database_collation = isset($_POST['database_collation']) ? $_POST['database_collation'] : 'utf8_general_ci';
-        $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
-        $_POST['database_connection_charset'] = $database_charset;
-        if(empty($_SESSION['databaseloginpassword']))
-            $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword'];
-        if(empty($_SESSION['databaseloginname']))
-            $_SESSION['databaseloginname'] = $_POST['databaseloginname'];
-        break;
-    case 1:
-        include $base_path . MGR_DIR . '/includes/config.inc.php';
-        if (@ $conn = mysqli_connect($database_server, $database_user, $database_password)) {
-            if (@ mysqli_query($conn, "USE {$dbase}")) {
-                if (!$rs = mysqli_query($conn, "show session variables like 'collation_database'")) {
-                    $rs = mysqli_query($conn, "show session variables like 'collation_server'");
-                }
-                if ($rs && $collation = mysqli_fetch_row($rs)) {
-                    $database_collation = trim($collation[1]);
+        case 0:
+        case 2:
+            $database_collation = isset($_POST['database_collation']) ? $_POST['database_collation'] : 'utf8_general_ci';
+            $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
+            $_POST['database_connection_charset'] = $database_charset;
+            if(empty($_SESSION['databaseloginpassword']))
+                $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword'];
+            if(empty($_SESSION['databaseloginname']))
+                $_SESSION['databaseloginname'] = $_POST['databaseloginname'];
+            break;
+        case 1:
+            include $base_path . MGR_DIR . '/includes/config.inc.php';
+            if (@ $conn = mysqli_connect($database_server, $database_user, $database_password)) {
+                if (@ mysqli_query($conn, "USE {$dbase}")) {
+                    if (!$rs = mysqli_query($conn, "show session variables like 'collation_database'")) {
+                        $rs = mysqli_query($conn, "show session variables like 'collation_server'");
+                    }
+                    if ($rs && $collation = mysqli_fetch_row($rs)) {
+                        $database_collation = trim($collation[1]);
+                    }
                 }
             }
-        }
-        if (empty ($database_collation)) $database_collation = 'utf8_general_ci';
+            if (empty ($database_collation)) $database_collation = 'utf8_general_ci';
 
-        $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
-        if (!isset ($database_connection_charset) || empty ($database_connection_charset)) {
-            $database_connection_charset = $database_charset;
-        }
+            $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
+            if (!isset ($database_connection_charset) || empty ($database_connection_charset)) {
+                $database_connection_charset = $database_charset;
+            }
 
-        if (!isset ($database_connection_method) || empty ($database_connection_method)) {
-            $database_connection_method = 'SET CHARACTER SET';
-            if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_connection_charset);
-        }
-        if ($database_connection_method != 'SET NAMES' && $database_connection_charset != $database_charset) {
-            $database_connection_method = 'SET NAMES';
-        }
+            if (!isset ($database_connection_method) || empty ($database_connection_method)) {
+                $database_connection_method = 'SET CHARACTER SET';
+                if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_connection_charset);
+            }
+            if ($database_connection_method != 'SET NAMES' && $database_connection_charset != $database_charset) {
+                $database_connection_method = 'SET NAMES';
+            }
 
-        $_POST['database_name'] = $dbase;
-        $_POST['tableprefix'] = $table_prefix;
-        $_POST['database_connection_charset'] = $database_connection_charset;
-        $_POST['database_connection_method'] = $database_connection_method;
-        $_POST['databasehost'] = $database_server;
-        $_SESSION['databaseloginname'] = $database_user;
-        $_SESSION['databaseloginpassword'] = $database_password;
-        break;
-    default:
-        throw new Exception('installmode is undefined');
+            $_POST['database_name'] = $dbase;
+            $_POST['tableprefix'] = $table_prefix;
+            $_POST['database_connection_charset'] = $database_connection_charset;
+            $_POST['database_connection_method'] = $database_connection_method;
+            $_POST['databasehost'] = $database_server;
+            $_SESSION['databaseloginname'] = $database_user;
+            $_SESSION['databaseloginpassword'] = $database_password;
+            break;
+        default:
+            throw new Exception('installmode is undefined');
 }
 
 $ph['install_language'] = $install_language;

manager/processors/save_content.processor.php

Switch Indentation +220 added lines, -220 removed lines

@@ -275,11 +275,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";
@@ -293,7 +293,7 @@ 
 
             default:
                 $id = '';
-        }
+            }
 
         $modx->invokeEvent("OnBeforeDocFormSave", array (
             "mode" => "new",
@@ -444,256 +444,256 @@ 
 
 
         break;
-    case 'edit' :
-
-        // 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!");
-        }
+        case 'edit' :
 
-        $parents = $modx->getParentIds($parent);
-        if (in_array($id, $parents)) {
-            $modx->webAlertAndQuit("Document descendant can not be it's parent!");
-        }
+            // get the document's current parent
+            $oldparent = $existingDocument['parent'];
+            $doctype = $existingDocument['type'];
 
-        // 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 ($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!");
+            }
 
-        // set publishedon and publishedby
-        $was_published = $existingDocument['published'];
+            $parents = $modx->getParentIds($parent);
+            if (in_array($id, $parents)) {
+                $modx->webAlertAndQuit("Document descendant can not be it's parent!");
+            }
 
-        // 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($tvAdded)) {
-            foreach ($tvAdded as $tv) {
-                $modx->db->insert($tv, $tbl_site_tmplvar_contentvalues);
+            if (!empty($tvDeletions)) {
+                $modx->db->delete($tbl_site_tmplvar_contentvalues, 'id IN('.implode(',', $tvDeletions).')');
             }
-        }
 
-        if (!empty($tvChanges)) {
-            foreach ($tvChanges as $tv) {
-                $modx->db->update($tv[0], $tbl_site_tmplvar_contentvalues, "id='{$tv[1]['id']}'");
+            if (!empty($tvAdded)) {
+                foreach ($tvAdded as $tv) {
+                    $modx->db->insert($tv, $tbl_site_tmplvar_contentvalues);
+                }
             }
-        }
 
-        // 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;
+            if (!empty($tvChanges)) {
+                foreach ($tvChanges as $tv) {
+                    $modx->db->update($tv[0], $tbl_site_tmplvar_contentvalues, "id='{$tv[1]['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
+            // 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
                     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.");
 }

manager/actions/mutate_htmlsnippet.dynamic.php

Switch Indentation +11 added lines, -11 removed lines

@@ -4,18 +4,18 @@
 }
 
 switch ($modx->manager->action) {
-    case 78:
-        if (!$modx->hasPermission('edit_chunk')) {
-            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
-        }
-        break;
-    case 77:
-        if (!$modx->hasPermission('new_chunk')) {
+        case 78:
+            if (!$modx->hasPermission('edit_chunk')) {
+                $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+            }
+            break;
+        case 77:
+            if (!$modx->hasPermission('new_chunk')) {
+                $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+            }
+            break;
+        default:
             $modx->webAlertAndQuit($_lang["error_no_privileges"]);
-        }
-        break;
-    default:
-        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;

manager/actions/mutate_user.dynamic.php

Switch Indentation +12 added lines, -12 removed lines

@@ -4,18 +4,18 @@
 }

 

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

-	case 12:

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

-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);

-		}

-		break;

-	case 11:

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

-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);

-		}

-		break;

-	default:

-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);

+	    case 12:

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

+			    $modx->webAlertAndQuit($_lang["error_no_privileges"]);

+		    }

+		    break;

+	    case 11:

+		    if(!$modx->hasPermission('new_user')) {

+			    $modx->webAlertAndQuit($_lang["error_no_privileges"]);

+		    }

+		    break;

+	    default:

+		    $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

 $user = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;

manager/actions/mutate_web_user.dynamic.php

Switch Indentation +12 added lines, -12 removed lines

@@ -4,18 +4,18 @@
 }

 

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

-	case 88:

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

-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);

-		}

-		break;

-	case 87:

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

-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);

-		}

-		break;

-	default:

-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);

+	    case 88:

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

+			    $modx->webAlertAndQuit($_lang["error_no_privileges"]);

+		    }

+		    break;

+	    case 87:

+		    if(!$modx->hasPermission('new_web_user')) {

+			    $modx->webAlertAndQuit($_lang["error_no_privileges"]);

+		    }

+		    break;

+	    default:

+		    $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

 $user = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;

manager/actions/mutate_role.dynamic.php

Switch Indentation +12 added lines, -12 removed lines

@@ -4,18 +4,18 @@
 }
 
 switch((int) $modx->manager->action) {
-	case 35:
-		if(!$modx->hasPermission('edit_role')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	case 38:
-		if(!$modx->hasPermission('new_role')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	default:
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+	    case 35:
+		    if(!$modx->hasPermission('edit_role')) {
+			    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+		    }
+		    break;
+	    case 38:
+		    if(!$modx->hasPermission('new_role')) {
+			    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+		    }
+		    break;
+	    default:
+		    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $role = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;

manager/actions/mutate_templates.dynamic.php

Switch Indentation +12 added lines, -12 removed lines

@@ -4,18 +4,18 @@
 }
 
 switch($modx->manager->action) {
-	case 16:
-		if(!$modx->hasPermission('edit_template')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	case 19:
-		if(!$modx->hasPermission('new_template')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	default:
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+	    case 16:
+		    if(!$modx->hasPermission('edit_template')) {
+			    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+		    }
+		    break;
+	    case 19:
+		    if(!$modx->hasPermission('new_template')) {
+			    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+		    }
+		    break;
+	    default:
+		    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;

manager/actions/mutate_module.dynamic.php

Switch Indentation +12 added lines, -12 removed lines

@@ -3,18 +3,18 @@
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

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

-	case 107:

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

-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);

-		}

-		break;

-	case 108:

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

-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);

-		}

-		break;

-	default:

-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);

+	    case 107:

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

+			    $modx->webAlertAndQuit($_lang["error_no_privileges"]);

+		    }

+		    break;

+	    case 108:

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

+			    $modx->webAlertAndQuit($_lang["error_no_privileges"]);

+		    }

+		    break;

+	    default:

+		    $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;

 // Get table names (alphabetical)