| @@ -66,111 +66,111 @@ | ||
| 66 | 66 | } | 
| 67 | 67 | |
| 68 | 68 |  switch ($_POST['mode']) { | 
| 69 | - case '23': // Save new snippet | |
| 70 | - | |
| 71 | - // invoke OnBeforeSnipFormSave event | |
| 72 | -        $modx->invokeEvent("OnBeforeSnipFormSave", array( | |
| 73 | - "mode" => "new", | |
| 74 | - "id" => $id | |
| 75 | - )); | |
| 76 | - | |
| 77 | - // disallow duplicate names for new snippets | |
| 78 | -        $rs = $modx->db->select('COUNT(id)', $modx->getFullTableName('site_snippets'), "name='{$name}'"); | |
| 79 | - $count = $modx->db->getValue($rs); | |
| 80 | -        if ($count > 0) { | |
| 81 | - $modx->manager->saveFormValues(23); | |
| 82 | - $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=23"); | |
| 83 | - } | |
| 84 | - | |
| 85 | - //do stuff to save the new doc | |
| 86 | - $newid = $modx->db->insert(array( | |
| 87 | - 'name' => $name, | |
| 88 | - 'description' => $description, | |
| 89 | - 'snippet' => $snippet, | |
| 90 | - 'moduleguid' => $moduleguid, | |
| 91 | - 'locked' => $locked, | |
| 92 | - 'properties' => $properties, | |
| 93 | - 'category' => $categoryid, | |
| 94 | - 'disabled' => $disabled, | |
| 95 | - 'createdon' => $currentdate, | |
| 96 | - 'editedon' => $currentdate | |
| 97 | -        ), $modx->getFullTableName('site_snippets')); | |
| 98 | - | |
| 99 | - // invoke OnSnipFormSave event | |
| 100 | -        $modx->invokeEvent("OnSnipFormSave", array( | |
| 101 | - "mode" => "new", | |
| 102 | - "id" => $newid | |
| 103 | - )); | |
| 104 | - | |
| 105 | - // Set the item name for logger | |
| 106 | - $_SESSION['itemname'] = $name; | |
| 107 | - | |
| 108 | - // empty cache | |
| 109 | -        $modx->clearCache('full'); | |
| 110 | - | |
| 111 | - // finished emptying cache - redirect | |
| 112 | -        if ($_POST['stay'] != '') { | |
| 113 | - $a = ($_POST['stay'] == '2') ? "22&id=$newid" : "23"; | |
| 114 | - $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay']; | |
| 115 | - header($header); | |
| 116 | -        } else { | |
| 117 | - $header = "Location: index.php?a=76&r=2"; | |
| 118 | - header($header); | |
| 119 | - } | |
| 120 | - break; | |
| 121 | - case '22': // Save existing snippet | |
| 122 | - // invoke OnBeforeSnipFormSave event | |
| 123 | -        $modx->invokeEvent("OnBeforeSnipFormSave", array( | |
| 124 | - "mode" => "upd", | |
| 125 | - "id" => $id | |
| 126 | - )); | |
| 127 | - | |
| 128 | - // disallow duplicate names for snippets | |
| 129 | -        $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_snippets'), "name='{$name}' AND id!='{$id}'"); | |
| 130 | -        if ($modx->db->getValue($rs) > 0) { | |
| 131 | - $modx->manager->saveFormValues(22); | |
| 132 | -            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=22&id={$id}"); | |
| 133 | - } | |
| 134 | - | |
| 135 | - //do stuff to save the edited doc | |
| 136 | - $modx->db->update(array( | |
| 137 | - 'name' => $name, | |
| 138 | - 'description' => $description, | |
| 139 | - 'snippet' => $snippet, | |
| 140 | - 'moduleguid' => $moduleguid, | |
| 141 | - 'locked' => $locked, | |
| 142 | - 'properties' => $properties, | |
| 143 | - 'category' => $categoryid, | |
| 144 | - 'disabled' => $disabled, | |
| 145 | - 'editedon' => $currentdate | |
| 146 | -        ), $modx->getFullTableName('site_snippets'), "id='{$id}'"); | |
| 147 | - | |
| 148 | - // invoke OnSnipFormSave event | |
| 149 | -        $modx->invokeEvent("OnSnipFormSave", array( | |
| 150 | - "mode" => "upd", | |
| 151 | - "id" => $id | |
| 152 | - )); | |
| 153 | - | |
| 154 | - // Set the item name for logger | |
| 155 | - $_SESSION['itemname'] = $name; | |
| 156 | - | |
| 157 | - // empty cache | |
| 158 | -        $modx->clearCache('full'); | |
| 159 | - | |
| 160 | -        if ($_POST['runsnippet']) { | |
| 161 | - run_snippet($snippet); | |
| 162 | - } | |
| 163 | - // finished emptying cache - redirect | |
| 164 | -        if ($_POST['stay'] != '') { | |
| 165 | - $a = ($_POST['stay'] == '2') ? "22&id=$id" : "23"; | |
| 166 | - $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay']; | |
| 167 | - header($header); | |
| 168 | -        } else { | |
| 169 | - $modx->unlockElement(4, $id); | |
| 170 | - $header = "Location: index.php?a=76&r=2"; | |
| 171 | - header($header); | |
| 172 | - } | |
| 173 | - break; | |
| 174 | - default: | |
| 175 | -        $modx->webAlertAndQuit("No operation set in request."); | |
| 69 | + case '23': // Save new snippet | |
| 70 | + | |
| 71 | + // invoke OnBeforeSnipFormSave event | |
| 72 | +            $modx->invokeEvent("OnBeforeSnipFormSave", array( | |
| 73 | + "mode" => "new", | |
| 74 | + "id" => $id | |
| 75 | + )); | |
| 76 | + | |
| 77 | + // disallow duplicate names for new snippets | |
| 78 | +            $rs = $modx->db->select('COUNT(id)', $modx->getFullTableName('site_snippets'), "name='{$name}'"); | |
| 79 | + $count = $modx->db->getValue($rs); | |
| 80 | +            if ($count > 0) { | |
| 81 | + $modx->manager->saveFormValues(23); | |
| 82 | + $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=23"); | |
| 83 | + } | |
| 84 | + | |
| 85 | + //do stuff to save the new doc | |
| 86 | + $newid = $modx->db->insert(array( | |
| 87 | + 'name' => $name, | |
| 88 | + 'description' => $description, | |
| 89 | + 'snippet' => $snippet, | |
| 90 | + 'moduleguid' => $moduleguid, | |
| 91 | + 'locked' => $locked, | |
| 92 | + 'properties' => $properties, | |
| 93 | + 'category' => $categoryid, | |
| 94 | + 'disabled' => $disabled, | |
| 95 | + 'createdon' => $currentdate, | |
| 96 | + 'editedon' => $currentdate | |
| 97 | +            ), $modx->getFullTableName('site_snippets')); | |
| 98 | + | |
| 99 | + // invoke OnSnipFormSave event | |
| 100 | +            $modx->invokeEvent("OnSnipFormSave", array( | |
| 101 | + "mode" => "new", | |
| 102 | + "id" => $newid | |
| 103 | + )); | |
| 104 | + | |
| 105 | + // Set the item name for logger | |
| 106 | + $_SESSION['itemname'] = $name; | |
| 107 | + | |
| 108 | + // empty cache | |
| 109 | +            $modx->clearCache('full'); | |
| 110 | + | |
| 111 | + // finished emptying cache - redirect | |
| 112 | +            if ($_POST['stay'] != '') { | |
| 113 | + $a = ($_POST['stay'] == '2') ? "22&id=$newid" : "23"; | |
| 114 | + $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay']; | |
| 115 | + header($header); | |
| 116 | +            } else { | |
| 117 | + $header = "Location: index.php?a=76&r=2"; | |
| 118 | + header($header); | |
| 119 | + } | |
| 120 | + break; | |
| 121 | + case '22': // Save existing snippet | |
| 122 | + // invoke OnBeforeSnipFormSave event | |
| 123 | +            $modx->invokeEvent("OnBeforeSnipFormSave", array( | |
| 124 | + "mode" => "upd", | |
| 125 | + "id" => $id | |
| 126 | + )); | |
| 127 | + | |
| 128 | + // disallow duplicate names for snippets | |
| 129 | +            $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_snippets'), "name='{$name}' AND id!='{$id}'"); | |
| 130 | +            if ($modx->db->getValue($rs) > 0) { | |
| 131 | + $modx->manager->saveFormValues(22); | |
| 132 | +                $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['snippet'], $name), "index.php?a=22&id={$id}"); | |
| 133 | + } | |
| 134 | + | |
| 135 | + //do stuff to save the edited doc | |
| 136 | + $modx->db->update(array( | |
| 137 | + 'name' => $name, | |
| 138 | + 'description' => $description, | |
| 139 | + 'snippet' => $snippet, | |
| 140 | + 'moduleguid' => $moduleguid, | |
| 141 | + 'locked' => $locked, | |
| 142 | + 'properties' => $properties, | |
| 143 | + 'category' => $categoryid, | |
| 144 | + 'disabled' => $disabled, | |
| 145 | + 'editedon' => $currentdate | |
| 146 | +            ), $modx->getFullTableName('site_snippets'), "id='{$id}'"); | |
| 147 | + | |
| 148 | + // invoke OnSnipFormSave event | |
| 149 | +            $modx->invokeEvent("OnSnipFormSave", array( | |
| 150 | + "mode" => "upd", | |
| 151 | + "id" => $id | |
| 152 | + )); | |
| 153 | + | |
| 154 | + // Set the item name for logger | |
| 155 | + $_SESSION['itemname'] = $name; | |
| 156 | + | |
| 157 | + // empty cache | |
| 158 | +            $modx->clearCache('full'); | |
| 159 | + | |
| 160 | +            if ($_POST['runsnippet']) { | |
| 161 | + run_snippet($snippet); | |
| 162 | + } | |
| 163 | + // finished emptying cache - redirect | |
| 164 | +            if ($_POST['stay'] != '') { | |
| 165 | + $a = ($_POST['stay'] == '2') ? "22&id=$id" : "23"; | |
| 166 | + $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay']; | |
| 167 | + header($header); | |
| 168 | +            } else { | |
| 169 | + $modx->unlockElement(4, $id); | |
| 170 | + $header = "Location: index.php?a=76&r=2"; | |
| 171 | + header($header); | |
| 172 | + } | |
| 173 | + break; | |
| 174 | + default: | |
| 175 | +            $modx->webAlertAndQuit("No operation set in request."); | |
| 176 | 176 | } | 
| @@ -4,18 +4,18 @@ | ||
| 4 | 4 | } | 
| 5 | 5 | |
| 6 | 6 |  switch ($modx->manager->action) { | 
| 7 | - case 78: | |
| 8 | -        if (!$modx->hasPermission('edit_chunk')) { | |
| 9 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 10 | - } | |
| 11 | - break; | |
| 12 | - case 77: | |
| 13 | -        if (!$modx->hasPermission('new_chunk')) { | |
| 7 | + case 78: | |
| 8 | +            if (!$modx->hasPermission('edit_chunk')) { | |
| 9 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 10 | + } | |
| 11 | + break; | |
| 12 | + case 77: | |
| 13 | +            if (!$modx->hasPermission('new_chunk')) { | |
| 14 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 15 | + } | |
| 16 | + break; | |
| 17 | + default: | |
| 14 | 18 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); | 
| 15 | - } | |
| 16 | - break; | |
| 17 | - default: | |
| 18 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 19 | 19 | } | 
| 20 | 20 | |
| 21 | 21 | $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0; | 
| @@ -4,18 +4,18 @@ | ||
| 4 | 4 | } | 
| 5 | 5 | |
| 6 | 6 |  switch($modx->manager->action) {
 | 
| 7 | - case 88: | |
| 8 | -		if(!$modx->hasPermission('edit_web_user')) {
 | |
| 9 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 10 | - } | |
| 11 | - break; | |
| 12 | - case 87: | |
| 13 | -		if(!$modx->hasPermission('new_web_user')) {
 | |
| 14 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 15 | - } | |
| 16 | - break; | |
| 17 | - default: | |
| 18 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 7 | + case 88: | |
| 8 | +		    if(!$modx->hasPermission('edit_web_user')) {
 | |
| 9 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 10 | + } | |
| 11 | + break; | |
| 12 | + case 87: | |
| 13 | +		    if(!$modx->hasPermission('new_web_user')) {
 | |
| 14 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 15 | + } | |
| 16 | + break; | |
| 17 | + default: | |
| 18 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 19 | 19 | } | 
| 20 | 20 | |
| 21 | 21 | $user = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0; | 
| @@ -4,18 +4,18 @@ | ||
| 4 | 4 | } | 
| 5 | 5 | |
| 6 | 6 |  switch($modx->manager->action) { | 
| 7 | - case 16: | |
| 8 | -		if(!$modx->hasPermission('edit_template')) { | |
| 9 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 10 | - } | |
| 11 | - break; | |
| 12 | - case 19: | |
| 13 | -		if(!$modx->hasPermission('new_template')) { | |
| 14 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 15 | - } | |
| 16 | - break; | |
| 17 | - default: | |
| 18 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 7 | + case 16: | |
| 8 | +		    if(!$modx->hasPermission('edit_template')) { | |
| 9 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 10 | + } | |
| 11 | + break; | |
| 12 | + case 19: | |
| 13 | +		    if(!$modx->hasPermission('new_template')) { | |
| 14 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 15 | + } | |
| 16 | + break; | |
| 17 | + default: | |
| 18 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 19 | 19 | } | 
| 20 | 20 | |
| 21 | 21 | $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0; | 
| @@ -3,18 +3,18 @@ | ||
| 3 | 3 |  	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 | 
| 4 | 4 | } | 
| 5 | 5 |  switch($modx->manager->action) {
 | 
| 6 | - case 107: | |
| 7 | -		if(!$modx->hasPermission('new_module')) {
 | |
| 8 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 9 | - } | |
| 10 | - break; | |
| 11 | - case 108: | |
| 12 | -		if(!$modx->hasPermission('edit_module')) {
 | |
| 13 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 14 | - } | |
| 15 | - break; | |
| 16 | - default: | |
| 17 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 6 | + case 107: | |
| 7 | +		    if(!$modx->hasPermission('new_module')) {
 | |
| 8 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 9 | + } | |
| 10 | + break; | |
| 11 | + case 108: | |
| 12 | +		    if(!$modx->hasPermission('edit_module')) {
 | |
| 13 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 14 | + } | |
| 15 | + break; | |
| 16 | + default: | |
| 17 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 18 | 18 | } | 
| 19 | 19 | $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0; | 
| 20 | 20 | // Get table names (alphabetical) | 
| @@ -4,18 +4,18 @@ | ||
| 4 | 4 | } | 
| 5 | 5 | |
| 6 | 6 |  switch ($modx->manager->action) { | 
| 7 | - case 102: | |
| 8 | -        if (!$modx->hasPermission('edit_plugin')) { | |
| 9 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 10 | - } | |
| 11 | - break; | |
| 12 | - case 101: | |
| 13 | -        if (!$modx->hasPermission('new_plugin')) { | |
| 7 | + case 102: | |
| 8 | +            if (!$modx->hasPermission('edit_plugin')) { | |
| 9 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 10 | + } | |
| 11 | + break; | |
| 12 | + case 101: | |
| 13 | +            if (!$modx->hasPermission('new_plugin')) { | |
| 14 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 15 | + } | |
| 16 | + break; | |
| 17 | + default: | |
| 14 | 18 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); | 
| 15 | - } | |
| 16 | - break; | |
| 17 | - default: | |
| 18 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 19 | 19 | } | 
| 20 | 20 | |
| 21 | 21 | $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0; | 
| @@ -4,18 +4,18 @@ | ||
| 4 | 4 | } | 
| 5 | 5 | |
| 6 | 6 |  switch ($modx->manager->action) { | 
| 7 | - case 22: | |
| 8 | -        if (!$modx->hasPermission('edit_snippet')) { | |
| 9 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 10 | - } | |
| 11 | - break; | |
| 12 | - case 23: | |
| 13 | -        if (!$modx->hasPermission('new_snippet')) { | |
| 7 | + case 22: | |
| 8 | +            if (!$modx->hasPermission('edit_snippet')) { | |
| 9 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 10 | + } | |
| 11 | + break; | |
| 12 | + case 23: | |
| 13 | +            if (!$modx->hasPermission('new_snippet')) { | |
| 14 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 15 | + } | |
| 16 | + break; | |
| 17 | + default: | |
| 14 | 18 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); | 
| 15 | - } | |
| 16 | - break; | |
| 17 | - default: | |
| 18 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 19 | 19 | } | 
| 20 | 20 | |
| 21 | 21 | $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0; | 
| @@ -280,19 +280,19 @@ | ||
| 280 | 280 | // invoke OnBeforeDocFormSave event | 
| 281 | 281 | switch($modx->config['docid_incrmnt_method']) | 
| 282 | 282 |              { | 
| 283 | - case '1': | |
| 284 | -                $from = "{$tbl_site_content} AS T0 LEFT JOIN {$tbl_site_content} AS T1 ON T0.id + 1 = T1.id"; | |
| 285 | - $where = "T1.id IS NULL"; | |
| 286 | -                $rs = $modx->db->select('MIN(T0.id)+1', $from, "T1.id IS NULL"); | |
| 287 | - $id = $modx->db->getValue($rs); | |
| 283 | + case '1': | |
| 284 | +                    $from = "{$tbl_site_content} AS T0 LEFT JOIN {$tbl_site_content} AS T1 ON T0.id + 1 = T1.id"; | |
| 285 | + $where = "T1.id IS NULL"; | |
| 286 | +                    $rs = $modx->db->select('MIN(T0.id)+1', $from, "T1.id IS NULL"); | |
| 287 | + $id = $modx->db->getValue($rs); | |
| 288 | + break; | |
| 289 | + case '2': | |
| 290 | +                    $rs = $modx->db->select('MAX(id)+1', $tbl_site_content); | |
| 291 | + $id = $modx->db->getValue($rs); | |
| 288 | 292 | break; | 
| 289 | - case '2': | |
| 290 | -                $rs = $modx->db->select('MAX(id)+1', $tbl_site_content); | |
| 291 | - $id = $modx->db->getValue($rs); | |
| 292 | - break; | |
| 293 | 293 | |
| 294 | - default: | |
| 295 | - $id = ''; | |
| 294 | + default: | |
| 295 | + $id = ''; | |
| 296 | 296 | } | 
| 297 | 297 | |
| 298 | 298 |          $modx->invokeEvent("OnBeforeDocFormSave", array( | 
| @@ -4,18 +4,18 @@ | ||
| 4 | 4 | } | 
| 5 | 5 | |
| 6 | 6 |  switch($modx->manager->action) { | 
| 7 | - case 12: | |
| 8 | -		if(!$modx->hasPermission('edit_user')) { | |
| 9 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 10 | - } | |
| 11 | - break; | |
| 12 | - case 11: | |
| 13 | -		if(!$modx->hasPermission('new_user')) { | |
| 14 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 15 | - } | |
| 16 | - break; | |
| 17 | - default: | |
| 18 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 7 | + case 12: | |
| 8 | +		    if(!$modx->hasPermission('edit_user')) { | |
| 9 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 10 | + } | |
| 11 | + break; | |
| 12 | + case 11: | |
| 13 | +		    if(!$modx->hasPermission('new_user')) { | |
| 14 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 15 | + } | |
| 16 | + break; | |
| 17 | + default: | |
| 18 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); | |
| 19 | 19 | } | 
| 20 | 20 | |
| 21 | 21 | $user = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0; |