evolution-cms /
evolution
@@ -131,8 +131,8 @@ discard block |
||
| 131 | 131 | */ |
| 132 | 132 | function ProcessFile($file) { |
| 133 | 133 | // get the file |
| 134 | - $buffer = @file_get_contents($file); |
|
| 135 | - if ($buffer === false) $buffer = " Could not retrieve document '$file'."; |
|
| 134 | + $buffer = @file_get_contents($file); |
|
| 135 | + if ($buffer === false) $buffer = " Could not retrieve document '$file'."; |
|
| 136 | 136 | return $buffer; |
| 137 | 137 | } |
| 138 | 138 | |
@@ -168,20 +168,20 @@ discard block |
||
| 168 | 168 | function parseTvValues($param, $tvsArray) |
| 169 | 169 | { |
| 170 | 170 | $modx = evolutionCMS(); |
| 171 | - $tvsArray = is_array($modx->documentObject) ? array_merge($tvsArray, $modx->documentObject) : $tvsArray; |
|
| 172 | - if (strpos($param, '[*') !== false) { |
|
| 173 | - $matches = $modx->getTagsFromContent($param, '[*', '*]'); |
|
| 174 | - foreach ($matches[0] as $i=>$match) { |
|
| 175 | - if(isset($tvsArray[ $matches[1][$i] ])) { |
|
| 176 | - if(is_array($tvsArray[ $matches[1][$i] ])) { |
|
| 177 | - $value = $tvsArray[$matches[1][$i]]['value']; |
|
| 178 | - $value = $value === '' ? $tvsArray[$matches[1][$i]]['default_text'] : $value; |
|
| 179 | - } else { |
|
| 180 | - $value = $tvsArray[ $matches[1][$i] ]; |
|
| 181 | - } |
|
| 182 | - $param = str_replace($match, $value, $param); |
|
| 183 | - } |
|
| 184 | - } |
|
| 185 | - } |
|
| 186 | - return $param; |
|
| 171 | + $tvsArray = is_array($modx->documentObject) ? array_merge($tvsArray, $modx->documentObject) : $tvsArray; |
|
| 172 | + if (strpos($param, '[*') !== false) { |
|
| 173 | + $matches = $modx->getTagsFromContent($param, '[*', '*]'); |
|
| 174 | + foreach ($matches[0] as $i=>$match) { |
|
| 175 | + if(isset($tvsArray[ $matches[1][$i] ])) { |
|
| 176 | + if(is_array($tvsArray[ $matches[1][$i] ])) { |
|
| 177 | + $value = $tvsArray[$matches[1][$i]]['value']; |
|
| 178 | + $value = $value === '' ? $tvsArray[$matches[1][$i]]['default_text'] : $value; |
|
| 179 | + } else { |
|
| 180 | + $value = $tvsArray[ $matches[1][$i] ]; |
|
| 181 | + } |
|
| 182 | + $param = str_replace($match, $value, $param); |
|
| 183 | + } |
|
| 184 | + } |
|
| 185 | + } |
|
| 186 | + return $param; |
|
| 187 | 187 | } |
@@ -10,178 +10,178 @@ |
||
| 10 | 10 | Class TemplateParser {
|
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | - * @param array $config [action, tabs, toArray] |
|
| 14 | - * @param array $data |
|
| 15 | - * @return string |
|
| 16 | - */ |
|
| 17 | - public function output($config = array(), $data = array()) {
|
|
| 13 | + * @param array $config [action, tabs, toArray] |
|
| 14 | + * @param array $data |
|
| 15 | + * @return string |
|
| 16 | + */ |
|
| 17 | + public function output($config = array(), $data = array()) {
|
|
| 18 | 18 | $modx = evolutionCMS(); |
| 19 | 19 | |
| 20 | - $output = ''; |
|
| 21 | - $action = !empty($config['action']) ? $config['action'] : (!empty($_REQUEST['a']) ? $_REQUEST['a'] : ''); |
|
| 22 | - $tab = isset($config['tab']) ? ' AND tab IN(' . $config['tab'] . ')' : '';
|
|
| 20 | + $output = ''; |
|
| 21 | + $action = !empty($config['action']) ? $config['action'] : (!empty($_REQUEST['a']) ? $_REQUEST['a'] : ''); |
|
| 22 | + $tab = isset($config['tab']) ? ' AND tab IN(' . $config['tab'] . ')' : '';
|
|
| 23 | 23 | |
| 24 | - if($action) {
|
|
| 25 | - $sql = $modx->db->query('SELECT t1.*, IF(t1.alias=\'\',t1.name,t1.alias) AS alias, t2.category AS category_name
|
|
| 24 | + if($action) {
|
|
| 25 | + $sql = $modx->db->query('SELECT t1.*, IF(t1.alias=\'\',t1.name,t1.alias) AS alias, t2.category AS category_name
|
|
| 26 | 26 | FROM ' . $modx->getFullTableName('system_templates') . ' AS t1
|
| 27 | 27 | INNER JOIN ' . $modx->getFullTableName('categories') . ' AS t2 ON t2.id=t1.category
|
| 28 | 28 | WHERE t1.action IN(' . $action . ') ' . $tab . '
|
| 29 | 29 | ORDER BY t1.tab ASC, t1.rank ASC'); |
| 30 | 30 | |
| 31 | - if($modx->db->getRecordCount($sql)) {
|
|
| 32 | - $tabs = array(); |
|
| 33 | - while($row = $modx->db->getRow($sql)) {
|
|
| 34 | - if(!$row['value'] && !empty($data[$row['name']])) {
|
|
| 35 | - $row['value'] = $data[$row['name']]; |
|
| 36 | - } |
|
| 37 | - $tabs[$row['tab']]['category_name'] = $row['category_name']; |
|
| 38 | - $tabs[$row['tab']][$row['name']] = TemplateParser::render($row); |
|
| 39 | - } |
|
| 40 | - |
|
| 41 | - if(!empty($config['toArray'])) {
|
|
| 42 | - $output = $tabs; |
|
| 43 | - } else {
|
|
| 44 | - $output .= '<div class="tab-pane" id="pane_' . $action . '">'; |
|
| 45 | - $output .= ' |
|
| 31 | + if($modx->db->getRecordCount($sql)) {
|
|
| 32 | + $tabs = array(); |
|
| 33 | + while($row = $modx->db->getRow($sql)) {
|
|
| 34 | + if(!$row['value'] && !empty($data[$row['name']])) {
|
|
| 35 | + $row['value'] = $data[$row['name']]; |
|
| 36 | + } |
|
| 37 | + $tabs[$row['tab']]['category_name'] = $row['category_name']; |
|
| 38 | + $tabs[$row['tab']][$row['name']] = TemplateParser::render($row); |
|
| 39 | + } |
|
| 40 | + |
|
| 41 | + if(!empty($config['toArray'])) {
|
|
| 42 | + $output = $tabs; |
|
| 43 | + } else {
|
|
| 44 | + $output .= '<div class="tab-pane" id="pane_' . $action . '">'; |
|
| 45 | + $output .= ' |
|
| 46 | 46 | <script type="text/javascript"> |
| 47 | 47 | var pane_' . $action . ' = new WebFXTabPane(document.getElementById("pane_' . $action . '"), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');
|
| 48 | 48 | </script>'; |
| 49 | 49 | |
| 50 | - foreach($tabs as $idTab => $tab) {
|
|
| 51 | - $output .= '<div class="tab-page" id="tab_' . $action . '_' . $idTab . '">'; |
|
| 52 | - $output .= ' |
|
| 50 | + foreach($tabs as $idTab => $tab) {
|
|
| 51 | + $output .= '<div class="tab-page" id="tab_' . $action . '_' . $idTab . '">'; |
|
| 52 | + $output .= ' |
|
| 53 | 53 | <h2 class="tab">' . (!empty($config['tabs'][$idTab]) ? $config['tabs'][$idTab] : $tab['category_name']) . '</h2> |
| 54 | 54 | <script type="text/javascript">pane_' . $action . '.addTabPage(document.getElementById("tab_' . $action . '_' . $idTab . '"));</script>';
|
| 55 | - unset($tab['category_name']); |
|
| 56 | - foreach($tab as $item) {
|
|
| 57 | - $output .= $item; |
|
| 58 | - } |
|
| 59 | - $output .= '</div>'; |
|
| 60 | - } |
|
| 61 | - $output .= '</div>'; |
|
| 62 | - } |
|
| 63 | - } |
|
| 64 | - } |
|
| 65 | - |
|
| 66 | - return $output; |
|
| 67 | - } |
|
| 55 | + unset($tab['category_name']); |
|
| 56 | + foreach($tab as $item) {
|
|
| 57 | + $output .= $item; |
|
| 58 | + } |
|
| 59 | + $output .= '</div>'; |
|
| 60 | + } |
|
| 61 | + $output .= '</div>'; |
|
| 62 | + } |
|
| 63 | + } |
|
| 64 | + } |
|
| 65 | + |
|
| 66 | + return $output; |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | 69 | /** |
| 70 | 70 | * @param array $data |
| 71 | 71 | * @return string |
| 72 | 72 | */ |
| 73 | - private function render($data) {
|
|
| 74 | - $modx = evolutionCMS(); global $_lang, $_country_lang; |
|
| 73 | + private function render($data) {
|
|
| 74 | + $modx = evolutionCMS(); global $_lang, $_country_lang; |
|
| 75 | 75 | |
| 76 | - $data['lang.name'] = (isset($_lang[$data['alias']]) ? $_lang[$data['alias']] : $data['alias']); |
|
| 77 | - $data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $_POST[$data['name']][$data['value']] : (isset($data['value']) ? $modx->htmlspecialchars($data['value']) : '')); |
|
| 78 | - $data['readonly'] = ($data['readonly'] ? ' readonly' : ''); |
|
| 76 | + $data['lang.name'] = (isset($_lang[$data['alias']]) ? $_lang[$data['alias']] : $data['alias']); |
|
| 77 | + $data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $_POST[$data['name']][$data['value']] : (isset($data['value']) ? $modx->htmlspecialchars($data['value']) : '')); |
|
| 78 | + $data['readonly'] = ($data['readonly'] ? ' readonly' : ''); |
|
| 79 | 79 | |
| 80 | - $output = ''; |
|
| 81 | - $output .= '<div class="form-group row">'; |
|
| 80 | + $output = ''; |
|
| 81 | + $output .= '<div class="form-group row">'; |
|
| 82 | 82 | |
| 83 | - switch($data['type']) {
|
|
| 83 | + switch($data['type']) {
|
|
| 84 | 84 | |
| 85 | - case 'text': |
|
| 86 | - $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label> |
|
| 85 | + case 'text': |
|
| 86 | + $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label> |
|
| 87 | 87 | <div class="col-sm-7"> |
| 88 | 88 | <input type="text" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />'; |
| 89 | - $output .= $data['content']; |
|
| 90 | - $output .= '</div>'; |
|
| 89 | + $output .= $data['content']; |
|
| 90 | + $output .= '</div>'; |
|
| 91 | 91 | |
| 92 | - break; |
|
| 92 | + break; |
|
| 93 | 93 | |
| 94 | - case 'textarea': |
|
| 95 | - $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label> |
|
| 94 | + case 'textarea': |
|
| 95 | + $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label> |
|
| 96 | 96 | <div class="col-sm-7"> |
| 97 | 97 | <textarea name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;"[+readonly+]>[+value+]</textarea>'; |
| 98 | - $output .= $data['content']; |
|
| 99 | - $output .= '</div>'; |
|
| 98 | + $output .= $data['content']; |
|
| 99 | + $output .= '</div>'; |
|
| 100 | 100 | |
| 101 | - break; |
|
| 101 | + break; |
|
| 102 | 102 | |
| 103 | - case 'date': |
|
| 104 | - $data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $modx->toDateFormat($_POST[$data['name']][$data['value']]) : (isset($data['value']) ? $modx->toDateFormat($data['value']) : '')); |
|
| 105 | - $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label> |
|
| 103 | + case 'date': |
|
| 104 | + $data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $modx->toDateFormat($_POST[$data['name']][$data['value']]) : (isset($data['value']) ? $modx->toDateFormat($data['value']) : '')); |
|
| 105 | + $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label> |
|
| 106 | 106 | <div class="col-sm-7"> |
| 107 | 107 | <input type="text" name="[+name+]" class="form-control DatePicker" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />'; |
| 108 | - $output .= $data['content']; |
|
| 109 | - $output .= '</div>'; |
|
| 110 | - |
|
| 111 | - break; |
|
| 112 | - |
|
| 113 | - case 'select': |
|
| 114 | - $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>'; |
|
| 115 | - $output .= '<div class="col-sm-7">'; |
|
| 116 | - $output .= '<select name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;">'; |
|
| 117 | - if($data['name'] == 'country' && isset($_country_lang)) {
|
|
| 118 | - $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $data['country']; |
|
| 119 | - $output .= '<option value=""' . (!isset($chosenCountry) ? ' selected' : '') . '> </option>'; |
|
| 120 | - foreach($_country_lang as $key => $value) {
|
|
| 121 | - $output .= '<option value="' . $key . '"' . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . '>' . $value . '</option>'; |
|
| 122 | - } |
|
| 123 | - } else {
|
|
| 124 | - if($data['elements']) {
|
|
| 125 | - $elements = explode('||', $data['elements']);
|
|
| 126 | - foreach($elements as $key => $value) {
|
|
| 127 | - $value = explode('==', $value);
|
|
| 128 | - $output .= '<option value="' . $value[1] . '">' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]) . '</option>'; |
|
| 129 | - } |
|
| 130 | - } |
|
| 131 | - } |
|
| 132 | - $output .= '</select>'; |
|
| 133 | - $output .= $data['content']; |
|
| 134 | - $output .= '</div>'; |
|
| 135 | - |
|
| 136 | - break; |
|
| 137 | - |
|
| 138 | - case 'checkbox': |
|
| 139 | - $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>'; |
|
| 140 | - $output .= '<div class="col-sm-7">'; |
|
| 141 | - $output .= '<input type="checkbox" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />'; |
|
| 142 | - if($data['elements']) {
|
|
| 143 | - $elements = explode('||', $data['elements']);
|
|
| 144 | - foreach($elements as $key => $value) {
|
|
| 145 | - $value = explode('==', $value);
|
|
| 146 | - $output .= '<br /><input type="checkbox" name="' . $value[0] . '" class="form-control" id="' . $value[0] . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]); |
|
| 147 | - } |
|
| 148 | - } |
|
| 149 | - $output .= $data['content']; |
|
| 150 | - $output .= '</div>'; |
|
| 151 | - |
|
| 152 | - break; |
|
| 153 | - |
|
| 154 | - case 'radio': |
|
| 155 | - $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>'; |
|
| 156 | - $output .= '<div class="col-sm-7">'; |
|
| 157 | - $output .= '<input type="radio" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />'; |
|
| 158 | - if($data['elements']) {
|
|
| 159 | - $elements = explode('||', $data['elements']);
|
|
| 160 | - foreach($elements as $key => $value) {
|
|
| 161 | - $value = explode('==', $value);
|
|
| 162 | - $output .= '<br /><input type="radio" name="[+name+]" class="form-control" id="[+name+]_' . $key . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]); |
|
| 163 | - } |
|
| 164 | - } |
|
| 165 | - $output .= $data['content']; |
|
| 166 | - $output .= '</div>'; |
|
| 167 | - |
|
| 168 | - break; |
|
| 169 | - |
|
| 170 | - case 'custom': |
|
| 171 | - $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>'; |
|
| 172 | - $output .= '<div class="col-sm-7">'; |
|
| 173 | - $output .= $data['content']; |
|
| 174 | - $output .= '</div>'; |
|
| 175 | - |
|
| 176 | - break; |
|
| 177 | - } |
|
| 178 | - |
|
| 179 | - $output .= '</div>'; |
|
| 180 | - |
|
| 181 | - $output = $modx->parseText($output, $data); |
|
| 182 | - |
|
| 183 | - return $output; |
|
| 184 | - } |
|
| 108 | + $output .= $data['content']; |
|
| 109 | + $output .= '</div>'; |
|
| 110 | + |
|
| 111 | + break; |
|
| 112 | + |
|
| 113 | + case 'select': |
|
| 114 | + $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>'; |
|
| 115 | + $output .= '<div class="col-sm-7">'; |
|
| 116 | + $output .= '<select name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;">'; |
|
| 117 | + if($data['name'] == 'country' && isset($_country_lang)) {
|
|
| 118 | + $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $data['country']; |
|
| 119 | + $output .= '<option value=""' . (!isset($chosenCountry) ? ' selected' : '') . '> </option>'; |
|
| 120 | + foreach($_country_lang as $key => $value) {
|
|
| 121 | + $output .= '<option value="' . $key . '"' . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . '>' . $value . '</option>'; |
|
| 122 | + } |
|
| 123 | + } else {
|
|
| 124 | + if($data['elements']) {
|
|
| 125 | + $elements = explode('||', $data['elements']);
|
|
| 126 | + foreach($elements as $key => $value) {
|
|
| 127 | + $value = explode('==', $value);
|
|
| 128 | + $output .= '<option value="' . $value[1] . '">' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]) . '</option>'; |
|
| 129 | + } |
|
| 130 | + } |
|
| 131 | + } |
|
| 132 | + $output .= '</select>'; |
|
| 133 | + $output .= $data['content']; |
|
| 134 | + $output .= '</div>'; |
|
| 135 | + |
|
| 136 | + break; |
|
| 137 | + |
|
| 138 | + case 'checkbox': |
|
| 139 | + $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>'; |
|
| 140 | + $output .= '<div class="col-sm-7">'; |
|
| 141 | + $output .= '<input type="checkbox" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />'; |
|
| 142 | + if($data['elements']) {
|
|
| 143 | + $elements = explode('||', $data['elements']);
|
|
| 144 | + foreach($elements as $key => $value) {
|
|
| 145 | + $value = explode('==', $value);
|
|
| 146 | + $output .= '<br /><input type="checkbox" name="' . $value[0] . '" class="form-control" id="' . $value[0] . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]); |
|
| 147 | + } |
|
| 148 | + } |
|
| 149 | + $output .= $data['content']; |
|
| 150 | + $output .= '</div>'; |
|
| 151 | + |
|
| 152 | + break; |
|
| 153 | + |
|
| 154 | + case 'radio': |
|
| 155 | + $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>'; |
|
| 156 | + $output .= '<div class="col-sm-7">'; |
|
| 157 | + $output .= '<input type="radio" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />'; |
|
| 158 | + if($data['elements']) {
|
|
| 159 | + $elements = explode('||', $data['elements']);
|
|
| 160 | + foreach($elements as $key => $value) {
|
|
| 161 | + $value = explode('==', $value);
|
|
| 162 | + $output .= '<br /><input type="radio" name="[+name+]" class="form-control" id="[+name+]_' . $key . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]); |
|
| 163 | + } |
|
| 164 | + } |
|
| 165 | + $output .= $data['content']; |
|
| 166 | + $output .= '</div>'; |
|
| 167 | + |
|
| 168 | + break; |
|
| 169 | + |
|
| 170 | + case 'custom': |
|
| 171 | + $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>'; |
|
| 172 | + $output .= '<div class="col-sm-7">'; |
|
| 173 | + $output .= $data['content']; |
|
| 174 | + $output .= '</div>'; |
|
| 175 | + |
|
| 176 | + break; |
|
| 177 | + } |
|
| 178 | + |
|
| 179 | + $output .= '</div>'; |
|
| 180 | + |
|
| 181 | + $output = $modx->parseText($output, $data); |
|
| 182 | + |
|
| 183 | + return $output; |
|
| 184 | + } |
|
| 185 | 185 | |
| 186 | 186 | } |
| 187 | 187 | |
@@ -21,320 +21,320 @@ discard block |
||
| 21 | 21 | $o = ''; |
| 22 | 22 | |
| 23 | 23 | // process any TV commands in value |
| 24 | - $docid = (int)$docid > 0 ? (int)$docid : $modx->documentIdentifier; |
|
| 25 | - $value = ProcessTVCommand($value, $name, $docid); |
|
| 24 | + $docid = (int)$docid > 0 ? (int)$docid : $modx->documentIdentifier; |
|
| 25 | + $value = ProcessTVCommand($value, $name, $docid); |
|
| 26 | 26 | |
| 27 | - $params = array(); |
|
| 28 | - if($paramstring) { |
|
| 29 | - $cp = explode("&", $paramstring); |
|
| 30 | - foreach($cp as $p => $v) { |
|
| 31 | - $v = trim($v); // trim |
|
| 32 | - $ar = explode("=", $v); |
|
| 33 | - if(is_array($ar) && count($ar) == 2) { |
|
| 34 | - $params[$ar[0]] = decodeParamValue($ar[1]); |
|
| 35 | - } |
|
| 36 | - } |
|
| 37 | - } |
|
| 27 | + $params = array(); |
|
| 28 | + if($paramstring) { |
|
| 29 | + $cp = explode("&", $paramstring); |
|
| 30 | + foreach($cp as $p => $v) { |
|
| 31 | + $v = trim($v); // trim |
|
| 32 | + $ar = explode("=", $v); |
|
| 33 | + if(is_array($ar) && count($ar) == 2) { |
|
| 34 | + $params[$ar[0]] = decodeParamValue($ar[1]); |
|
| 35 | + } |
|
| 36 | + } |
|
| 37 | + } |
|
| 38 | 38 | |
| 39 | - $id = "tv$name"; |
|
| 40 | - switch($format) { |
|
| 41 | - case 'image': |
|
| 42 | - $images = parseInput($value, '||', 'array'); |
|
| 43 | - foreach($images as $image) { |
|
| 44 | - if(!is_array($image)) { |
|
| 45 | - $image = explode('==', $image); |
|
| 46 | - } |
|
| 47 | - $src = $image[0]; |
|
| 39 | + $id = "tv$name"; |
|
| 40 | + switch($format) { |
|
| 41 | + case 'image': |
|
| 42 | + $images = parseInput($value, '||', 'array'); |
|
| 43 | + foreach($images as $image) { |
|
| 44 | + if(!is_array($image)) { |
|
| 45 | + $image = explode('==', $image); |
|
| 46 | + } |
|
| 47 | + $src = $image[0]; |
|
| 48 | 48 | |
| 49 | - if($src) { |
|
| 50 | - // We have a valid source |
|
| 51 | - $attributes = ''; |
|
| 52 | - $attr = array( |
|
| 53 | - 'class' => $params['class'], |
|
| 54 | - 'src' => $src, |
|
| 55 | - 'id' => ($params['id'] ? $params['id'] : ''), |
|
| 56 | - 'alt' => $modx->htmlspecialchars($params['alttext']), |
|
| 57 | - 'style' => $params['style'] |
|
| 58 | - ); |
|
| 59 | - if(isset($params['align']) && $params['align'] != 'none') { |
|
| 60 | - $attr['align'] = $params['align']; |
|
| 61 | - } |
|
| 62 | - foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : ''); |
|
| 63 | - $attributes .= ' ' . $params['attrib']; |
|
| 49 | + if($src) { |
|
| 50 | + // We have a valid source |
|
| 51 | + $attributes = ''; |
|
| 52 | + $attr = array( |
|
| 53 | + 'class' => $params['class'], |
|
| 54 | + 'src' => $src, |
|
| 55 | + 'id' => ($params['id'] ? $params['id'] : ''), |
|
| 56 | + 'alt' => $modx->htmlspecialchars($params['alttext']), |
|
| 57 | + 'style' => $params['style'] |
|
| 58 | + ); |
|
| 59 | + if(isset($params['align']) && $params['align'] != 'none') { |
|
| 60 | + $attr['align'] = $params['align']; |
|
| 61 | + } |
|
| 62 | + foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : ''); |
|
| 63 | + $attributes .= ' ' . $params['attrib']; |
|
| 64 | 64 | |
| 65 | - // Output the image with attributes |
|
| 66 | - $o .= '<img' . rtrim($attributes) . ' />'; |
|
| 67 | - } |
|
| 68 | - } |
|
| 69 | - break; |
|
| 65 | + // Output the image with attributes |
|
| 66 | + $o .= '<img' . rtrim($attributes) . ' />'; |
|
| 67 | + } |
|
| 68 | + } |
|
| 69 | + break; |
|
| 70 | 70 | |
| 71 | - case "delim": // display as delimitted list |
|
| 72 | - $value = parseInput($value, "||"); |
|
| 73 | - $p = $params['format'] ? $params['format'] : " "; |
|
| 74 | - if($p == "\\n") { |
|
| 75 | - $p = "\n"; |
|
| 76 | - } |
|
| 77 | - $o = str_replace("||", $p, $value); |
|
| 78 | - break; |
|
| 71 | + case "delim": // display as delimitted list |
|
| 72 | + $value = parseInput($value, "||"); |
|
| 73 | + $p = $params['format'] ? $params['format'] : " "; |
|
| 74 | + if($p == "\\n") { |
|
| 75 | + $p = "\n"; |
|
| 76 | + } |
|
| 77 | + $o = str_replace("||", $p, $value); |
|
| 78 | + break; |
|
| 79 | 79 | |
| 80 | - case "string": |
|
| 81 | - $value = parseInput($value); |
|
| 82 | - $format = strtolower($params['format']); |
|
| 83 | - if($format == 'upper case') { |
|
| 84 | - $o = strtoupper($value); |
|
| 85 | - } else if($format == 'lower case') { |
|
| 86 | - $o = strtolower($value); |
|
| 87 | - } else if($format == 'sentence case') { |
|
| 88 | - $o = ucfirst($value); |
|
| 89 | - } else if($format == 'capitalize') { |
|
| 90 | - $o = ucwords($value); |
|
| 91 | - } else { |
|
| 92 | - $o = $value; |
|
| 93 | - } |
|
| 94 | - break; |
|
| 80 | + case "string": |
|
| 81 | + $value = parseInput($value); |
|
| 82 | + $format = strtolower($params['format']); |
|
| 83 | + if($format == 'upper case') { |
|
| 84 | + $o = strtoupper($value); |
|
| 85 | + } else if($format == 'lower case') { |
|
| 86 | + $o = strtolower($value); |
|
| 87 | + } else if($format == 'sentence case') { |
|
| 88 | + $o = ucfirst($value); |
|
| 89 | + } else if($format == 'capitalize') { |
|
| 90 | + $o = ucwords($value); |
|
| 91 | + } else { |
|
| 92 | + $o = $value; |
|
| 93 | + } |
|
| 94 | + break; |
|
| 95 | 95 | |
| 96 | - case "date": |
|
| 97 | - if($value != '' || $params['default'] == 'Yes') { |
|
| 98 | - if(empty($value)) { |
|
| 99 | - $value = 'now'; |
|
| 100 | - } |
|
| 101 | - $timestamp = getUnixtimeFromDateString($value); |
|
| 102 | - $p = $params['format'] ? $params['format'] : "%A %d, %B %Y"; |
|
| 103 | - $o = strftime($p, $timestamp); |
|
| 104 | - } else { |
|
| 105 | - $value = ''; |
|
| 106 | - } |
|
| 107 | - break; |
|
| 96 | + case "date": |
|
| 97 | + if($value != '' || $params['default'] == 'Yes') { |
|
| 98 | + if(empty($value)) { |
|
| 99 | + $value = 'now'; |
|
| 100 | + } |
|
| 101 | + $timestamp = getUnixtimeFromDateString($value); |
|
| 102 | + $p = $params['format'] ? $params['format'] : "%A %d, %B %Y"; |
|
| 103 | + $o = strftime($p, $timestamp); |
|
| 104 | + } else { |
|
| 105 | + $value = ''; |
|
| 106 | + } |
|
| 107 | + break; |
|
| 108 | 108 | |
| 109 | - case "hyperlink": |
|
| 110 | - $value = parseInput($value, "||", "array"); |
|
| 111 | - $o = ''; |
|
| 112 | - $countValue = count($value); |
|
| 113 | - for($i = 0; $i < $countValue; $i++) { |
|
| 114 | - list($name, $url) = is_array($value[$i]) ? $value[$i] : explode("==", $value[$i]); |
|
| 115 | - if(!$url) { |
|
| 116 | - $url = $name; |
|
| 117 | - } |
|
| 118 | - if($url) { |
|
| 119 | - if($o) { |
|
| 120 | - $o .= '<br />'; |
|
| 121 | - } |
|
| 122 | - $attributes = ''; |
|
| 123 | - // setup the link attributes |
|
| 124 | - $attr = array( |
|
| 125 | - 'href' => $url, |
|
| 126 | - 'title' => $params['title'] ? $modx->htmlspecialchars($params['title']) : $name, |
|
| 127 | - 'class' => $params['class'], |
|
| 128 | - 'style' => $params['style'], |
|
| 129 | - 'target' => $params['target'], |
|
| 130 | - ); |
|
| 131 | - foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : ''); |
|
| 132 | - $attributes .= ' ' . $params['attrib']; // add extra |
|
| 109 | + case "hyperlink": |
|
| 110 | + $value = parseInput($value, "||", "array"); |
|
| 111 | + $o = ''; |
|
| 112 | + $countValue = count($value); |
|
| 113 | + for($i = 0; $i < $countValue; $i++) { |
|
| 114 | + list($name, $url) = is_array($value[$i]) ? $value[$i] : explode("==", $value[$i]); |
|
| 115 | + if(!$url) { |
|
| 116 | + $url = $name; |
|
| 117 | + } |
|
| 118 | + if($url) { |
|
| 119 | + if($o) { |
|
| 120 | + $o .= '<br />'; |
|
| 121 | + } |
|
| 122 | + $attributes = ''; |
|
| 123 | + // setup the link attributes |
|
| 124 | + $attr = array( |
|
| 125 | + 'href' => $url, |
|
| 126 | + 'title' => $params['title'] ? $modx->htmlspecialchars($params['title']) : $name, |
|
| 127 | + 'class' => $params['class'], |
|
| 128 | + 'style' => $params['style'], |
|
| 129 | + 'target' => $params['target'], |
|
| 130 | + ); |
|
| 131 | + foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : ''); |
|
| 132 | + $attributes .= ' ' . $params['attrib']; // add extra |
|
| 133 | 133 | |
| 134 | - // Output the link |
|
| 135 | - $o .= '<a' . rtrim($attributes) . '>' . ($params['text'] ? $modx->htmlspecialchars($params['text']) : $name) . '</a>'; |
|
| 136 | - } |
|
| 137 | - } |
|
| 138 | - break; |
|
| 134 | + // Output the link |
|
| 135 | + $o .= '<a' . rtrim($attributes) . '>' . ($params['text'] ? $modx->htmlspecialchars($params['text']) : $name) . '</a>'; |
|
| 136 | + } |
|
| 137 | + } |
|
| 138 | + break; |
|
| 139 | 139 | |
| 140 | - case "htmltag": |
|
| 141 | - $value = parseInput($value, "||", "array"); |
|
| 142 | - $tagid = $params['tagid']; |
|
| 143 | - $tagname = ($params['tagname']) ? $params['tagname'] : 'div'; |
|
| 144 | - $o = ''; |
|
| 145 | - // Loop through a list of tags |
|
| 140 | + case "htmltag": |
|
| 141 | + $value = parseInput($value, "||", "array"); |
|
| 142 | + $tagid = $params['tagid']; |
|
| 143 | + $tagname = ($params['tagname']) ? $params['tagname'] : 'div'; |
|
| 144 | + $o = ''; |
|
| 145 | + // Loop through a list of tags |
|
| 146 | 146 | $countValue = count($value); |
| 147 | - for($i = 0; $i < $countValue; $i++) { |
|
| 148 | - $tagvalue = is_array($value[$i]) ? implode(' ', $value[$i]) : $value[$i]; |
|
| 149 | - if(!$tagvalue) { |
|
| 150 | - continue; |
|
| 151 | - } |
|
| 147 | + for($i = 0; $i < $countValue; $i++) { |
|
| 148 | + $tagvalue = is_array($value[$i]) ? implode(' ', $value[$i]) : $value[$i]; |
|
| 149 | + if(!$tagvalue) { |
|
| 150 | + continue; |
|
| 151 | + } |
|
| 152 | 152 | |
| 153 | - $attributes = ''; |
|
| 154 | - $attr = array( |
|
| 155 | - 'id' => ($tagid ? $tagid : $id), |
|
| 156 | - // 'tv' already added to id |
|
| 157 | - 'class' => $params['class'], |
|
| 158 | - 'style' => $params['style'], |
|
| 159 | - ); |
|
| 160 | - foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : ''); |
|
| 161 | - $attributes .= ' ' . $params['attrib']; // add extra |
|
| 153 | + $attributes = ''; |
|
| 154 | + $attr = array( |
|
| 155 | + 'id' => ($tagid ? $tagid : $id), |
|
| 156 | + // 'tv' already added to id |
|
| 157 | + 'class' => $params['class'], |
|
| 158 | + 'style' => $params['style'], |
|
| 159 | + ); |
|
| 160 | + foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : ''); |
|
| 161 | + $attributes .= ' ' . $params['attrib']; // add extra |
|
| 162 | 162 | |
| 163 | - // Output the HTML Tag |
|
| 164 | - $o .= '<' . $tagname . rtrim($attributes) . '>' . $tagvalue . '</' . $tagname . '>'; |
|
| 165 | - } |
|
| 166 | - break; |
|
| 163 | + // Output the HTML Tag |
|
| 164 | + $o .= '<' . $tagname . rtrim($attributes) . '>' . $tagvalue . '</' . $tagname . '>'; |
|
| 165 | + } |
|
| 166 | + break; |
|
| 167 | 167 | |
| 168 | - case "richtext": |
|
| 169 | - $value = parseInput($value); |
|
| 170 | - $w = $params['w'] ? $params['w'] : '100%'; |
|
| 171 | - $h = $params['h'] ? $params['h'] : '400px'; |
|
| 172 | - $richtexteditor = $params['edt'] ? $params['edt'] : ""; |
|
| 173 | - $o = '<div class="MODX_RichTextWidget"><textarea id="' . $id . '" name="' . $id . '" style="width:' . $w . '; height:' . $h . ';">'; |
|
| 174 | - $o .= $modx->htmlspecialchars($value); |
|
| 175 | - $o .= '</textarea></div>'; |
|
| 176 | - $replace_richtext = array($id); |
|
| 177 | - // setup editors |
|
| 178 | - if(!empty($replace_richtext) && !empty($richtexteditor)) { |
|
| 179 | - // invoke OnRichTextEditorInit event |
|
| 180 | - $evtOut = $modx->invokeEvent("OnRichTextEditorInit", array( |
|
| 181 | - 'editor' => $richtexteditor, |
|
| 182 | - 'elements' => $replace_richtext, |
|
| 183 | - 'forfrontend' => 1, |
|
| 184 | - 'width' => $w, |
|
| 185 | - 'height' => $h |
|
| 186 | - )); |
|
| 187 | - if(is_array($evtOut)) { |
|
| 188 | - $o .= implode("", $evtOut); |
|
| 189 | - } |
|
| 190 | - } |
|
| 191 | - break; |
|
| 168 | + case "richtext": |
|
| 169 | + $value = parseInput($value); |
|
| 170 | + $w = $params['w'] ? $params['w'] : '100%'; |
|
| 171 | + $h = $params['h'] ? $params['h'] : '400px'; |
|
| 172 | + $richtexteditor = $params['edt'] ? $params['edt'] : ""; |
|
| 173 | + $o = '<div class="MODX_RichTextWidget"><textarea id="' . $id . '" name="' . $id . '" style="width:' . $w . '; height:' . $h . ';">'; |
|
| 174 | + $o .= $modx->htmlspecialchars($value); |
|
| 175 | + $o .= '</textarea></div>'; |
|
| 176 | + $replace_richtext = array($id); |
|
| 177 | + // setup editors |
|
| 178 | + if(!empty($replace_richtext) && !empty($richtexteditor)) { |
|
| 179 | + // invoke OnRichTextEditorInit event |
|
| 180 | + $evtOut = $modx->invokeEvent("OnRichTextEditorInit", array( |
|
| 181 | + 'editor' => $richtexteditor, |
|
| 182 | + 'elements' => $replace_richtext, |
|
| 183 | + 'forfrontend' => 1, |
|
| 184 | + 'width' => $w, |
|
| 185 | + 'height' => $h |
|
| 186 | + )); |
|
| 187 | + if(is_array($evtOut)) { |
|
| 188 | + $o .= implode("", $evtOut); |
|
| 189 | + } |
|
| 190 | + } |
|
| 191 | + break; |
|
| 192 | 192 | |
| 193 | - case "unixtime": |
|
| 194 | - $value = parseInput($value); |
|
| 195 | - $o = getUnixtimeFromDateString($value); |
|
| 196 | - break; |
|
| 193 | + case "unixtime": |
|
| 194 | + $value = parseInput($value); |
|
| 195 | + $o = getUnixtimeFromDateString($value); |
|
| 196 | + break; |
|
| 197 | 197 | |
| 198 | - case "viewport": |
|
| 199 | - $value = parseInput($value); |
|
| 200 | - $id = '_' . time(); |
|
| 201 | - if(!$params['vpid']) { |
|
| 202 | - $params['vpid'] = $id; |
|
| 203 | - } |
|
| 204 | - $sTag = "<iframe"; |
|
| 205 | - $eTag = "</iframe>"; |
|
| 206 | - $autoMode = "0"; |
|
| 207 | - $w = $params['width']; |
|
| 208 | - $h = $params['height']; |
|
| 209 | - if($params['stretch'] == 'Yes') { |
|
| 210 | - $w = "100%"; |
|
| 211 | - $h = "100%"; |
|
| 212 | - } |
|
| 213 | - if($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) { |
|
| 214 | - $autoMode = "3"; //both |
|
| 215 | - } else if($params['awidth'] == 'Yes') { |
|
| 216 | - $autoMode = "1"; //width only |
|
| 217 | - } else if($params['aheight'] == 'Yes') { |
|
| 218 | - $autoMode = "2"; //height only |
|
| 219 | - } |
|
| 198 | + case "viewport": |
|
| 199 | + $value = parseInput($value); |
|
| 200 | + $id = '_' . time(); |
|
| 201 | + if(!$params['vpid']) { |
|
| 202 | + $params['vpid'] = $id; |
|
| 203 | + } |
|
| 204 | + $sTag = "<iframe"; |
|
| 205 | + $eTag = "</iframe>"; |
|
| 206 | + $autoMode = "0"; |
|
| 207 | + $w = $params['width']; |
|
| 208 | + $h = $params['height']; |
|
| 209 | + if($params['stretch'] == 'Yes') { |
|
| 210 | + $w = "100%"; |
|
| 211 | + $h = "100%"; |
|
| 212 | + } |
|
| 213 | + if($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) { |
|
| 214 | + $autoMode = "3"; //both |
|
| 215 | + } else if($params['awidth'] == 'Yes') { |
|
| 216 | + $autoMode = "1"; //width only |
|
| 217 | + } else if($params['aheight'] == 'Yes') { |
|
| 218 | + $autoMode = "2"; //height only |
|
| 219 | + } |
|
| 220 | 220 | |
| 221 | - $modx->regClientStartupScript(MODX_MANAGER_URL . "media/script/bin/viewport.js", array( |
|
| 222 | - 'name' => 'viewport', |
|
| 223 | - 'version' => '0', |
|
| 224 | - 'plaintext' => false |
|
| 225 | - )); |
|
| 226 | - $o = $sTag . " id='" . $params['vpid'] . "' name='" . $params['vpid'] . "' "; |
|
| 227 | - if($params['class']) { |
|
| 228 | - $o .= " class='" . $params['class'] . "' "; |
|
| 229 | - } |
|
| 230 | - if($params['style']) { |
|
| 231 | - $o .= " style='" . $params['style'] . "' "; |
|
| 232 | - } |
|
| 233 | - if($params['attrib']) { |
|
| 234 | - $o .= $params['attrib'] . " "; |
|
| 235 | - } |
|
| 236 | - $o .= "scrolling='" . ($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto")) . "' "; |
|
| 237 | - $o .= "src='" . $value . "' frameborder='" . $params['borsize'] . "' "; |
|
| 238 | - $o .= "onload=\"window.setTimeout('ResizeViewPort(\\'" . $params['vpid'] . "\\'," . $autoMode . ")',100);\" width='" . $w . "' height='" . $h . "' "; |
|
| 239 | - $o .= ">"; |
|
| 240 | - $o .= $eTag; |
|
| 241 | - break; |
|
| 221 | + $modx->regClientStartupScript(MODX_MANAGER_URL . "media/script/bin/viewport.js", array( |
|
| 222 | + 'name' => 'viewport', |
|
| 223 | + 'version' => '0', |
|
| 224 | + 'plaintext' => false |
|
| 225 | + )); |
|
| 226 | + $o = $sTag . " id='" . $params['vpid'] . "' name='" . $params['vpid'] . "' "; |
|
| 227 | + if($params['class']) { |
|
| 228 | + $o .= " class='" . $params['class'] . "' "; |
|
| 229 | + } |
|
| 230 | + if($params['style']) { |
|
| 231 | + $o .= " style='" . $params['style'] . "' "; |
|
| 232 | + } |
|
| 233 | + if($params['attrib']) { |
|
| 234 | + $o .= $params['attrib'] . " "; |
|
| 235 | + } |
|
| 236 | + $o .= "scrolling='" . ($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto")) . "' "; |
|
| 237 | + $o .= "src='" . $value . "' frameborder='" . $params['borsize'] . "' "; |
|
| 238 | + $o .= "onload=\"window.setTimeout('ResizeViewPort(\\'" . $params['vpid'] . "\\'," . $autoMode . ")',100);\" width='" . $w . "' height='" . $h . "' "; |
|
| 239 | + $o .= ">"; |
|
| 240 | + $o .= $eTag; |
|
| 241 | + break; |
|
| 242 | 242 | |
| 243 | - case "datagrid": |
|
| 244 | - include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php"; |
|
| 245 | - $grd = new DataGrid('', $value); |
|
| 243 | + case "datagrid": |
|
| 244 | + include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php"; |
|
| 245 | + $grd = new DataGrid('', $value); |
|
| 246 | 246 | |
| 247 | - $grd->noRecordMsg = $params['egmsg']; |
|
| 247 | + $grd->noRecordMsg = $params['egmsg']; |
|
| 248 | 248 | |
| 249 | - $grd->columnHeaderClass = $params['chdrc']; |
|
| 250 | - $grd->cssClass = $params['tblc']; |
|
| 251 | - $grd->itemClass = $params['itmc']; |
|
| 252 | - $grd->altItemClass = $params['aitmc']; |
|
| 249 | + $grd->columnHeaderClass = $params['chdrc']; |
|
| 250 | + $grd->cssClass = $params['tblc']; |
|
| 251 | + $grd->itemClass = $params['itmc']; |
|
| 252 | + $grd->altItemClass = $params['aitmc']; |
|
| 253 | 253 | |
| 254 | - $grd->columnHeaderStyle = $params['chdrs']; |
|
| 255 | - $grd->cssStyle = $params['tbls']; |
|
| 256 | - $grd->itemStyle = $params['itms']; |
|
| 257 | - $grd->altItemStyle = $params['aitms']; |
|
| 254 | + $grd->columnHeaderStyle = $params['chdrs']; |
|
| 255 | + $grd->cssStyle = $params['tbls']; |
|
| 256 | + $grd->itemStyle = $params['itms']; |
|
| 257 | + $grd->altItemStyle = $params['aitms']; |
|
| 258 | 258 | |
| 259 | - $grd->columns = $params['cols']; |
|
| 260 | - $grd->fields = $params['flds']; |
|
| 261 | - $grd->colWidths = $params['cwidth']; |
|
| 262 | - $grd->colAligns = $params['calign']; |
|
| 263 | - $grd->colColors = $params['ccolor']; |
|
| 264 | - $grd->colTypes = $params['ctype']; |
|
| 259 | + $grd->columns = $params['cols']; |
|
| 260 | + $grd->fields = $params['flds']; |
|
| 261 | + $grd->colWidths = $params['cwidth']; |
|
| 262 | + $grd->colAligns = $params['calign']; |
|
| 263 | + $grd->colColors = $params['ccolor']; |
|
| 264 | + $grd->colTypes = $params['ctype']; |
|
| 265 | 265 | |
| 266 | - $grd->cellPadding = $params['cpad']; |
|
| 267 | - $grd->cellSpacing = $params['cspace']; |
|
| 268 | - $grd->header = $params['head']; |
|
| 269 | - $grd->footer = $params['foot']; |
|
| 270 | - $grd->pageSize = $params['psize']; |
|
| 271 | - $grd->pagerLocation = $params['ploc']; |
|
| 272 | - $grd->pagerClass = $params['pclass']; |
|
| 273 | - $grd->pagerStyle = $params['pstyle']; |
|
| 274 | - $o = $grd->render(); |
|
| 275 | - break; |
|
| 266 | + $grd->cellPadding = $params['cpad']; |
|
| 267 | + $grd->cellSpacing = $params['cspace']; |
|
| 268 | + $grd->header = $params['head']; |
|
| 269 | + $grd->footer = $params['foot']; |
|
| 270 | + $grd->pageSize = $params['psize']; |
|
| 271 | + $grd->pagerLocation = $params['ploc']; |
|
| 272 | + $grd->pagerClass = $params['pclass']; |
|
| 273 | + $grd->pagerStyle = $params['pstyle']; |
|
| 274 | + $o = $grd->render(); |
|
| 275 | + break; |
|
| 276 | 276 | |
| 277 | - case 'htmlentities': |
|
| 278 | - $value = parseInput($value); |
|
| 279 | - if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') { |
|
| 280 | - // remove delimiter from checkbox and listbox-multiple TVs |
|
| 281 | - $value = str_replace('||', '', $value); |
|
| 282 | - } |
|
| 283 | - $o = htmlentities($value, ENT_NOQUOTES, $modx->config['modx_charset']); |
|
| 284 | - break; |
|
| 277 | + case 'htmlentities': |
|
| 278 | + $value = parseInput($value); |
|
| 279 | + if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') { |
|
| 280 | + // remove delimiter from checkbox and listbox-multiple TVs |
|
| 281 | + $value = str_replace('||', '', $value); |
|
| 282 | + } |
|
| 283 | + $o = htmlentities($value, ENT_NOQUOTES, $modx->config['modx_charset']); |
|
| 284 | + break; |
|
| 285 | 285 | |
| 286 | - case 'custom_widget': |
|
| 287 | - $widget_output = ''; |
|
| 288 | - $o = ''; |
|
| 289 | - /* If we are loading a file */ |
|
| 290 | - if(substr($params['output'], 0, 5) == "@FILE") { |
|
| 291 | - $file_name = MODX_BASE_PATH . trim(substr($params['output'], 6)); |
|
| 292 | - if(!file_exists($file_name)) { |
|
| 293 | - $widget_output = $file_name . ' does not exist'; |
|
| 294 | - } else { |
|
| 295 | - $widget_output = file_get_contents($file_name); |
|
| 296 | - } |
|
| 297 | - } elseif(substr($params['output'], 0, 8) == '@INCLUDE') { |
|
| 298 | - $file_name = MODX_BASE_PATH . trim(substr($params['output'], 9)); |
|
| 299 | - if(!file_exists($file_name)) { |
|
| 300 | - $widget_output = $file_name . ' does not exist'; |
|
| 301 | - } else { |
|
| 302 | - /* The included file needs to set $widget_output. Can be string, array, object */ |
|
| 303 | - include $file_name; |
|
| 304 | - } |
|
| 305 | - } elseif(substr($params['output'], 0, 6) == '@CHUNK' && $value !== '') { |
|
| 306 | - $chunk_name = trim(substr($params['output'], 7)); |
|
| 307 | - $widget_output = $modx->getChunk($chunk_name); |
|
| 308 | - } elseif(substr($params['output'], 0, 5) == '@EVAL' && $value !== '') { |
|
| 309 | - $eval_str = trim(substr($params['output'], 6)); |
|
| 310 | - $widget_output = eval($eval_str); |
|
| 311 | - } elseif($value !== '') { |
|
| 312 | - $widget_output = $params['output']; |
|
| 313 | - } else { |
|
| 314 | - $widget_output = ''; |
|
| 315 | - } |
|
| 316 | - if(is_string($widget_output)) { |
|
| 317 | - $_ = $modx->config['enable_filter']; |
|
| 318 | - $modx->config['enable_filter'] = 1; |
|
| 319 | - $widget_output = $modx->parseText($widget_output, array('value' => $value)); |
|
| 320 | - $modx->config['enable_filter'] = $_; |
|
| 321 | - $o = $modx->parseDocumentSource($widget_output); |
|
| 322 | - } else { |
|
| 323 | - $o = $widget_output; |
|
| 324 | - } |
|
| 325 | - break; |
|
| 286 | + case 'custom_widget': |
|
| 287 | + $widget_output = ''; |
|
| 288 | + $o = ''; |
|
| 289 | + /* If we are loading a file */ |
|
| 290 | + if(substr($params['output'], 0, 5) == "@FILE") { |
|
| 291 | + $file_name = MODX_BASE_PATH . trim(substr($params['output'], 6)); |
|
| 292 | + if(!file_exists($file_name)) { |
|
| 293 | + $widget_output = $file_name . ' does not exist'; |
|
| 294 | + } else { |
|
| 295 | + $widget_output = file_get_contents($file_name); |
|
| 296 | + } |
|
| 297 | + } elseif(substr($params['output'], 0, 8) == '@INCLUDE') { |
|
| 298 | + $file_name = MODX_BASE_PATH . trim(substr($params['output'], 9)); |
|
| 299 | + if(!file_exists($file_name)) { |
|
| 300 | + $widget_output = $file_name . ' does not exist'; |
|
| 301 | + } else { |
|
| 302 | + /* The included file needs to set $widget_output. Can be string, array, object */ |
|
| 303 | + include $file_name; |
|
| 304 | + } |
|
| 305 | + } elseif(substr($params['output'], 0, 6) == '@CHUNK' && $value !== '') { |
|
| 306 | + $chunk_name = trim(substr($params['output'], 7)); |
|
| 307 | + $widget_output = $modx->getChunk($chunk_name); |
|
| 308 | + } elseif(substr($params['output'], 0, 5) == '@EVAL' && $value !== '') { |
|
| 309 | + $eval_str = trim(substr($params['output'], 6)); |
|
| 310 | + $widget_output = eval($eval_str); |
|
| 311 | + } elseif($value !== '') { |
|
| 312 | + $widget_output = $params['output']; |
|
| 313 | + } else { |
|
| 314 | + $widget_output = ''; |
|
| 315 | + } |
|
| 316 | + if(is_string($widget_output)) { |
|
| 317 | + $_ = $modx->config['enable_filter']; |
|
| 318 | + $modx->config['enable_filter'] = 1; |
|
| 319 | + $widget_output = $modx->parseText($widget_output, array('value' => $value)); |
|
| 320 | + $modx->config['enable_filter'] = $_; |
|
| 321 | + $o = $modx->parseDocumentSource($widget_output); |
|
| 322 | + } else { |
|
| 323 | + $o = $widget_output; |
|
| 324 | + } |
|
| 325 | + break; |
|
| 326 | 326 | |
| 327 | - default: |
|
| 328 | - $value = parseInput($value); |
|
| 329 | - if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') { |
|
| 330 | - // add separator |
|
| 331 | - $value = explode('||', $value); |
|
| 332 | - $value = implode($sep, $value); |
|
| 333 | - } |
|
| 334 | - $o = $value; |
|
| 335 | - break; |
|
| 336 | - } |
|
| 337 | - return $o; |
|
| 327 | + default: |
|
| 328 | + $value = parseInput($value); |
|
| 329 | + if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') { |
|
| 330 | + // add separator |
|
| 331 | + $value = explode('||', $value); |
|
| 332 | + $value = implode($sep, $value); |
|
| 333 | + } |
|
| 334 | + $o = $value; |
|
| 335 | + break; |
|
| 336 | + } |
|
| 337 | + return $o; |
|
| 338 | 338 | } |
| 339 | 339 | |
| 340 | 340 | /** |
@@ -342,8 +342,8 @@ discard block |
||
| 342 | 342 | * @return string |
| 343 | 343 | */ |
| 344 | 344 | function decodeParamValue($s) { |
| 345 | - $s = str_replace("%3D", '=', $s); // = |
|
| 346 | - return str_replace("%26", '&', $s); // & |
|
| 345 | + $s = str_replace("%3D", '=', $s); // = |
|
| 346 | + return str_replace("%26", '&', $s); // & |
|
| 347 | 347 | } |
| 348 | 348 | |
| 349 | 349 | /** |
@@ -357,19 +357,19 @@ discard block |
||
| 357 | 357 | */ |
| 358 | 358 | function parseInput($src, $delim = "||", $type = "string", $columns = true) { // type can be: string, array |
| 359 | 359 | $modx = evolutionCMS(); |
| 360 | - if($modx->db->isResult($src)) { |
|
| 361 | - // must be a recordset |
|
| 362 | - $rows = array(); |
|
| 363 | - while($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols); |
|
| 364 | - return ($type == "array") ? $rows : implode($delim, $rows); |
|
| 365 | - } else { |
|
| 366 | - // must be a text |
|
| 367 | - if($type == "array") { |
|
| 368 | - return explode($delim, $src); |
|
| 369 | - } else { |
|
| 370 | - return $src; |
|
| 371 | - } |
|
| 372 | - } |
|
| 360 | + if($modx->db->isResult($src)) { |
|
| 361 | + // must be a recordset |
|
| 362 | + $rows = array(); |
|
| 363 | + while($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols); |
|
| 364 | + return ($type == "array") ? $rows : implode($delim, $rows); |
|
| 365 | + } else { |
|
| 366 | + // must be a text |
|
| 367 | + if($type == "array") { |
|
| 368 | + return explode($delim, $src); |
|
| 369 | + } else { |
|
| 370 | + return $src; |
|
| 371 | + } |
|
| 372 | + } |
|
| 373 | 373 | } |
| 374 | 374 | |
| 375 | 375 | /** |
@@ -377,21 +377,21 @@ discard block |
||
| 377 | 377 | * @return bool|false|int |
| 378 | 378 | */ |
| 379 | 379 | function getUnixtimeFromDateString($value) { |
| 380 | - $timestamp = false; |
|
| 381 | - // Check for MySQL or legacy style date |
|
| 382 | - $date_match_1 = '/^([0-9]{2})-([0-9]{2})-([0-9]{4})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/'; |
|
| 383 | - $date_match_2 = '/^([0-9]{4})-([0-9]{2})-([0-9]{2})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/'; |
|
| 384 | - $matches = array(); |
|
| 385 | - if(strpos($value, '-') !== false) { |
|
| 386 | - if(preg_match($date_match_1, $value, $matches)) { |
|
| 387 | - $timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[1], $matches[3]); |
|
| 388 | - } elseif(preg_match($date_match_2, $value, $matches)) { |
|
| 389 | - $timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]); |
|
| 390 | - } |
|
| 391 | - } |
|
| 392 | - // If those didn't work, use strtotime to figure out the date |
|
| 393 | - if($timestamp === false || $timestamp === -1) { |
|
| 394 | - $timestamp = strtotime($value); |
|
| 395 | - } |
|
| 396 | - return $timestamp; |
|
| 380 | + $timestamp = false; |
|
| 381 | + // Check for MySQL or legacy style date |
|
| 382 | + $date_match_1 = '/^([0-9]{2})-([0-9]{2})-([0-9]{4})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/'; |
|
| 383 | + $date_match_2 = '/^([0-9]{4})-([0-9]{2})-([0-9]{2})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/'; |
|
| 384 | + $matches = array(); |
|
| 385 | + if(strpos($value, '-') !== false) { |
|
| 386 | + if(preg_match($date_match_1, $value, $matches)) { |
|
| 387 | + $timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[1], $matches[3]); |
|
| 388 | + } elseif(preg_match($date_match_2, $value, $matches)) { |
|
| 389 | + $timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]); |
|
| 390 | + } |
|
| 391 | + } |
|
| 392 | + // If those didn't work, use strtotime to figure out the date |
|
| 393 | + if($timestamp === false || $timestamp === -1) { |
|
| 394 | + $timestamp = strtotime($value); |
|
| 395 | + } |
|
| 396 | + return $timestamp; |
|
| 397 | 397 | } |
@@ -1,13 +1,13 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | class DATEPICKER {
|
| 4 | - function __construct() {
|
|
| 5 | - } |
|
| 4 | + function __construct() {
|
|
| 5 | + } |
|
| 6 | 6 | |
| 7 | - function getDP() {
|
|
| 8 | - $modx = evolutionCMS(); global $_lang; |
|
| 7 | + function getDP() {
|
|
| 8 | + $modx = evolutionCMS(); global $_lang; |
|
| 9 | 9 | |
| 10 | - $tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl'); |
|
| 11 | - return $modx->parseText($tpl, $_lang, '[%', '%]'); |
|
| 12 | - } |
|
| 10 | + $tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl'); |
|
| 11 | + return $modx->parseText($tpl, $_lang, '[%', '%]'); |
|
| 12 | + } |
|
| 13 | 13 | } |
@@ -1,16 +1,16 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | /** This file is part of KCFinder project |
| 4 | - * |
|
| 5 | - * @desc Uploader class |
|
| 6 | - * @package KCFinder |
|
| 7 | - * @version 2.54 |
|
| 8 | - * @author Pavel Tzonkov <[email protected]> |
|
| 9 | - * @copyright 2010-2014 KCFinder Project |
|
| 10 | - * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 |
|
| 11 | - * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2 |
|
| 12 | - * @link http://kcfinder.sunhater.com |
|
| 13 | - */ |
|
| 4 | + * |
|
| 5 | + * @desc Uploader class |
|
| 6 | + * @package KCFinder |
|
| 7 | + * @version 2.54 |
|
| 8 | + * @author Pavel Tzonkov <[email protected]> |
|
| 9 | + * @copyright 2010-2014 KCFinder Project |
|
| 10 | + * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 |
|
| 11 | + * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2 |
|
| 12 | + * @link http://kcfinder.sunhater.com |
|
| 13 | + */ |
|
| 14 | 14 | |
| 15 | 15 | class uploader { |
| 16 | 16 | |
@@ -18,92 +18,92 @@ discard block |
||
| 18 | 18 | const VERSION = "2.54"; |
| 19 | 19 | |
| 20 | 20 | /** Config session-overrided settings |
| 21 | - * @var array */ |
|
| 21 | + * @var array */ |
|
| 22 | 22 | protected $config = array(); |
| 23 | 23 | |
| 24 | 24 | /** Default image driver |
| 25 | - * @var string */ |
|
| 25 | + * @var string */ |
|
| 26 | 26 | protected $imageDriver = "gd"; |
| 27 | 27 | |
| 28 | 28 | /** Opener applocation properties |
| 29 | - * $opener['name'] Got from $_GET['opener']; |
|
| 30 | - * $opener['CKEditor']['funcNum'] CKEditor function number (got from $_GET) |
|
| 31 | - * $opener['TinyMCE'] Boolean |
|
| 32 | - * @var array */ |
|
| 29 | + * $opener['name'] Got from $_GET['opener']; |
|
| 30 | + * $opener['CKEditor']['funcNum'] CKEditor function number (got from $_GET) |
|
| 31 | + * $opener['TinyMCE'] Boolean |
|
| 32 | + * @var array */ |
|
| 33 | 33 | protected $opener = array(); |
| 34 | 34 | |
| 35 | 35 | /** Got from $_GET['type'] or first one $config['types'] array key, if inexistant |
| 36 | - * @var string */ |
|
| 36 | + * @var string */ |
|
| 37 | 37 | protected $type; |
| 38 | 38 | |
| 39 | 39 | /** Helper property. Local filesystem path to the Type Directory |
| 40 | - * Equivalent: $config['uploadDir'] . "/" . $type |
|
| 41 | - * @var string */ |
|
| 40 | + * Equivalent: $config['uploadDir'] . "/" . $type |
|
| 41 | + * @var string */ |
|
| 42 | 42 | protected $typeDir; |
| 43 | 43 | |
| 44 | 44 | /** Helper property. Web URL to the Type Directory |
| 45 | - * Equivalent: $config['uploadURL'] . "/" . $type |
|
| 46 | - * @var string */ |
|
| 45 | + * Equivalent: $config['uploadURL'] . "/" . $type |
|
| 46 | + * @var string */ |
|
| 47 | 47 | protected $typeURL; |
| 48 | 48 | |
| 49 | 49 | /** Linked to $config['types'] |
| 50 | - * @var array */ |
|
| 50 | + * @var array */ |
|
| 51 | 51 | protected $types = array(); |
| 52 | 52 | |
| 53 | 53 | /** Settings which can override default settings if exists as keys in $config['types'][$type] array |
| 54 | - * @var array */ |
|
| 54 | + * @var array */ |
|
| 55 | 55 | protected $typeSettings = array('disabled', 'theme', 'dirPerms', 'filePerms', 'denyZipDownload', 'maxImageWidth', 'maxImageHeight', 'thumbWidth', 'thumbHeight', 'jpegQuality', 'access', 'filenameChangeChars', 'dirnameChangeChars', 'denyExtensionRename', 'deniedExts', 'watermark'); |
| 56 | 56 | |
| 57 | 57 | /** Got from language file |
| 58 | - * @var string */ |
|
| 58 | + * @var string */ |
|
| 59 | 59 | protected $charset; |
| 60 | 60 | |
| 61 | 61 | /** The language got from $_GET['lng'] or $_GET['lang'] or... Please see next property |
| 62 | - * @var string */ |
|
| 62 | + * @var string */ |
|
| 63 | 63 | protected $lang = 'en'; |
| 64 | 64 | |
| 65 | 65 | /** Possible language $_GET keys |
| 66 | - * @var array */ |
|
| 66 | + * @var array */ |
|
| 67 | 67 | protected $langInputNames = array('lang', 'langCode', 'lng', 'language', 'lang_code'); |
| 68 | 68 | |
| 69 | 69 | /** Uploaded file(s) info. Linked to first $_FILES element |
| 70 | - * @var array */ |
|
| 70 | + * @var array */ |
|
| 71 | 71 | protected $file; |
| 72 | 72 | |
| 73 | 73 | /** Next three properties are got from the current language file |
| 74 | - * @var string */ |
|
| 74 | + * @var string */ |
|
| 75 | 75 | protected $dateTimeFull; // Currently not used |
| 76 | 76 | protected $dateTimeMid; // Currently not used |
| 77 | 77 | protected $dateTimeSmall; |
| 78 | 78 | |
| 79 | 79 | /** Contain Specified language labels |
| 80 | - * @var array */ |
|
| 80 | + * @var array */ |
|
| 81 | 81 | protected $labels = array(); |
| 82 | 82 | |
| 83 | 83 | /** Contain unprocessed $_GET array. Please use this instead of $_GET |
| 84 | - * @var array */ |
|
| 84 | + * @var array */ |
|
| 85 | 85 | protected $get; |
| 86 | 86 | |
| 87 | 87 | /** Contain unprocessed $_POST array. Please use this instead of $_POST |
| 88 | - * @var array */ |
|
| 88 | + * @var array */ |
|
| 89 | 89 | protected $post; |
| 90 | 90 | |
| 91 | 91 | /** Contain unprocessed $_COOKIE array. Please use this instead of $_COOKIE |
| 92 | - * @var array */ |
|
| 92 | + * @var array */ |
|
| 93 | 93 | protected $cookie; |
| 94 | 94 | |
| 95 | 95 | /** Session array. Please use this property instead of $_SESSION |
| 96 | - * @var array */ |
|
| 96 | + * @var array */ |
|
| 97 | 97 | protected $session; |
| 98 | 98 | |
| 99 | 99 | /** CMS integration attribute (got from $_GET['cms']) |
| 100 | - * @var string */ |
|
| 100 | + * @var string */ |
|
| 101 | 101 | protected $cms = ""; |
| 102 | 102 | |
| 103 | 103 | protected $modx = null; |
| 104 | 104 | /** Magic method which allows read-only access to protected or private class properties |
| 105 | - * @param string $property |
|
| 106 | - * @return mixed */ |
|
| 105 | + * @param string $property |
|
| 106 | + * @return mixed */ |
|
| 107 | 107 | public function __get($property) { |
| 108 | 108 | return property_exists($this, $property) ? $this->$property : null; |
| 109 | 109 | } |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | ) |
| 133 | 133 | $this->cms = $this->get['cms']; |
| 134 | 134 | |
| 135 | - // LINKING UPLOADED FILE |
|
| 135 | + // LINKING UPLOADED FILE |
|
| 136 | 136 | if (count($_FILES)) |
| 137 | 137 | $this->file = &$_FILES[key($_FILES)]; |
| 138 | 138 | |
@@ -228,8 +228,8 @@ discard block |
||
| 228 | 228 | $this->config['uploadDir'] = strlen($this->config['uploadDir']) |
| 229 | 229 | ? path::normalize($this->config['uploadDir']) |
| 230 | 230 | : path::url2fullPath("/$path"); |
| 231 | - $this->typeDir = "{$this->config['uploadDir']}/{$this->type}"; |
|
| 232 | - $this->typeURL = "{$this->config['siteURL']}/{$this->config['uploadURL']}/{$this->type}"; |
|
| 231 | + $this->typeDir = "{$this->config['uploadDir']}/{$this->type}"; |
|
| 232 | + $this->typeURL = "{$this->config['siteURL']}/{$this->config['uploadURL']}/{$this->type}"; |
|
| 233 | 233 | |
| 234 | 234 | // SITE ROOT |
| 235 | 235 | } elseif ($this->config['uploadURL'] == "/") { |
@@ -365,36 +365,36 @@ discard block |
||
| 365 | 365 | } |
| 366 | 366 | |
| 367 | 367 | |
| 368 | - protected function getTransaliasSettings() { |
|
| 369 | - $modx = evolutionCMS(); |
|
| 370 | - |
|
| 371 | - // Cleaning uploaded filename? |
|
| 372 | - $setting = $modx->db->select('count(*)', $modx->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1'); |
|
| 373 | - if ($modx->db->getValue($setting)>0) { |
|
| 374 | - // Transalias plugin active? |
|
| 375 | - $res = $modx->db->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0'); |
|
| 376 | - if ($properties = $modx->db->getValue($res)) { |
|
| 377 | - $properties = $modx->parseProperties($properties, 'TransAlias', 'plugin'); |
|
| 378 | - } else { |
|
| 379 | - $properties = NULL; |
|
| 380 | - } |
|
| 381 | - } else { |
|
| 382 | - $properties = NULL; |
|
| 383 | - } |
|
| 384 | - return $properties; |
|
| 385 | - } |
|
| 386 | - |
|
| 387 | - |
|
| 388 | - protected function normalizeFilename($filename) { |
|
| 389 | - if ($this->getTransaliasSettings()) { |
|
| 390 | - $format = strrchr($filename, "."); |
|
| 391 | - $filename = str_replace($format, "", $filename); |
|
| 392 | - $filename = $this->modx->stripAlias($filename).$format; |
|
| 393 | - } |
|
| 394 | - return $filename; |
|
| 395 | - } |
|
| 396 | - |
|
| 397 | - protected function normalizeDirname($dirname) { |
|
| 368 | + protected function getTransaliasSettings() { |
|
| 369 | + $modx = evolutionCMS(); |
|
| 370 | + |
|
| 371 | + // Cleaning uploaded filename? |
|
| 372 | + $setting = $modx->db->select('count(*)', $modx->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1'); |
|
| 373 | + if ($modx->db->getValue($setting)>0) { |
|
| 374 | + // Transalias plugin active? |
|
| 375 | + $res = $modx->db->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0'); |
|
| 376 | + if ($properties = $modx->db->getValue($res)) { |
|
| 377 | + $properties = $modx->parseProperties($properties, 'TransAlias', 'plugin'); |
|
| 378 | + } else { |
|
| 379 | + $properties = NULL; |
|
| 380 | + } |
|
| 381 | + } else { |
|
| 382 | + $properties = NULL; |
|
| 383 | + } |
|
| 384 | + return $properties; |
|
| 385 | + } |
|
| 386 | + |
|
| 387 | + |
|
| 388 | + protected function normalizeFilename($filename) { |
|
| 389 | + if ($this->getTransaliasSettings()) { |
|
| 390 | + $format = strrchr($filename, "."); |
|
| 391 | + $filename = str_replace($format, "", $filename); |
|
| 392 | + $filename = $this->modx->stripAlias($filename).$format; |
|
| 393 | + } |
|
| 394 | + return $filename; |
|
| 395 | + } |
|
| 396 | + |
|
| 397 | + protected function normalizeDirname($dirname) { |
|
| 398 | 398 | return $this->modx->stripAlias($dirname); |
| 399 | 399 | } |
| 400 | 400 | |
@@ -472,10 +472,10 @@ discard block |
||
| 472 | 472 | return $this->label("The image is too big and/or cannot be resized."); |
| 473 | 473 | |
| 474 | 474 | |
| 475 | - // CHECK FOR MODX MAX FILE SIZE |
|
| 476 | - $actualfilesize=filesize($file['tmp_name']); |
|
| 477 | - if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize']) |
|
| 478 | - return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)"); |
|
| 475 | + // CHECK FOR MODX MAX FILE SIZE |
|
| 476 | + $actualfilesize=filesize($file['tmp_name']); |
|
| 477 | + if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize']) |
|
| 478 | + return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)"); |
|
| 479 | 479 | |
| 480 | 480 | return true; |
| 481 | 481 | } |
@@ -627,7 +627,7 @@ discard block |
||
| 627 | 627 | $top = isset($this->config['watermark']['top']) |
| 628 | 628 | ? $this->config['watermark']['top'] : false; |
| 629 | 629 | $img->watermark($this->config['watermark']['file'], $left, $top); |
| 630 | - } |
|
| 630 | + } |
|
| 631 | 631 | |
| 632 | 632 | $options = array( 'file' => $file ); |
| 633 | 633 | |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | $autoloader = realpath(__DIR__.'/../vendor/autoload.php'); |
| 52 | 52 | if (file_exists($autoloader) && is_readable($autoloader)) { |
| 53 | - include_once($autoloader); |
|
| 53 | + include_once($autoloader); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | // get start time |
@@ -65,22 +65,22 @@ discard block |
||
| 65 | 65 | $site_hostnames_path = $base_path . 'assets/cache/siteHostnames.php'; |
| 66 | 66 | if(is_file($site_hostnames_path)) include_once($site_hostnames_path); |
| 67 | 67 | if(!defined('MGR_DIR') || MGR_DIR!==$mgr_dir) { |
| 68 | - $src = "<?php\n"; |
|
| 69 | - $src .= "define('MGR_DIR', '{$mgr_dir}');\n"; |
|
| 70 | - $rs = file_put_contents($site_mgr_path,$src); |
|
| 71 | - if(!$rs) { |
|
| 72 | - echo 'siteManager.php write error'; |
|
| 73 | - exit; |
|
| 74 | - } |
|
| 75 | - sleep(1); |
|
| 76 | - header('Location:' . $_SERVER['REQUEST_URI']); |
|
| 77 | - exit; |
|
| 68 | + $src = "<?php\n"; |
|
| 69 | + $src .= "define('MGR_DIR', '{$mgr_dir}');\n"; |
|
| 70 | + $rs = file_put_contents($site_mgr_path,$src); |
|
| 71 | + if(!$rs) { |
|
| 72 | + echo 'siteManager.php write error'; |
|
| 73 | + exit; |
|
| 74 | + } |
|
| 75 | + sleep(1); |
|
| 76 | + header('Location:' . $_SERVER['REQUEST_URI']); |
|
| 77 | + exit; |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | // we use this to make sure files are accessed through |
| 81 | 81 | // the manager instead of seperately. |
| 82 | 82 | if ( ! defined('IN_MANAGER_MODE')) { |
| 83 | - define('IN_MANAGER_MODE', true); |
|
| 83 | + define('IN_MANAGER_MODE', true); |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | // harden it |
@@ -101,16 +101,16 @@ discard block |
||
| 101 | 101 | |
| 102 | 102 | // check PHP version. EVO is compatible with php 5 (5.0.0+) |
| 103 | 103 | $php_ver_comp = version_compare(phpversion(), "5.0.0"); |
| 104 | - // -1 if left is less, 0 if equal, +1 if left is higher |
|
| 104 | + // -1 if left is less, 0 if equal, +1 if left is higher |
|
| 105 | 105 | if($php_ver_comp < 0) { |
| 106 | - echo sprintf($_lang['php_version_check'], phpversion()); |
|
| 107 | - exit; |
|
| 106 | + echo sprintf($_lang['php_version_check'], phpversion()); |
|
| 107 | + exit; |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | // check if iconv is installed |
| 111 | 111 | if(!function_exists('iconv')) { |
| 112 | - echo $_lang['iconv_not_available']; |
|
| 113 | - exit; |
|
| 112 | + echo $_lang['iconv_not_available']; |
|
| 113 | + exit; |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | // set some runtime options |
@@ -123,15 +123,15 @@ discard block |
||
| 123 | 123 | |
| 124 | 124 | // set the document_root :| |
| 125 | 125 | if(!isset($_SERVER['DOCUMENT_ROOT']) || empty($_SERVER['DOCUMENT_ROOT'])) { |
| 126 | - $_SERVER['DOCUMENT_ROOT'] = str_replace($_SERVER['PATH_INFO'], "", preg_replace("/\\\\/", "/", $_SERVER['PATH_TRANSLATED']))."/"; |
|
| 126 | + $_SERVER['DOCUMENT_ROOT'] = str_replace($_SERVER['PATH_INFO'], "", preg_replace("/\\\\/", "/", $_SERVER['PATH_TRANSLATED']))."/"; |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | // include_once config file |
| 130 | 130 | $config_filename = "./includes/config.inc.php"; |
| 131 | 131 | if (!file_exists($config_filename)) { |
| 132 | - echo "<h3>Unable to load configuration settings</h3>"; |
|
| 133 | - echo "Please run the EVO <a href='../install'>install utility</a>"; |
|
| 134 | - exit; |
|
| 132 | + echo "<h3>Unable to load configuration settings</h3>"; |
|
| 133 | + echo "Please run the EVO <a href='../install'>install utility</a>"; |
|
| 134 | + exit; |
|
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | // include the database configuration file |
@@ -139,11 +139,11 @@ discard block |
||
| 139 | 139 | |
| 140 | 140 | // initiate the content manager class |
| 141 | 141 | if (isset($coreClass) && class_exists($coreClass)) { |
| 142 | - $modx = new $coreClass; |
|
| 142 | + $modx = new $coreClass; |
|
| 143 | 143 | } |
| 144 | 144 | if (!isset($modx) || !($modx instanceof DocumentParser)) { |
| 145 | - include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php'); |
|
| 146 | - $modx = evolutionCMS(); |
|
| 145 | + include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php'); |
|
| 146 | + $modx = evolutionCMS(); |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | $modx->loadExtension("ManagerAPI"); |
@@ -166,25 +166,25 @@ discard block |
||
| 166 | 166 | |
| 167 | 167 | // now include_once different language file as english |
| 168 | 168 | if(!isset($manager_language) || !file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) { |
| 169 | - $manager_language = "english"; // if not set, get the english language file. |
|
| 169 | + $manager_language = "english"; // if not set, get the english language file. |
|
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | // $length_eng_lang = count($_lang); // Not used for now, required for difference-check with other languages than english (i.e. inside installer) |
| 173 | 173 | |
| 174 | 174 | if($manager_language!="english" && file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) { |
| 175 | - include_once "lang/".$manager_language.".inc.php"; |
|
| 175 | + include_once "lang/".$manager_language.".inc.php"; |
|
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | // allow custom language overrides not altered by future EVO-updates |
| 179 | 179 | if(file_exists(MODX_MANAGER_PATH."includes/lang/override/".$manager_language.".inc.php")) { |
| 180 | - include_once "lang/override/".$manager_language.".inc.php"; |
|
| 180 | + include_once "lang/override/".$manager_language.".inc.php"; |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | $s = array('[+MGR_DIR+]'); |
| 184 | 184 | $r = array(MGR_DIR); |
| 185 | 185 | foreach($_lang as $k=>$v) |
| 186 | 186 | { |
| 187 | - if(strpos($v,'[+')!==false) $_lang[$k] = str_replace($s, $r, $v); |
|
| 187 | + if(strpos($v,'[+')!==false) $_lang[$k] = str_replace($s, $r, $v); |
|
| 188 | 188 | } |
| 189 | 189 | |
| 190 | 190 | // send the charset header |
@@ -199,19 +199,19 @@ discard block |
||
| 199 | 199 | |
| 200 | 200 | // double check the session |
| 201 | 201 | if(!isset($_SESSION['mgrValidated'])){ |
| 202 | - echo "Not Logged In!"; |
|
| 203 | - exit; |
|
| 202 | + echo "Not Logged In!"; |
|
| 203 | + exit; |
|
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | // include_once the style variables file |
| 207 | 207 | if(isset($manager_theme) && !isset($_style)) { |
| 208 | - $_style = array(); |
|
| 209 | - include_once "media/style/".$manager_theme."/style.php"; |
|
| 208 | + $_style = array(); |
|
| 209 | + include_once "media/style/".$manager_theme."/style.php"; |
|
| 210 | 210 | } |
| 211 | 211 | |
| 212 | 212 | // check if user is allowed to access manager interface |
| 213 | 213 | if(isset($allow_manager_access) && $allow_manager_access==0) { |
| 214 | - include_once "manager.lockout.inc.php"; |
|
| 214 | + include_once "manager.lockout.inc.php"; |
|
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | // Initialize System Alert Message Queque |
@@ -220,13 +220,13 @@ discard block |
||
| 220 | 220 | |
| 221 | 221 | // first we check to see if this is a frameset request |
| 222 | 222 | if(!isset($_POST['a']) && !isset($_GET['a']) && !isset($_POST['updateMsgCount'])) { |
| 223 | - // this looks to be a top-level frameset request, so let's serve up a frameset |
|
| 224 | - if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) { |
|
| 225 | - include_once "media/style/".$manager_theme."/frames/1.php"; |
|
| 226 | - }else{ |
|
| 227 | - include_once "frames/1.php"; |
|
| 228 | - } |
|
| 229 | - exit; |
|
| 223 | + // this looks to be a top-level frameset request, so let's serve up a frameset |
|
| 224 | + if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) { |
|
| 225 | + include_once "media/style/".$manager_theme."/frames/1.php"; |
|
| 226 | + }else{ |
|
| 227 | + include_once "frames/1.php"; |
|
| 228 | + } |
|
| 229 | + exit; |
|
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | // OK, let's retrieve the action directive from the request |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | else $action = null; |
| 238 | 238 | |
| 239 | 239 | if (isset($_POST['updateMsgCount']) && $modx->hasPermission('messages')) { |
| 240 | - include_once 'messageCount.inc.php'; |
|
| 240 | + include_once 'messageCount.inc.php'; |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | // save page to manager object |
@@ -245,19 +245,19 @@ discard block |
||
| 245 | 245 | |
| 246 | 246 | // attempt to foil some simple types of CSRF attacks |
| 247 | 247 | if (isset($modx->config['validate_referer']) && (int)$modx->config['validate_referer']) { |
| 248 | - if (isset($_SERVER['HTTP_REFERER'])) { |
|
| 249 | - $referer = $_SERVER['HTTP_REFERER']; |
|
| 250 | - |
|
| 251 | - if (!empty($referer)) { |
|
| 252 | - if (!preg_match('/^'.preg_quote(MODX_SITE_URL, '/').'/i', $referer)) { |
|
| 253 | - $modx->webAlertAndQuit("A possible CSRF attempt was detected from referer: {$referer}.", "index.php"); |
|
| 254 | - } |
|
| 255 | - } else { |
|
| 256 | - $modx->webAlertAndQuit("A possible CSRF attempt was detected. No referer was provided by the client.", "index.php"); |
|
| 257 | - } |
|
| 258 | - } else { |
|
| 259 | - $modx->webAlertAndQuit("A possible CSRF attempt was detected. No referer was provided by the server.", "index.php"); |
|
| 260 | - } |
|
| 248 | + if (isset($_SERVER['HTTP_REFERER'])) { |
|
| 249 | + $referer = $_SERVER['HTTP_REFERER']; |
|
| 250 | + |
|
| 251 | + if (!empty($referer)) { |
|
| 252 | + if (!preg_match('/^'.preg_quote(MODX_SITE_URL, '/').'/i', $referer)) { |
|
| 253 | + $modx->webAlertAndQuit("A possible CSRF attempt was detected from referer: {$referer}.", "index.php"); |
|
| 254 | + } |
|
| 255 | + } else { |
|
| 256 | + $modx->webAlertAndQuit("A possible CSRF attempt was detected. No referer was provided by the client.", "index.php"); |
|
| 257 | + } |
|
| 258 | + } else { |
|
| 259 | + $modx->webAlertAndQuit("A possible CSRF attempt was detected. No referer was provided by the server.", "index.php"); |
|
| 260 | + } |
|
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | // invoke OnManagerPageInit event |
@@ -265,13 +265,13 @@ discard block |
||
| 265 | 265 | |
| 266 | 266 | // return element filepath |
| 267 | 267 | function includeFileProcessor ($filepath,$manager_theme) { |
| 268 | - $element = ""; |
|
| 269 | - if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) { |
|
| 270 | - $element = MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath; |
|
| 271 | - }else{ |
|
| 272 | - $element = $filepath; |
|
| 273 | - } |
|
| 274 | - return $element; |
|
| 268 | + $element = ""; |
|
| 269 | + if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) { |
|
| 270 | + $element = MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath; |
|
| 271 | + }else{ |
|
| 272 | + $element = $filepath; |
|
| 273 | + } |
|
| 274 | + return $element; |
|
| 275 | 275 | } |
| 276 | 276 | |
| 277 | 277 | // Now we decide what to do according to the action request. This is a BIG list :) |
@@ -279,714 +279,714 @@ discard block |
||
| 279 | 279 | /********************************************************************/ |
| 280 | 280 | /* frame management - show the requested frame */ |
| 281 | 281 | /********************************************************************/ |
| 282 | - case 1 : |
|
| 283 | - // get the requested frame |
|
| 284 | - $frame = preg_replace('/[^a-z0-9]/i','',$_REQUEST['f']); |
|
| 285 | - if($frame>9) { |
|
| 286 | - $enable_debug=false; // this is to stop the debug thingy being attached to the framesets |
|
| 287 | - } |
|
| 288 | - include_once(includeFileProcessor("frames/".$frame.".php",$manager_theme)); |
|
| 289 | - break; |
|
| 282 | + case 1 : |
|
| 283 | + // get the requested frame |
|
| 284 | + $frame = preg_replace('/[^a-z0-9]/i','',$_REQUEST['f']); |
|
| 285 | + if($frame>9) { |
|
| 286 | + $enable_debug=false; // this is to stop the debug thingy being attached to the framesets |
|
| 287 | + } |
|
| 288 | + include_once(includeFileProcessor("frames/".$frame.".php",$manager_theme)); |
|
| 289 | + break; |
|
| 290 | 290 | /********************************************************************/ |
| 291 | 291 | /* show the homepage */ |
| 292 | 292 | /********************************************************************/ |
| 293 | - case 2: |
|
| 294 | - // get the home page |
|
| 295 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 296 | - include_once(includeFileProcessor("actions/welcome.static.php",$manager_theme)); |
|
| 297 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 298 | - break; |
|
| 293 | + case 2: |
|
| 294 | + // get the home page |
|
| 295 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 296 | + include_once(includeFileProcessor("actions/welcome.static.php",$manager_theme)); |
|
| 297 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 298 | + break; |
|
| 299 | 299 | /********************************************************************/ |
| 300 | 300 | /* document data */ |
| 301 | 301 | /********************************************************************/ |
| 302 | - case 3: |
|
| 303 | - // get the page to show document's data |
|
| 304 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 305 | - include_once(includeFileProcessor("actions/document_data.static.php",$manager_theme)); |
|
| 306 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 307 | - break; |
|
| 302 | + case 3: |
|
| 303 | + // get the page to show document's data |
|
| 304 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 305 | + include_once(includeFileProcessor("actions/document_data.static.php",$manager_theme)); |
|
| 306 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 307 | + break; |
|
| 308 | 308 | /********************************************************************/ |
| 309 | 309 | /* content management */ |
| 310 | 310 | /********************************************************************/ |
| 311 | - case 85: |
|
| 312 | - // get the mutate page for adding a folder |
|
| 313 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 314 | - include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme)); |
|
| 315 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 316 | - break; |
|
| 317 | - case 27: |
|
| 318 | - // get the mutate page for changing content |
|
| 319 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 320 | - include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme)); |
|
| 321 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 322 | - break; |
|
| 323 | - case 4: |
|
| 324 | - // get the mutate page for adding content |
|
| 325 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 326 | - include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme)); |
|
| 327 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 328 | - break; |
|
| 329 | - case 5: |
|
| 330 | - // get the save processor |
|
| 331 | - include_once(includeFileProcessor("processors/save_content.processor.php",$manager_theme)); |
|
| 332 | - break; |
|
| 333 | - case 6: |
|
| 334 | - // get the delete processor |
|
| 335 | - include_once(includeFileProcessor("processors/delete_content.processor.php",$manager_theme)); |
|
| 336 | - break; |
|
| 337 | - case 63: |
|
| 338 | - // get the undelete processor |
|
| 339 | - include_once(includeFileProcessor("processors/undelete_content.processor.php",$manager_theme)); |
|
| 340 | - break; |
|
| 341 | - case 51: |
|
| 342 | - // get the move action |
|
| 343 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 344 | - include_once(includeFileProcessor("actions/move_document.dynamic.php",$manager_theme)); |
|
| 345 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 346 | - break; |
|
| 347 | - case 52: |
|
| 348 | - // get the move document processor |
|
| 349 | - include_once(includeFileProcessor("processors/move_document.processor.php",$manager_theme)); |
|
| 350 | - break; |
|
| 351 | - case 61: |
|
| 352 | - // get the processor for publishing content |
|
| 353 | - include_once(includeFileProcessor("processors/publish_content.processor.php",$manager_theme)); |
|
| 354 | - break; |
|
| 355 | - case 62: |
|
| 356 | - // get the processor for publishing content |
|
| 357 | - include_once(includeFileProcessor("processors/unpublish_content.processor.php",$manager_theme)); |
|
| 358 | - break; |
|
| 359 | - case 56: |
|
| 360 | - // get the sort menuindex action |
|
| 361 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 362 | - include_once(includeFileProcessor("actions/mutate_menuindex_sort.dynamic.php",$manager_theme)); |
|
| 363 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 364 | - break; |
|
| 311 | + case 85: |
|
| 312 | + // get the mutate page for adding a folder |
|
| 313 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 314 | + include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme)); |
|
| 315 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 316 | + break; |
|
| 317 | + case 27: |
|
| 318 | + // get the mutate page for changing content |
|
| 319 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 320 | + include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme)); |
|
| 321 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 322 | + break; |
|
| 323 | + case 4: |
|
| 324 | + // get the mutate page for adding content |
|
| 325 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 326 | + include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme)); |
|
| 327 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 328 | + break; |
|
| 329 | + case 5: |
|
| 330 | + // get the save processor |
|
| 331 | + include_once(includeFileProcessor("processors/save_content.processor.php",$manager_theme)); |
|
| 332 | + break; |
|
| 333 | + case 6: |
|
| 334 | + // get the delete processor |
|
| 335 | + include_once(includeFileProcessor("processors/delete_content.processor.php",$manager_theme)); |
|
| 336 | + break; |
|
| 337 | + case 63: |
|
| 338 | + // get the undelete processor |
|
| 339 | + include_once(includeFileProcessor("processors/undelete_content.processor.php",$manager_theme)); |
|
| 340 | + break; |
|
| 341 | + case 51: |
|
| 342 | + // get the move action |
|
| 343 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 344 | + include_once(includeFileProcessor("actions/move_document.dynamic.php",$manager_theme)); |
|
| 345 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 346 | + break; |
|
| 347 | + case 52: |
|
| 348 | + // get the move document processor |
|
| 349 | + include_once(includeFileProcessor("processors/move_document.processor.php",$manager_theme)); |
|
| 350 | + break; |
|
| 351 | + case 61: |
|
| 352 | + // get the processor for publishing content |
|
| 353 | + include_once(includeFileProcessor("processors/publish_content.processor.php",$manager_theme)); |
|
| 354 | + break; |
|
| 355 | + case 62: |
|
| 356 | + // get the processor for publishing content |
|
| 357 | + include_once(includeFileProcessor("processors/unpublish_content.processor.php",$manager_theme)); |
|
| 358 | + break; |
|
| 359 | + case 56: |
|
| 360 | + // get the sort menuindex action |
|
| 361 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 362 | + include_once(includeFileProcessor("actions/mutate_menuindex_sort.dynamic.php",$manager_theme)); |
|
| 363 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 364 | + break; |
|
| 365 | 365 | /********************************************************************/ |
| 366 | 366 | /* show the wait page - gives the tree time to refresh (hopefully) */ |
| 367 | 367 | /********************************************************************/ |
| 368 | - case 7: |
|
| 369 | - // get the wait page (so the tree can reload) |
|
| 370 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 371 | - include_once(includeFileProcessor("actions/wait.static.php",$manager_theme)); |
|
| 372 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 373 | - break; |
|
| 368 | + case 7: |
|
| 369 | + // get the wait page (so the tree can reload) |
|
| 370 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 371 | + include_once(includeFileProcessor("actions/wait.static.php",$manager_theme)); |
|
| 372 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 373 | + break; |
|
| 374 | 374 | /********************************************************************/ |
| 375 | 375 | /* let the user log out */ |
| 376 | 376 | /********************************************************************/ |
| 377 | - case 8: |
|
| 378 | - // get the logout processor |
|
| 379 | - include_once(includeFileProcessor("processors/logout.processor.php",$manager_theme)); |
|
| 380 | - break; |
|
| 377 | + case 8: |
|
| 378 | + // get the logout processor |
|
| 379 | + include_once(includeFileProcessor("processors/logout.processor.php",$manager_theme)); |
|
| 380 | + break; |
|
| 381 | 381 | /********************************************************************/ |
| 382 | 382 | /* user management */ |
| 383 | 383 | /********************************************************************/ |
| 384 | - case 87: |
|
| 385 | - // get the new web user page |
|
| 386 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 387 | - include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme)); |
|
| 388 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 389 | - break; |
|
| 390 | - case 88: |
|
| 391 | - // get the edit web user page |
|
| 392 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 393 | - include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme)); |
|
| 394 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 395 | - break; |
|
| 396 | - case 89: |
|
| 397 | - // get the save web user processor |
|
| 398 | - include_once(includeFileProcessor("processors/save_web_user.processor.php",$manager_theme)); |
|
| 399 | - break; |
|
| 400 | - case 90: |
|
| 401 | - // get the delete web user page |
|
| 402 | - include_once(includeFileProcessor("processors/delete_web_user.processor.php",$manager_theme)); |
|
| 403 | - break; |
|
| 404 | - case 11: |
|
| 405 | - // get the new user page |
|
| 406 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 407 | - include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme)); |
|
| 408 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 409 | - break; |
|
| 410 | - case 12: |
|
| 411 | - // get the edit user page |
|
| 412 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 413 | - include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme)); |
|
| 414 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 415 | - break; |
|
| 416 | - case 32: |
|
| 417 | - // get the save user processor |
|
| 418 | - include_once(includeFileProcessor("processors/save_user.processor.php",$manager_theme)); |
|
| 419 | - break; |
|
| 420 | - case 28: |
|
| 421 | - // get the change password page |
|
| 422 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 423 | - include_once(includeFileProcessor("actions/mutate_password.dynamic.php",$manager_theme)); |
|
| 424 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 425 | - break; |
|
| 426 | - case 34: |
|
| 427 | - // get the save new password page |
|
| 428 | - include_once(includeFileProcessor("processors/save_password.processor.php",$manager_theme)); |
|
| 429 | - break; |
|
| 430 | - case 33: |
|
| 431 | - // get the delete user page |
|
| 432 | - include_once(includeFileProcessor("processors/delete_user.processor.php",$manager_theme)); |
|
| 433 | - break; |
|
| 384 | + case 87: |
|
| 385 | + // get the new web user page |
|
| 386 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 387 | + include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme)); |
|
| 388 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 389 | + break; |
|
| 390 | + case 88: |
|
| 391 | + // get the edit web user page |
|
| 392 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 393 | + include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme)); |
|
| 394 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 395 | + break; |
|
| 396 | + case 89: |
|
| 397 | + // get the save web user processor |
|
| 398 | + include_once(includeFileProcessor("processors/save_web_user.processor.php",$manager_theme)); |
|
| 399 | + break; |
|
| 400 | + case 90: |
|
| 401 | + // get the delete web user page |
|
| 402 | + include_once(includeFileProcessor("processors/delete_web_user.processor.php",$manager_theme)); |
|
| 403 | + break; |
|
| 404 | + case 11: |
|
| 405 | + // get the new user page |
|
| 406 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 407 | + include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme)); |
|
| 408 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 409 | + break; |
|
| 410 | + case 12: |
|
| 411 | + // get the edit user page |
|
| 412 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 413 | + include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme)); |
|
| 414 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 415 | + break; |
|
| 416 | + case 32: |
|
| 417 | + // get the save user processor |
|
| 418 | + include_once(includeFileProcessor("processors/save_user.processor.php",$manager_theme)); |
|
| 419 | + break; |
|
| 420 | + case 28: |
|
| 421 | + // get the change password page |
|
| 422 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 423 | + include_once(includeFileProcessor("actions/mutate_password.dynamic.php",$manager_theme)); |
|
| 424 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 425 | + break; |
|
| 426 | + case 34: |
|
| 427 | + // get the save new password page |
|
| 428 | + include_once(includeFileProcessor("processors/save_password.processor.php",$manager_theme)); |
|
| 429 | + break; |
|
| 430 | + case 33: |
|
| 431 | + // get the delete user page |
|
| 432 | + include_once(includeFileProcessor("processors/delete_user.processor.php",$manager_theme)); |
|
| 433 | + break; |
|
| 434 | 434 | /********************************************************************/ |
| 435 | 435 | /* role management */ |
| 436 | 436 | /********************************************************************/ |
| 437 | - case 38: |
|
| 438 | - // get the new role page |
|
| 439 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 440 | - include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme)); |
|
| 441 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 442 | - break; |
|
| 443 | - case 35: |
|
| 444 | - // get the edit role page |
|
| 445 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 446 | - include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme)); |
|
| 447 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 448 | - break; |
|
| 449 | - case 36: |
|
| 450 | - // get the save role page |
|
| 451 | - include_once(includeFileProcessor("processors/save_role.processor.php",$manager_theme)); |
|
| 452 | - break; |
|
| 453 | - case 37: |
|
| 454 | - // get the delete role page |
|
| 455 | - include_once(includeFileProcessor("processors/delete_role.processor.php",$manager_theme)); |
|
| 456 | - break; |
|
| 437 | + case 38: |
|
| 438 | + // get the new role page |
|
| 439 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 440 | + include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme)); |
|
| 441 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 442 | + break; |
|
| 443 | + case 35: |
|
| 444 | + // get the edit role page |
|
| 445 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 446 | + include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme)); |
|
| 447 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 448 | + break; |
|
| 449 | + case 36: |
|
| 450 | + // get the save role page |
|
| 451 | + include_once(includeFileProcessor("processors/save_role.processor.php",$manager_theme)); |
|
| 452 | + break; |
|
| 453 | + case 37: |
|
| 454 | + // get the delete role page |
|
| 455 | + include_once(includeFileProcessor("processors/delete_role.processor.php",$manager_theme)); |
|
| 456 | + break; |
|
| 457 | 457 | /********************************************************************/ |
| 458 | 458 | /* category management */ |
| 459 | 459 | /********************************************************************/ |
| 460 | - case 120: |
|
| 461 | - // get the edit category page |
|
| 462 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 463 | - include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme)); |
|
| 464 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 465 | - break; |
|
| 466 | - case 121: |
|
| 467 | - // for ajax-requests |
|
| 468 | - include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme)); |
|
| 469 | - break; |
|
| 460 | + case 120: |
|
| 461 | + // get the edit category page |
|
| 462 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 463 | + include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme)); |
|
| 464 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 465 | + break; |
|
| 466 | + case 121: |
|
| 467 | + // for ajax-requests |
|
| 468 | + include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme)); |
|
| 469 | + break; |
|
| 470 | 470 | /********************************************************************/ |
| 471 | 471 | /* template management */ |
| 472 | 472 | /********************************************************************/ |
| 473 | - case 16: |
|
| 474 | - // get the edit template action |
|
| 475 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 476 | - include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme)); |
|
| 477 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 478 | - break; |
|
| 479 | - case 19: |
|
| 480 | - // get the new template action |
|
| 481 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 482 | - include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme)); |
|
| 483 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 484 | - break; |
|
| 485 | - case 20: |
|
| 486 | - // get the save processor |
|
| 487 | - include_once(includeFileProcessor("processors/save_template.processor.php",$manager_theme)); |
|
| 488 | - break; |
|
| 489 | - case 21: |
|
| 490 | - // get the delete processor |
|
| 491 | - include_once(includeFileProcessor("processors/delete_template.processor.php",$manager_theme)); |
|
| 492 | - break; |
|
| 493 | - case 96: |
|
| 494 | - // get the duplicate template processor |
|
| 495 | - include_once(includeFileProcessor("processors/duplicate_template.processor.php",$manager_theme)); |
|
| 496 | - break; |
|
| 497 | - case 117: |
|
| 498 | - // change the tv rank for selected template |
|
| 499 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 500 | - include_once(includeFileProcessor("actions/mutate_template_tv_rank.dynamic.php",$manager_theme)); |
|
| 501 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 502 | - break; |
|
| 473 | + case 16: |
|
| 474 | + // get the edit template action |
|
| 475 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 476 | + include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme)); |
|
| 477 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 478 | + break; |
|
| 479 | + case 19: |
|
| 480 | + // get the new template action |
|
| 481 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 482 | + include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme)); |
|
| 483 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 484 | + break; |
|
| 485 | + case 20: |
|
| 486 | + // get the save processor |
|
| 487 | + include_once(includeFileProcessor("processors/save_template.processor.php",$manager_theme)); |
|
| 488 | + break; |
|
| 489 | + case 21: |
|
| 490 | + // get the delete processor |
|
| 491 | + include_once(includeFileProcessor("processors/delete_template.processor.php",$manager_theme)); |
|
| 492 | + break; |
|
| 493 | + case 96: |
|
| 494 | + // get the duplicate template processor |
|
| 495 | + include_once(includeFileProcessor("processors/duplicate_template.processor.php",$manager_theme)); |
|
| 496 | + break; |
|
| 497 | + case 117: |
|
| 498 | + // change the tv rank for selected template |
|
| 499 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 500 | + include_once(includeFileProcessor("actions/mutate_template_tv_rank.dynamic.php",$manager_theme)); |
|
| 501 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 502 | + break; |
|
| 503 | 503 | /********************************************************************/ |
| 504 | 504 | /* snippet management */ |
| 505 | 505 | /********************************************************************/ |
| 506 | - case 22: |
|
| 507 | - // get the edit snippet action |
|
| 508 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 509 | - include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme)); |
|
| 510 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 511 | - break; |
|
| 512 | - case 23: |
|
| 513 | - // get the new snippet action |
|
| 514 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 515 | - include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme)); |
|
| 516 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 517 | - break; |
|
| 518 | - case 24: |
|
| 519 | - // get the save processor |
|
| 520 | - include_once(includeFileProcessor("processors/save_snippet.processor.php",$manager_theme)); |
|
| 521 | - break; |
|
| 522 | - case 25: |
|
| 523 | - // get the delete processor |
|
| 524 | - include_once(includeFileProcessor("processors/delete_snippet.processor.php",$manager_theme)); |
|
| 525 | - break; |
|
| 526 | - case 98: |
|
| 527 | - // get the duplicate processor |
|
| 528 | - include_once(includeFileProcessor("processors/duplicate_snippet.processor.php",$manager_theme)); |
|
| 529 | - break; |
|
| 506 | + case 22: |
|
| 507 | + // get the edit snippet action |
|
| 508 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 509 | + include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme)); |
|
| 510 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 511 | + break; |
|
| 512 | + case 23: |
|
| 513 | + // get the new snippet action |
|
| 514 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 515 | + include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme)); |
|
| 516 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 517 | + break; |
|
| 518 | + case 24: |
|
| 519 | + // get the save processor |
|
| 520 | + include_once(includeFileProcessor("processors/save_snippet.processor.php",$manager_theme)); |
|
| 521 | + break; |
|
| 522 | + case 25: |
|
| 523 | + // get the delete processor |
|
| 524 | + include_once(includeFileProcessor("processors/delete_snippet.processor.php",$manager_theme)); |
|
| 525 | + break; |
|
| 526 | + case 98: |
|
| 527 | + // get the duplicate processor |
|
| 528 | + include_once(includeFileProcessor("processors/duplicate_snippet.processor.php",$manager_theme)); |
|
| 529 | + break; |
|
| 530 | 530 | /********************************************************************/ |
| 531 | 531 | /* htmlsnippet management */ |
| 532 | 532 | /********************************************************************/ |
| 533 | - case 78: |
|
| 534 | - // get the edit snippet action |
|
| 535 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 536 | - include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme)); |
|
| 537 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 538 | - break; |
|
| 539 | - case 77: |
|
| 540 | - // get the new snippet action |
|
| 541 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 542 | - include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme)); |
|
| 543 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 544 | - break; |
|
| 545 | - case 79: |
|
| 546 | - // get the save processor |
|
| 547 | - include_once(includeFileProcessor("processors/save_htmlsnippet.processor.php",$manager_theme)); |
|
| 548 | - break; |
|
| 549 | - case 80: |
|
| 550 | - // get the delete processor |
|
| 551 | - include_once(includeFileProcessor("processors/delete_htmlsnippet.processor.php",$manager_theme)); |
|
| 552 | - break; |
|
| 553 | - case 97: |
|
| 554 | - // get the duplicate processor |
|
| 555 | - include_once(includeFileProcessor("processors/duplicate_htmlsnippet.processor.php",$manager_theme)); |
|
| 556 | - break; |
|
| 533 | + case 78: |
|
| 534 | + // get the edit snippet action |
|
| 535 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 536 | + include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme)); |
|
| 537 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 538 | + break; |
|
| 539 | + case 77: |
|
| 540 | + // get the new snippet action |
|
| 541 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 542 | + include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme)); |
|
| 543 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 544 | + break; |
|
| 545 | + case 79: |
|
| 546 | + // get the save processor |
|
| 547 | + include_once(includeFileProcessor("processors/save_htmlsnippet.processor.php",$manager_theme)); |
|
| 548 | + break; |
|
| 549 | + case 80: |
|
| 550 | + // get the delete processor |
|
| 551 | + include_once(includeFileProcessor("processors/delete_htmlsnippet.processor.php",$manager_theme)); |
|
| 552 | + break; |
|
| 553 | + case 97: |
|
| 554 | + // get the duplicate processor |
|
| 555 | + include_once(includeFileProcessor("processors/duplicate_htmlsnippet.processor.php",$manager_theme)); |
|
| 556 | + break; |
|
| 557 | 557 | /********************************************************************/ |
| 558 | 558 | /* show the credits page */ |
| 559 | 559 | /********************************************************************/ |
| 560 | - case 18: |
|
| 561 | - // get the credits page |
|
| 562 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 563 | - include_once(includeFileProcessor("actions/credits.static.php",$manager_theme)); |
|
| 564 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 565 | - break; |
|
| 560 | + case 18: |
|
| 561 | + // get the credits page |
|
| 562 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 563 | + include_once(includeFileProcessor("actions/credits.static.php",$manager_theme)); |
|
| 564 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 565 | + break; |
|
| 566 | 566 | /********************************************************************/ |
| 567 | 567 | /* empty cache & synchronisation */ |
| 568 | 568 | /********************************************************************/ |
| 569 | - case 26: |
|
| 570 | - // get the cache emptying processor |
|
| 571 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 572 | - include_once(includeFileProcessor("actions/refresh_site.dynamic.php",$manager_theme)); |
|
| 573 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 574 | - break; |
|
| 569 | + case 26: |
|
| 570 | + // get the cache emptying processor |
|
| 571 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 572 | + include_once(includeFileProcessor("actions/refresh_site.dynamic.php",$manager_theme)); |
|
| 573 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 574 | + break; |
|
| 575 | 575 | /********************************************************************/ |
| 576 | 576 | /* Module management */ |
| 577 | 577 | /********************************************************************/ |
| 578 | - case 106: |
|
| 579 | - // get module management |
|
| 580 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 581 | - include_once(includeFileProcessor("actions/modules.static.php",$manager_theme)); |
|
| 582 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 583 | - break; |
|
| 584 | - case 107: |
|
| 585 | - // get the new module action |
|
| 586 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 587 | - include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme)); |
|
| 588 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 589 | - break; |
|
| 590 | - case 108: |
|
| 591 | - // get the edit module action |
|
| 592 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 593 | - include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme)); |
|
| 594 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 595 | - break; |
|
| 596 | - case 109: |
|
| 597 | - // get the save processor |
|
| 598 | - include_once(includeFileProcessor("processors/save_module.processor.php",$manager_theme)); |
|
| 599 | - break; |
|
| 600 | - case 110: |
|
| 601 | - // get the delete processor |
|
| 602 | - include_once(includeFileProcessor("processors/delete_module.processor.php",$manager_theme)); |
|
| 603 | - break; |
|
| 604 | - case 111: |
|
| 605 | - // get the duplicate processor |
|
| 606 | - include_once(includeFileProcessor("processors/duplicate_module.processor.php",$manager_theme)); |
|
| 607 | - break; |
|
| 608 | - case 112: |
|
| 609 | - // execute/run the module |
|
| 610 | - //include_once "header.inc.php"; |
|
| 611 | - include_once(includeFileProcessor("processors/execute_module.processor.php",$manager_theme)); |
|
| 612 | - //include_once "footer.inc.php"; |
|
| 613 | - break; |
|
| 614 | - case 113: |
|
| 615 | - // get the module resources (dependencies) action |
|
| 616 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 617 | - include_once(includeFileProcessor("actions/mutate_module_resources.dynamic.php",$manager_theme)); |
|
| 618 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 619 | - break; |
|
| 578 | + case 106: |
|
| 579 | + // get module management |
|
| 580 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 581 | + include_once(includeFileProcessor("actions/modules.static.php",$manager_theme)); |
|
| 582 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 583 | + break; |
|
| 584 | + case 107: |
|
| 585 | + // get the new module action |
|
| 586 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 587 | + include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme)); |
|
| 588 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 589 | + break; |
|
| 590 | + case 108: |
|
| 591 | + // get the edit module action |
|
| 592 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 593 | + include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme)); |
|
| 594 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 595 | + break; |
|
| 596 | + case 109: |
|
| 597 | + // get the save processor |
|
| 598 | + include_once(includeFileProcessor("processors/save_module.processor.php",$manager_theme)); |
|
| 599 | + break; |
|
| 600 | + case 110: |
|
| 601 | + // get the delete processor |
|
| 602 | + include_once(includeFileProcessor("processors/delete_module.processor.php",$manager_theme)); |
|
| 603 | + break; |
|
| 604 | + case 111: |
|
| 605 | + // get the duplicate processor |
|
| 606 | + include_once(includeFileProcessor("processors/duplicate_module.processor.php",$manager_theme)); |
|
| 607 | + break; |
|
| 608 | + case 112: |
|
| 609 | + // execute/run the module |
|
| 610 | + //include_once "header.inc.php"; |
|
| 611 | + include_once(includeFileProcessor("processors/execute_module.processor.php",$manager_theme)); |
|
| 612 | + //include_once "footer.inc.php"; |
|
| 613 | + break; |
|
| 614 | + case 113: |
|
| 615 | + // get the module resources (dependencies) action |
|
| 616 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 617 | + include_once(includeFileProcessor("actions/mutate_module_resources.dynamic.php",$manager_theme)); |
|
| 618 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 619 | + break; |
|
| 620 | 620 | /********************************************************************/ |
| 621 | 621 | /* plugin management */ |
| 622 | 622 | /********************************************************************/ |
| 623 | - case 100: |
|
| 624 | - // change the plugin priority |
|
| 625 | - //include_once "header.inc.php"; - in action file |
|
| 626 | - include_once(includeFileProcessor("actions/mutate_plugin_priority.dynamic.php",$manager_theme)); |
|
| 627 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 628 | - break; |
|
| 629 | - case 101: |
|
| 630 | - // get the new plugin action |
|
| 631 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 632 | - include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme)); |
|
| 633 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 634 | - break; |
|
| 635 | - case 102: |
|
| 636 | - // get the edit plugin action |
|
| 637 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 638 | - include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme)); |
|
| 639 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 640 | - break; |
|
| 641 | - case 103: |
|
| 642 | - // get the save processor |
|
| 643 | - include_once(includeFileProcessor("processors/save_plugin.processor.php",$manager_theme)); |
|
| 644 | - break; |
|
| 645 | - case 104: |
|
| 646 | - // get the delete processor |
|
| 647 | - include_once(includeFileProcessor("processors/delete_plugin.processor.php",$manager_theme)); |
|
| 648 | - break; |
|
| 649 | - case 105: |
|
| 650 | - // get the duplicate processor |
|
| 651 | - include_once(includeFileProcessor("processors/duplicate_plugin.processor.php",$manager_theme)); |
|
| 652 | - break; |
|
| 653 | - case 119: |
|
| 654 | - // get the purge processor |
|
| 655 | - include_once(includeFileProcessor("processors/purge_plugin.processor.php",$manager_theme)); |
|
| 656 | - break; |
|
| 623 | + case 100: |
|
| 624 | + // change the plugin priority |
|
| 625 | + //include_once "header.inc.php"; - in action file |
|
| 626 | + include_once(includeFileProcessor("actions/mutate_plugin_priority.dynamic.php",$manager_theme)); |
|
| 627 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 628 | + break; |
|
| 629 | + case 101: |
|
| 630 | + // get the new plugin action |
|
| 631 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 632 | + include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme)); |
|
| 633 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 634 | + break; |
|
| 635 | + case 102: |
|
| 636 | + // get the edit plugin action |
|
| 637 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 638 | + include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme)); |
|
| 639 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 640 | + break; |
|
| 641 | + case 103: |
|
| 642 | + // get the save processor |
|
| 643 | + include_once(includeFileProcessor("processors/save_plugin.processor.php",$manager_theme)); |
|
| 644 | + break; |
|
| 645 | + case 104: |
|
| 646 | + // get the delete processor |
|
| 647 | + include_once(includeFileProcessor("processors/delete_plugin.processor.php",$manager_theme)); |
|
| 648 | + break; |
|
| 649 | + case 105: |
|
| 650 | + // get the duplicate processor |
|
| 651 | + include_once(includeFileProcessor("processors/duplicate_plugin.processor.php",$manager_theme)); |
|
| 652 | + break; |
|
| 653 | + case 119: |
|
| 654 | + // get the purge processor |
|
| 655 | + include_once(includeFileProcessor("processors/purge_plugin.processor.php",$manager_theme)); |
|
| 656 | + break; |
|
| 657 | 657 | /********************************************************************/ |
| 658 | 658 | /* view phpinfo */ |
| 659 | 659 | /********************************************************************/ |
| 660 | - case 200: |
|
| 661 | - // show phpInfo |
|
| 662 | - if($modx->hasPermission('logs')) { |
|
| 663 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 664 | - include_once(includeFileProcessor("actions/phpinfo.static.php",$manager_theme)); |
|
| 665 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 666 | - } |
|
| 667 | - break; |
|
| 660 | + case 200: |
|
| 661 | + // show phpInfo |
|
| 662 | + if($modx->hasPermission('logs')) { |
|
| 663 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 664 | + include_once(includeFileProcessor("actions/phpinfo.static.php",$manager_theme)); |
|
| 665 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 666 | + } |
|
| 667 | + break; |
|
| 668 | 668 | /********************************************************************/ |
| 669 | 669 | /* errorpage */ |
| 670 | 670 | /********************************************************************/ |
| 671 | - case 29: |
|
| 672 | - // get the error page |
|
| 673 | - include_once(includeFileProcessor("actions/error_dialog.static.php",$manager_theme)); |
|
| 674 | - break; |
|
| 671 | + case 29: |
|
| 672 | + // get the error page |
|
| 673 | + include_once(includeFileProcessor("actions/error_dialog.static.php",$manager_theme)); |
|
| 674 | + break; |
|
| 675 | 675 | /********************************************************************/ |
| 676 | 676 | /* file manager */ |
| 677 | 677 | /********************************************************************/ |
| 678 | - case 31: |
|
| 679 | - // get the page to manage files |
|
| 680 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 681 | - include_once(includeFileProcessor("actions/files.dynamic.php",$manager_theme)); |
|
| 682 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 683 | - break; |
|
| 678 | + case 31: |
|
| 679 | + // get the page to manage files |
|
| 680 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 681 | + include_once(includeFileProcessor("actions/files.dynamic.php",$manager_theme)); |
|
| 682 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 683 | + break; |
|
| 684 | 684 | /********************************************************************/ |
| 685 | 685 | /* access permissions */ |
| 686 | 686 | /********************************************************************/ |
| 687 | - case 40: |
|
| 688 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 689 | - include_once(includeFileProcessor("actions/access_permissions.dynamic.php",$manager_theme)); |
|
| 690 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 691 | - break; |
|
| 692 | - case 91: |
|
| 693 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 694 | - include_once(includeFileProcessor("actions/web_access_permissions.dynamic.php",$manager_theme)); |
|
| 695 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 696 | - break; |
|
| 687 | + case 40: |
|
| 688 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 689 | + include_once(includeFileProcessor("actions/access_permissions.dynamic.php",$manager_theme)); |
|
| 690 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 691 | + break; |
|
| 692 | + case 91: |
|
| 693 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 694 | + include_once(includeFileProcessor("actions/web_access_permissions.dynamic.php",$manager_theme)); |
|
| 695 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 696 | + break; |
|
| 697 | 697 | /********************************************************************/ |
| 698 | 698 | /* access groups processor */ |
| 699 | 699 | /********************************************************************/ |
| 700 | - case 41: |
|
| 701 | - include_once(includeFileProcessor("processors/access_groups.processor.php",$manager_theme)); |
|
| 702 | - break; |
|
| 703 | - case 92: |
|
| 704 | - include_once(includeFileProcessor("processors/web_access_groups.processor.php",$manager_theme)); |
|
| 705 | - break; |
|
| 700 | + case 41: |
|
| 701 | + include_once(includeFileProcessor("processors/access_groups.processor.php",$manager_theme)); |
|
| 702 | + break; |
|
| 703 | + case 92: |
|
| 704 | + include_once(includeFileProcessor("processors/web_access_groups.processor.php",$manager_theme)); |
|
| 705 | + break; |
|
| 706 | 706 | /********************************************************************/ |
| 707 | 707 | /* settings editor */ |
| 708 | 708 | /********************************************************************/ |
| 709 | - case 17: |
|
| 710 | - // get the settings editor |
|
| 711 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 712 | - include_once(includeFileProcessor("actions/mutate_settings.dynamic.php",$manager_theme)); |
|
| 713 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 714 | - break; |
|
| 715 | - case 118: |
|
| 716 | - // call settings ajax include |
|
| 717 | - ob_clean(); |
|
| 718 | - include_once(includeFileProcessor("includes/mutate_settings.ajax.php",$manager_theme)); |
|
| 719 | - break; |
|
| 709 | + case 17: |
|
| 710 | + // get the settings editor |
|
| 711 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 712 | + include_once(includeFileProcessor("actions/mutate_settings.dynamic.php",$manager_theme)); |
|
| 713 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 714 | + break; |
|
| 715 | + case 118: |
|
| 716 | + // call settings ajax include |
|
| 717 | + ob_clean(); |
|
| 718 | + include_once(includeFileProcessor("includes/mutate_settings.ajax.php",$manager_theme)); |
|
| 719 | + break; |
|
| 720 | 720 | /********************************************************************/ |
| 721 | 721 | /* save settings */ |
| 722 | 722 | /********************************************************************/ |
| 723 | - case 30: |
|
| 724 | - // get the save settings processor |
|
| 725 | - include_once(includeFileProcessor("processors/save_settings.processor.php",$manager_theme)); |
|
| 726 | - break; |
|
| 723 | + case 30: |
|
| 724 | + // get the save settings processor |
|
| 725 | + include_once(includeFileProcessor("processors/save_settings.processor.php",$manager_theme)); |
|
| 726 | + break; |
|
| 727 | 727 | /********************************************************************/ |
| 728 | 728 | /* system information */ |
| 729 | 729 | /********************************************************************/ |
| 730 | - case 53: |
|
| 731 | - // get the settings editor |
|
| 732 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 733 | - include_once(includeFileProcessor("actions/sysinfo.static.php",$manager_theme)); |
|
| 734 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 735 | - break; |
|
| 730 | + case 53: |
|
| 731 | + // get the settings editor |
|
| 732 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 733 | + include_once(includeFileProcessor("actions/sysinfo.static.php",$manager_theme)); |
|
| 734 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 735 | + break; |
|
| 736 | 736 | /********************************************************************/ |
| 737 | 737 | /* optimise table */ |
| 738 | 738 | /********************************************************************/ |
| 739 | - case 54: |
|
| 740 | - // get the table optimizer/truncate processor |
|
| 741 | - include_once(includeFileProcessor("processors/optimize_table.processor.php",$manager_theme)); |
|
| 742 | - break; |
|
| 739 | + case 54: |
|
| 740 | + // get the table optimizer/truncate processor |
|
| 741 | + include_once(includeFileProcessor("processors/optimize_table.processor.php",$manager_theme)); |
|
| 742 | + break; |
|
| 743 | 743 | /********************************************************************/ |
| 744 | 744 | /* view logging */ |
| 745 | 745 | /********************************************************************/ |
| 746 | - case 13: |
|
| 747 | - // view logging |
|
| 748 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 749 | - include_once(includeFileProcessor("actions/logging.static.php",$manager_theme)); |
|
| 750 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 751 | - break; |
|
| 746 | + case 13: |
|
| 747 | + // view logging |
|
| 748 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 749 | + include_once(includeFileProcessor("actions/logging.static.php",$manager_theme)); |
|
| 750 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 751 | + break; |
|
| 752 | 752 | /********************************************************************/ |
| 753 | 753 | /* empty logs */ |
| 754 | 754 | /********************************************************************/ |
| 755 | - case 55: |
|
| 756 | - // get the settings editor |
|
| 757 | - include_once(includeFileProcessor("processors/empty_table.processor.php",$manager_theme)); |
|
| 758 | - break; |
|
| 755 | + case 55: |
|
| 756 | + // get the settings editor |
|
| 757 | + include_once(includeFileProcessor("processors/empty_table.processor.php",$manager_theme)); |
|
| 758 | + break; |
|
| 759 | 759 | /********************************************************************/ |
| 760 | 760 | /* calls test page */ |
| 761 | 761 | /********************************************************************/ |
| 762 | - case 999: |
|
| 763 | - // get the test page |
|
| 764 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 765 | - include_once(includeFileProcessor("test_page.php",$manager_theme)); |
|
| 766 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 767 | - break; |
|
| 762 | + case 999: |
|
| 763 | + // get the test page |
|
| 764 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 765 | + include_once(includeFileProcessor("test_page.php",$manager_theme)); |
|
| 766 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 767 | + break; |
|
| 768 | 768 | /********************************************************************/ |
| 769 | 769 | /* Empty recycle bin */ |
| 770 | 770 | /********************************************************************/ |
| 771 | - case 64: |
|
| 772 | - // get the Recycle bin emptier |
|
| 773 | - include_once(includeFileProcessor("processors/remove_content.processor.php",$manager_theme)); |
|
| 774 | - break; |
|
| 771 | + case 64: |
|
| 772 | + // get the Recycle bin emptier |
|
| 773 | + include_once(includeFileProcessor("processors/remove_content.processor.php",$manager_theme)); |
|
| 774 | + break; |
|
| 775 | 775 | /********************************************************************/ |
| 776 | 776 | /* Messages */ |
| 777 | 777 | /********************************************************************/ |
| 778 | - case 10: |
|
| 779 | - // get the messages page |
|
| 780 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 781 | - include_once(includeFileProcessor("actions/messages.static.php",$manager_theme)); |
|
| 782 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 783 | - break; |
|
| 778 | + case 10: |
|
| 779 | + // get the messages page |
|
| 780 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 781 | + include_once(includeFileProcessor("actions/messages.static.php",$manager_theme)); |
|
| 782 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 783 | + break; |
|
| 784 | 784 | /********************************************************************/ |
| 785 | 785 | /* Delete a message */ |
| 786 | 786 | /********************************************************************/ |
| 787 | - case 65: |
|
| 788 | - // get the message deleter |
|
| 789 | - include_once(includeFileProcessor("processors/delete_message.processor.php",$manager_theme)); |
|
| 790 | - break; |
|
| 787 | + case 65: |
|
| 788 | + // get the message deleter |
|
| 789 | + include_once(includeFileProcessor("processors/delete_message.processor.php",$manager_theme)); |
|
| 790 | + break; |
|
| 791 | 791 | /********************************************************************/ |
| 792 | 792 | /* Send a message */ |
| 793 | 793 | /********************************************************************/ |
| 794 | - case 66: |
|
| 795 | - // get the message deleter |
|
| 796 | - include_once(includeFileProcessor("processors/send_message.processor.php",$manager_theme)); |
|
| 797 | - break; |
|
| 794 | + case 66: |
|
| 795 | + // get the message deleter |
|
| 796 | + include_once(includeFileProcessor("processors/send_message.processor.php",$manager_theme)); |
|
| 797 | + break; |
|
| 798 | 798 | /********************************************************************/ |
| 799 | 799 | /* Remove locks */ |
| 800 | 800 | /********************************************************************/ |
| 801 | - case 67: |
|
| 802 | - // get the lock remover |
|
| 803 | - include_once(includeFileProcessor("processors/remove_locks.processor.php",$manager_theme)); |
|
| 804 | - break; |
|
| 801 | + case 67: |
|
| 802 | + // get the lock remover |
|
| 803 | + include_once(includeFileProcessor("processors/remove_locks.processor.php",$manager_theme)); |
|
| 804 | + break; |
|
| 805 | 805 | /********************************************************************/ |
| 806 | 806 | /* Site schedule */ |
| 807 | 807 | /********************************************************************/ |
| 808 | - case 70: |
|
| 809 | - // get the schedule page |
|
| 810 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 811 | - include_once(includeFileProcessor("actions/site_schedule.static.php",$manager_theme)); |
|
| 812 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 813 | - break; |
|
| 808 | + case 70: |
|
| 809 | + // get the schedule page |
|
| 810 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 811 | + include_once(includeFileProcessor("actions/site_schedule.static.php",$manager_theme)); |
|
| 812 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 813 | + break; |
|
| 814 | 814 | /********************************************************************/ |
| 815 | 815 | /* Search */ |
| 816 | 816 | /********************************************************************/ |
| 817 | - case 71: |
|
| 818 | - // get the search page |
|
| 819 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 820 | - include_once(includeFileProcessor("actions/search.static.php",$manager_theme)); |
|
| 821 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 822 | - break; |
|
| 817 | + case 71: |
|
| 818 | + // get the search page |
|
| 819 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 820 | + include_once(includeFileProcessor("actions/search.static.php",$manager_theme)); |
|
| 821 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 822 | + break; |
|
| 823 | 823 | /********************************************************************/ |
| 824 | 824 | /* About */ |
| 825 | 825 | /********************************************************************/ |
| 826 | - case 59: |
|
| 827 | - // get the about page |
|
| 828 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 829 | - include_once(includeFileProcessor("actions/about.static.php",$manager_theme)); |
|
| 830 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 831 | - break; |
|
| 826 | + case 59: |
|
| 827 | + // get the about page |
|
| 828 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 829 | + include_once(includeFileProcessor("actions/about.static.php",$manager_theme)); |
|
| 830 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 831 | + break; |
|
| 832 | 832 | /********************************************************************/ |
| 833 | 833 | /* Add weblink */ |
| 834 | 834 | /********************************************************************/ |
| 835 | - case 72: |
|
| 836 | - // get the weblink page |
|
| 837 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 838 | - include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme)); |
|
| 839 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 840 | - break; |
|
| 835 | + case 72: |
|
| 836 | + // get the weblink page |
|
| 837 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 838 | + include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme)); |
|
| 839 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 840 | + break; |
|
| 841 | 841 | /********************************************************************/ |
| 842 | 842 | /* User management */ |
| 843 | 843 | /********************************************************************/ |
| 844 | - case 75: |
|
| 845 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 846 | - include_once(includeFileProcessor("actions/user_management.static.php",$manager_theme)); |
|
| 847 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 848 | - break; |
|
| 849 | - case 99: |
|
| 850 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 851 | - include_once(includeFileProcessor("actions/web_user_management.static.php",$manager_theme)); |
|
| 852 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 853 | - break; |
|
| 854 | - case 86: |
|
| 855 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 856 | - include_once(includeFileProcessor("actions/role_management.static.php",$manager_theme)); |
|
| 857 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 858 | - break; |
|
| 844 | + case 75: |
|
| 845 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 846 | + include_once(includeFileProcessor("actions/user_management.static.php",$manager_theme)); |
|
| 847 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 848 | + break; |
|
| 849 | + case 99: |
|
| 850 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 851 | + include_once(includeFileProcessor("actions/web_user_management.static.php",$manager_theme)); |
|
| 852 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 853 | + break; |
|
| 854 | + case 86: |
|
| 855 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 856 | + include_once(includeFileProcessor("actions/role_management.static.php",$manager_theme)); |
|
| 857 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 858 | + break; |
|
| 859 | 859 | /********************************************************************/ |
| 860 | 860 | /* template/ snippet management */ |
| 861 | 861 | /********************************************************************/ |
| 862 | - case 76: |
|
| 863 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 864 | - include_once(includeFileProcessor("actions/resources.static.php",$manager_theme)); |
|
| 865 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 866 | - break; |
|
| 862 | + case 76: |
|
| 863 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 864 | + include_once(includeFileProcessor("actions/resources.static.php",$manager_theme)); |
|
| 865 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 866 | + break; |
|
| 867 | 867 | /********************************************************************/ |
| 868 | 868 | /* Export to file */ |
| 869 | 869 | /********************************************************************/ |
| 870 | - case 83: |
|
| 871 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 872 | - include_once(includeFileProcessor("actions/export_site.static.php",$manager_theme)); |
|
| 873 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 874 | - break; |
|
| 870 | + case 83: |
|
| 871 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 872 | + include_once(includeFileProcessor("actions/export_site.static.php",$manager_theme)); |
|
| 873 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 874 | + break; |
|
| 875 | 875 | /********************************************************************/ |
| 876 | 876 | /* Resource Selector */ |
| 877 | 877 | /********************************************************************/ |
| 878 | - case 84: |
|
| 879 | - include_once(includeFileProcessor("actions/resource_selector.static.php",$manager_theme)); |
|
| 880 | - break; |
|
| 878 | + case 84: |
|
| 879 | + include_once(includeFileProcessor("actions/resource_selector.static.php",$manager_theme)); |
|
| 880 | + break; |
|
| 881 | 881 | /********************************************************************/ |
| 882 | 882 | /* Backup Manager */ |
| 883 | 883 | /********************************************************************/ |
| 884 | - case 93: |
|
| 885 | - # header and footer will be handled interally |
|
| 886 | - include_once(includeFileProcessor("actions/bkmanager.static.php",$manager_theme)); |
|
| 887 | - break; |
|
| 884 | + case 93: |
|
| 885 | + # header and footer will be handled interally |
|
| 886 | + include_once(includeFileProcessor("actions/bkmanager.static.php",$manager_theme)); |
|
| 887 | + break; |
|
| 888 | 888 | /********************************************************************/ |
| 889 | 889 | /* Duplicate Document */ |
| 890 | 890 | /********************************************************************/ |
| 891 | - case 94: |
|
| 892 | - // get the duplicate processor |
|
| 893 | - include_once(includeFileProcessor("processors/duplicate_content.processor.php",$manager_theme)); |
|
| 894 | - break; |
|
| 891 | + case 94: |
|
| 892 | + // get the duplicate processor |
|
| 893 | + include_once(includeFileProcessor("processors/duplicate_content.processor.php",$manager_theme)); |
|
| 894 | + break; |
|
| 895 | 895 | /********************************************************************/ |
| 896 | 896 | /* Import Document from file */ |
| 897 | 897 | /********************************************************************/ |
| 898 | - case 95: |
|
| 899 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 900 | - include_once(includeFileProcessor("actions/import_site.static.php",$manager_theme)); |
|
| 901 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 902 | - break; |
|
| 898 | + case 95: |
|
| 899 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 900 | + include_once(includeFileProcessor("actions/import_site.static.php",$manager_theme)); |
|
| 901 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 902 | + break; |
|
| 903 | 903 | /********************************************************************/ |
| 904 | 904 | /* Help */ |
| 905 | 905 | /********************************************************************/ |
| 906 | - case 9: |
|
| 907 | - // get the help page |
|
| 908 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 909 | - include_once(includeFileProcessor("actions/help.static.php",$manager_theme)); |
|
| 910 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 911 | - break; |
|
| 906 | + case 9: |
|
| 907 | + // get the help page |
|
| 908 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 909 | + include_once(includeFileProcessor("actions/help.static.php",$manager_theme)); |
|
| 910 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 911 | + break; |
|
| 912 | 912 | /********************************************************************/ |
| 913 | 913 | /* Template Variables - Based on Apodigm's Docvars */ |
| 914 | 914 | /********************************************************************/ |
| 915 | - case 300: |
|
| 916 | - // get the new document variable action |
|
| 917 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 918 | - include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme)); |
|
| 919 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 920 | - break; |
|
| 921 | - case 301: |
|
| 922 | - // get the edit document variable action |
|
| 923 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 924 | - include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme)); |
|
| 925 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 926 | - break; |
|
| 927 | - case 302: |
|
| 928 | - // get the save processor |
|
| 929 | - include_once(includeFileProcessor("processors/save_tmplvars.processor.php",$manager_theme)); |
|
| 930 | - break; |
|
| 931 | - case 303: |
|
| 932 | - // get the delete processor |
|
| 933 | - include_once(includeFileProcessor("processors/delete_tmplvars.processor.php",$manager_theme)); |
|
| 934 | - break; |
|
| 935 | - case 304: |
|
| 936 | - // get the duplicate processor |
|
| 937 | - include_once(includeFileProcessor("processors/duplicate_tmplvars.processor.php",$manager_theme)); |
|
| 938 | - break; |
|
| 939 | - case 305: |
|
| 940 | - // get the tv-rank action |
|
| 941 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 942 | - include_once(includeFileProcessor("actions/mutate_tv_rank.dynamic.php",$manager_theme)); |
|
| 943 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 944 | - break; |
|
| 915 | + case 300: |
|
| 916 | + // get the new document variable action |
|
| 917 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 918 | + include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme)); |
|
| 919 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 920 | + break; |
|
| 921 | + case 301: |
|
| 922 | + // get the edit document variable action |
|
| 923 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 924 | + include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme)); |
|
| 925 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 926 | + break; |
|
| 927 | + case 302: |
|
| 928 | + // get the save processor |
|
| 929 | + include_once(includeFileProcessor("processors/save_tmplvars.processor.php",$manager_theme)); |
|
| 930 | + break; |
|
| 931 | + case 303: |
|
| 932 | + // get the delete processor |
|
| 933 | + include_once(includeFileProcessor("processors/delete_tmplvars.processor.php",$manager_theme)); |
|
| 934 | + break; |
|
| 935 | + case 304: |
|
| 936 | + // get the duplicate processor |
|
| 937 | + include_once(includeFileProcessor("processors/duplicate_tmplvars.processor.php",$manager_theme)); |
|
| 938 | + break; |
|
| 939 | + case 305: |
|
| 940 | + // get the tv-rank action |
|
| 941 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 942 | + include_once(includeFileProcessor("actions/mutate_tv_rank.dynamic.php",$manager_theme)); |
|
| 943 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 944 | + break; |
|
| 945 | 945 | /********************************************************************/ |
| 946 | 946 | /* Event viewer: show event message log */ |
| 947 | 947 | /********************************************************************/ |
| 948 | - case 114: |
|
| 949 | - // get event logs |
|
| 950 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 951 | - include_once(includeFileProcessor("actions/eventlog.dynamic.php",$manager_theme)); |
|
| 952 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 953 | - break; |
|
| 954 | - case 115: |
|
| 955 | - // get event log details viewer |
|
| 956 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 957 | - include_once(includeFileProcessor("actions/eventlog_details.dynamic.php",$manager_theme)); |
|
| 958 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 959 | - break; |
|
| 960 | - case 116: |
|
| 961 | - // get the event log delete processor |
|
| 962 | - include_once(includeFileProcessor("processors/delete_eventlog.processor.php",$manager_theme)); |
|
| 963 | - break; |
|
| 964 | - |
|
| 965 | - case 501: |
|
| 966 | - //delete category |
|
| 967 | - include_once(includeFileProcessor("processors/delete_category.processor.php",$manager_theme)); |
|
| 968 | - break; |
|
| 948 | + case 114: |
|
| 949 | + // get event logs |
|
| 950 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 951 | + include_once(includeFileProcessor("actions/eventlog.dynamic.php",$manager_theme)); |
|
| 952 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 953 | + break; |
|
| 954 | + case 115: |
|
| 955 | + // get event log details viewer |
|
| 956 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 957 | + include_once(includeFileProcessor("actions/eventlog_details.dynamic.php",$manager_theme)); |
|
| 958 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 959 | + break; |
|
| 960 | + case 116: |
|
| 961 | + // get the event log delete processor |
|
| 962 | + include_once(includeFileProcessor("processors/delete_eventlog.processor.php",$manager_theme)); |
|
| 963 | + break; |
|
| 964 | + |
|
| 965 | + case 501: |
|
| 966 | + //delete category |
|
| 967 | + include_once(includeFileProcessor("processors/delete_category.processor.php",$manager_theme)); |
|
| 968 | + break; |
|
| 969 | 969 | /********************************************************************/ |
| 970 | 970 | /* default action: show not implemented message */ |
| 971 | 971 | /********************************************************************/ |
| 972 | - default : |
|
| 973 | - // say that what was requested doesn't do anything yet |
|
| 974 | - include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 975 | - echo " |
|
| 972 | + default : |
|
| 973 | + // say that what was requested doesn't do anything yet |
|
| 974 | + include_once(includeFileProcessor("includes/header.inc.php",$manager_theme)); |
|
| 975 | + echo " |
|
| 976 | 976 | <div class='sectionHeader'>".$_lang['functionnotimpl']."</div> |
| 977 | 977 | <div class='sectionBody'> |
| 978 | 978 | <p>".$_lang['functionnotimpl_message']."</p> |
| 979 | 979 | </div> |
| 980 | 980 | "; |
| 981 | - include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 981 | + include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme)); |
|
| 982 | 982 | } |
| 983 | 983 | |
| 984 | 984 | /********************************************************************/ |
| 985 | 985 | // log action, unless it's a frame request |
| 986 | 986 | if($action!=1 && $action!=7 && $action!=2) { |
| 987 | - include_once "log.class.inc.php"; |
|
| 988 | - $log = new logHandler; |
|
| 989 | - $log->initAndWriteLog(); |
|
| 987 | + include_once "log.class.inc.php"; |
|
| 988 | + $log = new logHandler; |
|
| 989 | + $log->initAndWriteLog(); |
|
| 990 | 990 | } |
| 991 | 991 | /********************************************************************/ |
| 992 | 992 | // show debug |
@@ -3,12 +3,12 @@ discard block |
||
| 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 | if(!$modx->hasPermission('delete_document')) { |
| 6 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 6 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 7 | 7 | } |
| 8 | 8 | |
| 9 | 9 | $id = isset($_REQUEST['id'])? (int)$_REQUEST['id'] : 0; |
| 10 | 10 | if($id==0) { |
| 11 | - $modx->webAlertAndQuit($_lang["error_no_id"]); |
|
| 11 | + $modx->webAlertAndQuit($_lang["error_no_id"]); |
|
| 12 | 12 | } |
| 13 | 13 | |
| 14 | 14 | /************ webber ********/ |
@@ -32,14 +32,14 @@ discard block |
||
| 32 | 32 | $udperms->role = $_SESSION['mgrRole']; |
| 33 | 33 | |
| 34 | 34 | if(!$udperms->checkPermissions()) { |
| 35 | - $modx->webAlertAndQuit($_lang["access_permission_denied"]); |
|
| 35 | + $modx->webAlertAndQuit($_lang["access_permission_denied"]); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | // get the timestamp on which the document was deleted. |
| 39 | 39 | $rs = $modx->db->select('deletedon', $modx->getFullTableName('site_content'), "id='{$id}' AND deleted=1"); |
| 40 | 40 | $deltime = $modx->db->getValue($rs); |
| 41 | 41 | if(!$deltime) { |
| 42 | - $modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!"); |
|
| 42 | + $modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!"); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | $children = array(); |
@@ -49,36 +49,36 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | function getChildren($parent) { |
| 51 | 51 | |
| 52 | - $modx = evolutionCMS(); |
|
| 53 | - global $children; |
|
| 54 | - global $deltime; |
|
| 55 | - |
|
| 56 | - $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='".(int)$parent."' AND deleted=1 AND deletedon='".(int)$deltime."'"); |
|
| 57 | - // the document has children documents, we'll need to delete those too |
|
| 58 | - while ($row=$modx->db->getRow($rs)) { |
|
| 59 | - $children[] = $row['id']; |
|
| 60 | - getChildren($row['id']); |
|
| 61 | - //echo "Found childNode of parentNode $parent: ".$row['id']."<br />"; |
|
| 62 | - } |
|
| 52 | + $modx = evolutionCMS(); |
|
| 53 | + global $children; |
|
| 54 | + global $deltime; |
|
| 55 | + |
|
| 56 | + $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='".(int)$parent."' AND deleted=1 AND deletedon='".(int)$deltime."'"); |
|
| 57 | + // the document has children documents, we'll need to delete those too |
|
| 58 | + while ($row=$modx->db->getRow($rs)) { |
|
| 59 | + $children[] = $row['id']; |
|
| 60 | + getChildren($row['id']); |
|
| 61 | + //echo "Found childNode of parentNode $parent: ".$row['id']."<br />"; |
|
| 62 | + } |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | getChildren($id); |
| 66 | 66 | |
| 67 | 67 | if(count($children)>0) { |
| 68 | - $modx->db->update( |
|
| 69 | - array( |
|
| 70 | - 'deleted' => 0, |
|
| 71 | - 'deletedby' => 0, |
|
| 72 | - 'deletedon' => 0, |
|
| 73 | - ), $modx->getFullTableName('site_content'), "id IN(".implode(", ", $children).")"); |
|
| 68 | + $modx->db->update( |
|
| 69 | + array( |
|
| 70 | + 'deleted' => 0, |
|
| 71 | + 'deletedby' => 0, |
|
| 72 | + 'deletedon' => 0, |
|
| 73 | + ), $modx->getFullTableName('site_content'), "id IN(".implode(", ", $children).")"); |
|
| 74 | 74 | } |
| 75 | 75 | //'undelete' the document. |
| 76 | 76 | $modx->db->update( |
| 77 | - array( |
|
| 78 | - 'deleted' => 0, |
|
| 79 | - 'deletedby' => 0, |
|
| 80 | - 'deletedon' => 0, |
|
| 81 | - ), $modx->getFullTableName('site_content'), "id='{$id}'"); |
|
| 77 | + array( |
|
| 78 | + 'deleted' => 0, |
|
| 79 | + 'deletedby' => 0, |
|
| 80 | + 'deletedon' => 0, |
|
| 81 | + ), $modx->getFullTableName('site_content'), "id='{$id}'"); |
|
| 82 | 82 | |
| 83 | 83 | $modx->invokeEvent("OnDocFormUnDelete", |
| 84 | 84 | array( |
@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { |
| 3 | - header('HTTP/1.0 404 Not Found'); |
|
| 4 | - exit('error'); |
|
| 3 | + header('HTTP/1.0 404 Not Found'); |
|
| 4 | + exit('error'); |
|
| 5 | 5 | } |
| 6 | 6 | define('IN_MANAGER_MODE', true); // we use this to make sure files are accessed through |
| 7 | 7 | define('MODX_API_MODE', true); |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | include_once("{$core_path}lang/english.inc.php"); |
| 19 | 19 | |
| 20 | 20 | if($manager_language !== 'english' && is_file("{$core_path}lang/{$manager_language}.inc.php")) { |
| 21 | - include_once("{$core_path}lang/{$manager_language}.inc.php"); |
|
| 21 | + include_once("{$core_path}lang/{$manager_language}.inc.php"); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | // include the logger |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | // Initialize System Alert Message Queque |
| 28 | 28 | if(!isset($_SESSION['SystemAlertMsgQueque'])) { |
| 29 | - $_SESSION['SystemAlertMsgQueque'] = array(); |
|
| 29 | + $_SESSION['SystemAlertMsgQueque'] = array(); |
|
| 30 | 30 | } |
| 31 | 31 | $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque']; |
| 32 | 32 | |
@@ -41,10 +41,10 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | // invoke OnBeforeManagerLogin event |
| 43 | 43 | $modx->invokeEvent('OnBeforeManagerLogin', array( |
| 44 | - 'username' => $username, |
|
| 45 | - 'userpassword' => $givenPassword, |
|
| 46 | - 'rememberme' => $rememberme |
|
| 47 | - )); |
|
| 44 | + 'username' => $username, |
|
| 45 | + 'userpassword' => $givenPassword, |
|
| 46 | + 'rememberme' => $rememberme |
|
| 47 | + )); |
|
| 48 | 48 | $fields = 'mu.*, ua.*'; |
| 49 | 49 | $from = '[+prefix+]manager_users AS mu, [+prefix+]user_attributes AS ua'; |
| 50 | 50 | $where = "BINARY mu.username='{$username}' and ua.internalKey=mu.id"; |
@@ -52,8 +52,8 @@ discard block |
||
| 52 | 52 | $limit = $modx->db->getRecordCount($rs); |
| 53 | 53 | |
| 54 | 54 | if($limit == 0 || $limit > 1) { |
| 55 | - jsAlert($_lang['login_processor_unknown_user']); |
|
| 56 | - return; |
|
| 55 | + jsAlert($_lang['login_processor_unknown_user']); |
|
| 56 | + return; |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | $row = $modx->db->getRow($rs); |
@@ -74,127 +74,127 @@ discard block |
||
| 74 | 74 | // get the user settings from the database |
| 75 | 75 | $rs = $modx->db->select('setting_name, setting_value', '[+prefix+]user_settings', "user='{$internalKey}' AND setting_value!=''"); |
| 76 | 76 | while($row = $modx->db->getRow($rs)) { |
| 77 | - extract($row); |
|
| 78 | - ${$setting_name} = $setting_value; |
|
| 77 | + extract($row); |
|
| 78 | + ${$setting_name} = $setting_value; |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | // blocked due to number of login errors. |
| 82 | 82 | if($failedlogins >= $failed_allowed && $blockeduntildate > time()) { |
| 83 | - @session_destroy(); |
|
| 84 | - session_unset(); |
|
| 85 | - if($cip = getenv("HTTP_CLIENT_IP")) { |
|
| 86 | - $ip = $cip; |
|
| 87 | - } elseif($cip = getenv("HTTP_X_FORWARDED_FOR")) { |
|
| 88 | - $ip = $cip; |
|
| 89 | - } elseif($cip = getenv("REMOTE_ADDR")) { |
|
| 90 | - $ip = $cip; |
|
| 91 | - } else { |
|
| 92 | - $ip = "UNKNOWN"; |
|
| 93 | - } |
|
| 94 | - $log = new logHandler; |
|
| 95 | - $log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: " . $ip); |
|
| 96 | - jsAlert($_lang['login_processor_many_failed_logins']); |
|
| 97 | - return; |
|
| 83 | + @session_destroy(); |
|
| 84 | + session_unset(); |
|
| 85 | + if($cip = getenv("HTTP_CLIENT_IP")) { |
|
| 86 | + $ip = $cip; |
|
| 87 | + } elseif($cip = getenv("HTTP_X_FORWARDED_FOR")) { |
|
| 88 | + $ip = $cip; |
|
| 89 | + } elseif($cip = getenv("REMOTE_ADDR")) { |
|
| 90 | + $ip = $cip; |
|
| 91 | + } else { |
|
| 92 | + $ip = "UNKNOWN"; |
|
| 93 | + } |
|
| 94 | + $log = new logHandler; |
|
| 95 | + $log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: " . $ip); |
|
| 96 | + jsAlert($_lang['login_processor_many_failed_logins']); |
|
| 97 | + return; |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | // blocked due to number of login errors, but get to try again |
| 101 | 101 | if($failedlogins >= $failed_allowed && $blockeduntildate < time()) { |
| 102 | - $fields = array(); |
|
| 103 | - $fields['failedlogincount'] = '0'; |
|
| 104 | - $fields['blockeduntil'] = time() - 1; |
|
| 105 | - $modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'"); |
|
| 102 | + $fields = array(); |
|
| 103 | + $fields['failedlogincount'] = '0'; |
|
| 104 | + $fields['blockeduntil'] = time() - 1; |
|
| 105 | + $modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'"); |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | // this user has been blocked by an admin, so no way he's loggin in! |
| 109 | 109 | if($blocked == '1') { |
| 110 | - @session_destroy(); |
|
| 111 | - session_unset(); |
|
| 112 | - jsAlert($_lang['login_processor_blocked1']); |
|
| 113 | - return; |
|
| 110 | + @session_destroy(); |
|
| 111 | + session_unset(); |
|
| 112 | + jsAlert($_lang['login_processor_blocked1']); |
|
| 113 | + return; |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | // blockuntil: this user has a block until date |
| 117 | 117 | if($blockeduntildate > time()) { |
| 118 | - @session_destroy(); |
|
| 119 | - session_unset(); |
|
| 120 | - jsAlert($_lang['login_processor_blocked2']); |
|
| 121 | - return; |
|
| 118 | + @session_destroy(); |
|
| 119 | + session_unset(); |
|
| 120 | + jsAlert($_lang['login_processor_blocked2']); |
|
| 121 | + return; |
|
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | // blockafter: this user has a block after date |
| 125 | 125 | if($blockedafterdate > 0 && $blockedafterdate < time()) { |
| 126 | - @session_destroy(); |
|
| 127 | - session_unset(); |
|
| 128 | - jsAlert($_lang['login_processor_blocked3']); |
|
| 129 | - return; |
|
| 126 | + @session_destroy(); |
|
| 127 | + session_unset(); |
|
| 128 | + jsAlert($_lang['login_processor_blocked3']); |
|
| 129 | + return; |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | // allowed ip |
| 133 | 133 | if($allowed_ip) { |
| 134 | - if(($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) { |
|
| 135 | - if(gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) { |
|
| 136 | - jsAlert($_lang['login_processor_remotehost_ip']); |
|
| 137 | - return; |
|
| 138 | - } |
|
| 139 | - } |
|
| 140 | - if(!in_array($_SERVER['REMOTE_ADDR'], array_filter(array_map('trim', explode(',', $allowed_ip))))) { |
|
| 141 | - jsAlert($_lang['login_processor_remote_ip']); |
|
| 142 | - return; |
|
| 143 | - } |
|
| 134 | + if(($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) { |
|
| 135 | + if(gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) { |
|
| 136 | + jsAlert($_lang['login_processor_remotehost_ip']); |
|
| 137 | + return; |
|
| 138 | + } |
|
| 139 | + } |
|
| 140 | + if(!in_array($_SERVER['REMOTE_ADDR'], array_filter(array_map('trim', explode(',', $allowed_ip))))) { |
|
| 141 | + jsAlert($_lang['login_processor_remote_ip']); |
|
| 142 | + return; |
|
| 143 | + } |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | // allowed days |
| 147 | 147 | if($allowed_days) { |
| 148 | - $date = getdate(); |
|
| 149 | - $day = $date['wday'] + 1; |
|
| 150 | - if(strpos($allowed_days, $day) === false) { |
|
| 151 | - jsAlert($_lang['login_processor_date']); |
|
| 152 | - return; |
|
| 153 | - } |
|
| 148 | + $date = getdate(); |
|
| 149 | + $day = $date['wday'] + 1; |
|
| 150 | + if(strpos($allowed_days, $day) === false) { |
|
| 151 | + jsAlert($_lang['login_processor_date']); |
|
| 152 | + return; |
|
| 153 | + } |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | // invoke OnManagerAuthentication event |
| 157 | 157 | $rt = $modx->invokeEvent('OnManagerAuthentication', array( |
| 158 | - 'userid' => $internalKey, |
|
| 159 | - 'username' => $username, |
|
| 160 | - 'userpassword' => $givenPassword, |
|
| 161 | - 'savedpassword' => $dbasePassword, |
|
| 162 | - 'rememberme' => $rememberme |
|
| 163 | - )); |
|
| 158 | + 'userid' => $internalKey, |
|
| 159 | + 'username' => $username, |
|
| 160 | + 'userpassword' => $givenPassword, |
|
| 161 | + 'savedpassword' => $dbasePassword, |
|
| 162 | + 'rememberme' => $rememberme |
|
| 163 | + )); |
|
| 164 | 164 | |
| 165 | 165 | // check if plugin authenticated the user |
| 166 | 166 | $matchPassword = false; |
| 167 | 167 | if(!isset($rt) || !$rt || (is_array($rt) && !in_array(true, $rt))) { |
| 168 | - // check user password - local authentication |
|
| 169 | - $hashType = $modx->manager->getHashType($dbasePassword); |
|
| 170 | - if($hashType == 'phpass') { |
|
| 171 | - $matchPassword = login($username, $_REQUEST['password'], $dbasePassword); |
|
| 172 | - } elseif($hashType == 'md5') { |
|
| 173 | - $matchPassword = loginMD5($internalKey, $_REQUEST['password'], $dbasePassword, $username); |
|
| 174 | - } elseif($hashType == 'v1') { |
|
| 175 | - $matchPassword = loginV1($internalKey, $_REQUEST['password'], $dbasePassword, $username); |
|
| 176 | - } else { |
|
| 177 | - $matchPassword = false; |
|
| 178 | - } |
|
| 168 | + // check user password - local authentication |
|
| 169 | + $hashType = $modx->manager->getHashType($dbasePassword); |
|
| 170 | + if($hashType == 'phpass') { |
|
| 171 | + $matchPassword = login($username, $_REQUEST['password'], $dbasePassword); |
|
| 172 | + } elseif($hashType == 'md5') { |
|
| 173 | + $matchPassword = loginMD5($internalKey, $_REQUEST['password'], $dbasePassword, $username); |
|
| 174 | + } elseif($hashType == 'v1') { |
|
| 175 | + $matchPassword = loginV1($internalKey, $_REQUEST['password'], $dbasePassword, $username); |
|
| 176 | + } else { |
|
| 177 | + $matchPassword = false; |
|
| 178 | + } |
|
| 179 | 179 | } else if($rt === true || (is_array($rt) && in_array(true, $rt))) { |
| 180 | - $matchPassword = true; |
|
| 180 | + $matchPassword = true; |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | if(!$matchPassword) { |
| 184 | - jsAlert($_lang['login_processor_wrong_password']); |
|
| 185 | - incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes); |
|
| 186 | - return; |
|
| 184 | + jsAlert($_lang['login_processor_wrong_password']); |
|
| 185 | + incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes); |
|
| 186 | + return; |
|
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | if($modx->config['use_captcha'] == 1) { |
| 190 | - if(!isset ($_SESSION['veriword'])) { |
|
| 191 | - jsAlert($_lang['login_processor_captcha_config']); |
|
| 192 | - return; |
|
| 193 | - } elseif($_SESSION['veriword'] != $captcha_code) { |
|
| 194 | - jsAlert($_lang['login_processor_bad_code']); |
|
| 195 | - incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes); |
|
| 196 | - return; |
|
| 197 | - } |
|
| 190 | + if(!isset ($_SESSION['veriword'])) { |
|
| 191 | + jsAlert($_lang['login_processor_captcha_config']); |
|
| 192 | + return; |
|
| 193 | + } elseif($_SESSION['veriword'] != $captcha_code) { |
|
| 194 | + jsAlert($_lang['login_processor_bad_code']); |
|
| 195 | + incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes); |
|
| 196 | + return; |
|
| 197 | + } |
|
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | $modx->cleanupExpiredLocks(); |
@@ -229,36 +229,36 @@ discard block |
||
| 229 | 229 | $_SESSION['mgrToken'] = md5($currentsessionid); |
| 230 | 230 | |
| 231 | 231 | if($rememberme == '1') { |
| 232 | - $_SESSION['modx.mgr.session.cookie.lifetime'] = (int)$modx->config['session.cookie.lifetime']; |
|
| 233 | - |
|
| 234 | - // Set a cookie separate from the session cookie with the username in it. |
|
| 235 | - // Are we using secure connection? If so, make sure the cookie is secure |
|
| 236 | - global $https_port; |
|
| 237 | - |
|
| 238 | - $secure = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port); |
|
| 239 | - if(version_compare(PHP_VERSION, '5.2', '<')) { |
|
| 240 | - setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, '; HttpOnly', $secure); |
|
| 241 | - } else { |
|
| 242 | - setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, NULL, $secure, true); |
|
| 243 | - } |
|
| 232 | + $_SESSION['modx.mgr.session.cookie.lifetime'] = (int)$modx->config['session.cookie.lifetime']; |
|
| 233 | + |
|
| 234 | + // Set a cookie separate from the session cookie with the username in it. |
|
| 235 | + // Are we using secure connection? If so, make sure the cookie is secure |
|
| 236 | + global $https_port; |
|
| 237 | + |
|
| 238 | + $secure = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port); |
|
| 239 | + if(version_compare(PHP_VERSION, '5.2', '<')) { |
|
| 240 | + setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, '; HttpOnly', $secure); |
|
| 241 | + } else { |
|
| 242 | + setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, NULL, $secure, true); |
|
| 243 | + } |
|
| 244 | 244 | } else { |
| 245 | - $_SESSION['modx.mgr.session.cookie.lifetime'] = 0; |
|
| 245 | + $_SESSION['modx.mgr.session.cookie.lifetime'] = 0; |
|
| 246 | 246 | |
| 247 | - // Remove the Remember Me cookie |
|
| 248 | - setcookie('modx_remember_manager', '', time() - 3600, MODX_BASE_URL); |
|
| 247 | + // Remove the Remember Me cookie |
|
| 248 | + setcookie('modx_remember_manager', '', time() - 3600, MODX_BASE_URL); |
|
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | // Check if user already has an active session, if not check if user pressed logout end of last session |
| 252 | 252 | $rs = $modx->db->select('lasthit', $modx->getFullTableName('active_user_sessions'), "internalKey='{$internalKey}'"); |
| 253 | 253 | $activeSession = $modx->db->getValue($rs); |
| 254 | 254 | if(!$activeSession) { |
| 255 | - $rs = $modx->db->select('lasthit', $modx->getFullTableName('active_users'), "internalKey='{$internalKey}' AND action != 8"); |
|
| 256 | - if($lastHit = $modx->db->getValue($rs)) { |
|
| 257 | - $_SESSION['show_logout_reminder'] = array( |
|
| 258 | - 'type' => 'logout_reminder', |
|
| 259 | - 'lastHit' => $lastHit |
|
| 260 | - ); |
|
| 261 | - } |
|
| 255 | + $rs = $modx->db->select('lasthit', $modx->getFullTableName('active_users'), "internalKey='{$internalKey}' AND action != 8"); |
|
| 256 | + if($lastHit = $modx->db->getValue($rs)) { |
|
| 257 | + $_SESSION['show_logout_reminder'] = array( |
|
| 258 | + 'type' => 'logout_reminder', |
|
| 259 | + 'lastHit' => $lastHit |
|
| 260 | + ); |
|
| 261 | + } |
|
| 262 | 262 | } |
| 263 | 263 | |
| 264 | 264 | $log = new logHandler; |
@@ -266,29 +266,29 @@ discard block |
||
| 266 | 266 | |
| 267 | 267 | // invoke OnManagerLogin event |
| 268 | 268 | $modx->invokeEvent('OnManagerLogin', array( |
| 269 | - 'userid' => $internalKey, |
|
| 270 | - 'username' => $username, |
|
| 271 | - 'userpassword' => $givenPassword, |
|
| 272 | - 'rememberme' => $rememberme |
|
| 273 | - )); |
|
| 269 | + 'userid' => $internalKey, |
|
| 270 | + 'username' => $username, |
|
| 271 | + 'userpassword' => $givenPassword, |
|
| 272 | + 'rememberme' => $rememberme |
|
| 273 | + )); |
|
| 274 | 274 | |
| 275 | 275 | // check if we should redirect user to a web page |
| 276 | 276 | $rs = $modx->db->select('setting_value', '[+prefix+]user_settings', "user='{$internalKey}' AND setting_name='manager_login_startup'"); |
| 277 | 277 | $id = (int)$modx->db->getValue($rs); |
| 278 | 278 | if($id > 0) { |
| 279 | - $header = 'Location: ' . $modx->makeUrl($id, '', '', 'full'); |
|
| 280 | - if($_POST['ajax'] == 1) { |
|
| 281 | - echo $header; |
|
| 282 | - } else { |
|
| 283 | - header($header); |
|
| 284 | - } |
|
| 279 | + $header = 'Location: ' . $modx->makeUrl($id, '', '', 'full'); |
|
| 280 | + if($_POST['ajax'] == 1) { |
|
| 281 | + echo $header; |
|
| 282 | + } else { |
|
| 283 | + header($header); |
|
| 284 | + } |
|
| 285 | 285 | } else { |
| 286 | - $header = 'Location: ' . MODX_MANAGER_URL; |
|
| 287 | - if($_POST['ajax'] == 1) { |
|
| 288 | - echo $header; |
|
| 289 | - } else { |
|
| 290 | - header($header); |
|
| 291 | - } |
|
| 286 | + $header = 'Location: ' . MODX_MANAGER_URL; |
|
| 287 | + if($_POST['ajax'] == 1) { |
|
| 288 | + echo $header; |
|
| 289 | + } else { |
|
| 290 | + header($header); |
|
| 291 | + } |
|
| 292 | 292 | } |
| 293 | 293 | |
| 294 | 294 | /** |
@@ -297,12 +297,12 @@ discard block |
||
| 297 | 297 | * @param string $msg |
| 298 | 298 | */ |
| 299 | 299 | function jsAlert($msg) { |
| 300 | - $modx = evolutionCMS(); |
|
| 301 | - if($_POST['ajax'] != 1) { |
|
| 302 | - echo "<script>window.setTimeout(\"alert('" . addslashes($modx->db->escape($msg)) . "')\",10);history.go(-1)</script>"; |
|
| 303 | - } else { |
|
| 304 | - echo $msg . "\n"; |
|
| 305 | - } |
|
| 300 | + $modx = evolutionCMS(); |
|
| 301 | + if($_POST['ajax'] != 1) { |
|
| 302 | + echo "<script>window.setTimeout(\"alert('" . addslashes($modx->db->escape($msg)) . "')\",10);history.go(-1)</script>"; |
|
| 303 | + } else { |
|
| 304 | + echo $msg . "\n"; |
|
| 305 | + } |
|
| 306 | 306 | } |
| 307 | 307 | |
| 308 | 308 | /** |
@@ -312,8 +312,8 @@ discard block |
||
| 312 | 312 | * @return bool |
| 313 | 313 | */ |
| 314 | 314 | function login($username, $givenPassword, $dbasePassword) { |
| 315 | - $modx = evolutionCMS(); |
|
| 316 | - return $modx->phpass->CheckPassword($givenPassword, $dbasePassword); |
|
| 315 | + $modx = evolutionCMS(); |
|
| 316 | + return $modx->phpass->CheckPassword($givenPassword, $dbasePassword); |
|
| 317 | 317 | } |
| 318 | 318 | |
| 319 | 319 | /** |
@@ -324,26 +324,26 @@ discard block |
||
| 324 | 324 | * @return bool |
| 325 | 325 | */ |
| 326 | 326 | function loginV1($internalKey, $givenPassword, $dbasePassword, $username) { |
| 327 | - $modx = evolutionCMS(); |
|
| 327 | + $modx = evolutionCMS(); |
|
| 328 | 328 | |
| 329 | - $user_algo = $modx->manager->getV1UserHashAlgorithm($internalKey); |
|
| 329 | + $user_algo = $modx->manager->getV1UserHashAlgorithm($internalKey); |
|
| 330 | 330 | |
| 331 | - if(!isset($modx->config['pwd_hash_algo']) || empty($modx->config['pwd_hash_algo'])) { |
|
| 332 | - $modx->config['pwd_hash_algo'] = 'UNCRYPT'; |
|
| 333 | - } |
|
| 331 | + if(!isset($modx->config['pwd_hash_algo']) || empty($modx->config['pwd_hash_algo'])) { |
|
| 332 | + $modx->config['pwd_hash_algo'] = 'UNCRYPT'; |
|
| 333 | + } |
|
| 334 | 334 | |
| 335 | - if($user_algo !== $modx->config['pwd_hash_algo']) { |
|
| 336 | - $bk_pwd_hash_algo = $modx->config['pwd_hash_algo']; |
|
| 337 | - $modx->config['pwd_hash_algo'] = $user_algo; |
|
| 338 | - } |
|
| 335 | + if($user_algo !== $modx->config['pwd_hash_algo']) { |
|
| 336 | + $bk_pwd_hash_algo = $modx->config['pwd_hash_algo']; |
|
| 337 | + $modx->config['pwd_hash_algo'] = $user_algo; |
|
| 338 | + } |
|
| 339 | 339 | |
| 340 | - if($dbasePassword != $modx->manager->genV1Hash($givenPassword, $internalKey)) { |
|
| 341 | - return false; |
|
| 342 | - } |
|
| 340 | + if($dbasePassword != $modx->manager->genV1Hash($givenPassword, $internalKey)) { |
|
| 341 | + return false; |
|
| 342 | + } |
|
| 343 | 343 | |
| 344 | - updateNewHash($username, $givenPassword); |
|
| 344 | + updateNewHash($username, $givenPassword); |
|
| 345 | 345 | |
| 346 | - return true; |
|
| 346 | + return true; |
|
| 347 | 347 | } |
| 348 | 348 | |
| 349 | 349 | /** |
@@ -354,13 +354,13 @@ discard block |
||
| 354 | 354 | * @return bool |
| 355 | 355 | */ |
| 356 | 356 | function loginMD5($internalKey, $givenPassword, $dbasePassword, $username) { |
| 357 | - $modx = evolutionCMS(); |
|
| 357 | + $modx = evolutionCMS(); |
|
| 358 | 358 | |
| 359 | - if($dbasePassword != md5($givenPassword)) { |
|
| 360 | - return false; |
|
| 361 | - } |
|
| 362 | - updateNewHash($username, $givenPassword); |
|
| 363 | - return true; |
|
| 359 | + if($dbasePassword != md5($givenPassword)) { |
|
| 360 | + return false; |
|
| 361 | + } |
|
| 362 | + updateNewHash($username, $givenPassword); |
|
| 363 | + return true; |
|
| 364 | 364 | } |
| 365 | 365 | |
| 366 | 366 | /** |
@@ -368,11 +368,11 @@ discard block |
||
| 368 | 368 | * @param string $password |
| 369 | 369 | */ |
| 370 | 370 | function updateNewHash($username, $password) { |
| 371 | - $modx = evolutionCMS(); |
|
| 371 | + $modx = evolutionCMS(); |
|
| 372 | 372 | |
| 373 | - $field = array(); |
|
| 374 | - $field['password'] = $modx->phpass->HashPassword($password); |
|
| 375 | - $modx->db->update($field, '[+prefix+]manager_users', "username='{$username}'"); |
|
| 373 | + $field = array(); |
|
| 374 | + $field['password'] = $modx->phpass->HashPassword($password); |
|
| 375 | + $modx->db->update($field, '[+prefix+]manager_users', "username='{$username}'"); |
|
| 376 | 376 | } |
| 377 | 377 | |
| 378 | 378 | /** |
@@ -382,27 +382,27 @@ discard block |
||
| 382 | 382 | * @param int $blocked_minutes |
| 383 | 383 | */ |
| 384 | 384 | function incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes) { |
| 385 | - $modx = evolutionCMS(); |
|
| 386 | - |
|
| 387 | - $failedlogins += 1; |
|
| 388 | - |
|
| 389 | - $fields = array('failedlogincount' => $failedlogins); |
|
| 390 | - if($failedlogins >= $failed_allowed) //block user for too many fail attempts |
|
| 391 | - { |
|
| 392 | - $fields['blockeduntil'] = time() + ($blocked_minutes * 60); |
|
| 393 | - } |
|
| 394 | - |
|
| 395 | - $modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'"); |
|
| 396 | - |
|
| 397 | - if($failedlogins < $failed_allowed) { |
|
| 398 | - //sleep to help prevent brute force attacks |
|
| 399 | - $sleep = (int) $failedlogins / 2; |
|
| 400 | - if($sleep > 5) { |
|
| 401 | - $sleep = 5; |
|
| 402 | - } |
|
| 403 | - sleep($sleep); |
|
| 404 | - } |
|
| 405 | - @session_destroy(); |
|
| 406 | - session_unset(); |
|
| 407 | - return; |
|
| 385 | + $modx = evolutionCMS(); |
|
| 386 | + |
|
| 387 | + $failedlogins += 1; |
|
| 388 | + |
|
| 389 | + $fields = array('failedlogincount' => $failedlogins); |
|
| 390 | + if($failedlogins >= $failed_allowed) //block user for too many fail attempts |
|
| 391 | + { |
|
| 392 | + $fields['blockeduntil'] = time() + ($blocked_minutes * 60); |
|
| 393 | + } |
|
| 394 | + |
|
| 395 | + $modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'"); |
|
| 396 | + |
|
| 397 | + if($failedlogins < $failed_allowed) { |
|
| 398 | + //sleep to help prevent brute force attacks |
|
| 399 | + $sleep = (int) $failedlogins / 2; |
|
| 400 | + if($sleep > 5) { |
|
| 401 | + $sleep = 5; |
|
| 402 | + } |
|
| 403 | + sleep($sleep); |
|
| 404 | + } |
|
| 405 | + @session_destroy(); |
|
| 406 | + session_unset(); |
|
| 407 | + return; |
|
| 408 | 408 | } |
@@ -1,9 +1,9 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
| 3 | - die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
|
| 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 | if(!$modx->hasPermission('save_user')) { |
| 6 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 6 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 7 | 7 | } |
| 8 | 8 | |
| 9 | 9 | $modx->loadExtension('phpass'); |
@@ -45,134 +45,134 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | // verify password |
| 47 | 47 | if($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) { |
| 48 | - webAlertAndQuit("Password typed is mismatched"); |
|
| 48 | + webAlertAndQuit("Password typed is mismatched"); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | // verify email |
| 52 | 52 | if($email == '' || !preg_match("/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i", $email)) { |
| 53 | - webAlertAndQuit("E-mail address doesn't seem to be valid!"); |
|
| 53 | + webAlertAndQuit("E-mail address doesn't seem to be valid!"); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | // verify admin security |
| 57 | 57 | if($_SESSION['mgrRole'] != 1) { |
| 58 | - // Check to see if user tried to spoof a "1" (admin) role |
|
| 59 | - if(!$modx->hasPermission('save_role')) { |
|
| 60 | - webAlertAndQuit("Illegal attempt to create/modify administrator by non-administrator!"); |
|
| 61 | - } |
|
| 62 | - // Verify that the user being edited wasn't an admin and the user ID got spoofed |
|
| 63 | - $rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, "internalKey='{$id}' AND role=1"); |
|
| 64 | - $limit = $modx->db->getValue($rs); |
|
| 65 | - if($limit > 0) { |
|
| 66 | - webAlertAndQuit("You cannot alter an administrative user."); |
|
| 67 | - } |
|
| 58 | + // Check to see if user tried to spoof a "1" (admin) role |
|
| 59 | + if(!$modx->hasPermission('save_role')) { |
|
| 60 | + webAlertAndQuit("Illegal attempt to create/modify administrator by non-administrator!"); |
|
| 61 | + } |
|
| 62 | + // Verify that the user being edited wasn't an admin and the user ID got spoofed |
|
| 63 | + $rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, "internalKey='{$id}' AND role=1"); |
|
| 64 | + $limit = $modx->db->getValue($rs); |
|
| 65 | + if($limit > 0) { |
|
| 66 | + webAlertAndQuit("You cannot alter an administrative user."); |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | switch($input['mode']) { |
| 72 | - case '11' : // new user |
|
| 73 | - // check if this user name already exist |
|
| 74 | - $rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s'", $modx->db->escape($newusername))); |
|
| 75 | - $limit = $modx->db->getValue($rs); |
|
| 76 | - if($limit > 0) { |
|
| 77 | - webAlertAndQuit("User name is already in use!"); |
|
| 78 | - } |
|
| 79 | - |
|
| 80 | - // check if the email address already exist |
|
| 81 | - $rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND id!='%s'", $modx->db->escape($email), $id)); |
|
| 82 | - $limit = $modx->db->getValue($rs); |
|
| 83 | - if($limit > 0) { |
|
| 84 | - webAlertAndQuit("Email is already in use!"); |
|
| 85 | - } |
|
| 86 | - |
|
| 87 | - // generate a new password for this user |
|
| 88 | - if($specifiedpassword != "" && $passwordgenmethod == "spec") { |
|
| 89 | - if(strlen($specifiedpassword) < 6) { |
|
| 90 | - webAlertAndQuit("Password is too short!"); |
|
| 91 | - } else { |
|
| 92 | - $newpassword = $specifiedpassword; |
|
| 93 | - } |
|
| 94 | - } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") { |
|
| 95 | - webAlertAndQuit("You didn't specify a password for this user!"); |
|
| 96 | - } elseif($passwordgenmethod == 'g') { |
|
| 97 | - $newpassword = generate_password(8); |
|
| 98 | - } else { |
|
| 99 | - webAlertAndQuit("No password generation method specified!"); |
|
| 100 | - } |
|
| 101 | - |
|
| 102 | - // invoke OnBeforeUserFormSave event |
|
| 103 | - $modx->invokeEvent("OnBeforeUserFormSave", array( |
|
| 104 | - "mode" => "new", |
|
| 105 | - )); |
|
| 106 | - |
|
| 107 | - // create the user account |
|
| 108 | - $internalKey = $modx->db->insert(array('username' => $modx->db->escape($newusername)), $tbl_manager_users); |
|
| 109 | - |
|
| 110 | - $field = array(); |
|
| 111 | - $field['password'] = $modx->phpass->HashPassword($newpassword); |
|
| 112 | - $modx->db->update($field, $tbl_manager_users, "id='{$internalKey}'"); |
|
| 113 | - |
|
| 114 | - $field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter'); |
|
| 115 | - $field = $modx->db->escape($field); |
|
| 116 | - $modx->db->insert($field, $tbl_user_attributes); |
|
| 117 | - |
|
| 118 | - // Save user settings |
|
| 119 | - saveUserSettings($internalKey); |
|
| 120 | - |
|
| 121 | - // invoke OnManagerSaveUser event |
|
| 122 | - $modx->invokeEvent("OnManagerSaveUser", array( |
|
| 123 | - "mode" => "new", |
|
| 124 | - "userid" => $internalKey, |
|
| 125 | - "username" => $newusername, |
|
| 126 | - "userpassword" => $newpassword, |
|
| 127 | - "useremail" => $email, |
|
| 128 | - "userfullname" => $fullname, |
|
| 129 | - "userroleid" => $role |
|
| 130 | - )); |
|
| 131 | - |
|
| 132 | - // invoke OnUserFormSave event |
|
| 133 | - $modx->invokeEvent("OnUserFormSave", array( |
|
| 134 | - "mode" => "new", |
|
| 135 | - "id" => $internalKey |
|
| 136 | - )); |
|
| 137 | - |
|
| 138 | - // Set the item name for logger |
|
| 139 | - $_SESSION['itemname'] = $newusername; |
|
| 140 | - |
|
| 141 | - /*******************************************************************************/ |
|
| 142 | - // put the user in the user_groups he/ she should be in |
|
| 143 | - // first, check that up_perms are switched on! |
|
| 144 | - if($use_udperms == 1) { |
|
| 145 | - if(!empty($user_groups)) { |
|
| 146 | - for($i = 0; $i < count($user_groups); $i++) { |
|
| 147 | - $f = array(); |
|
| 148 | - $f['user_group'] = (int)$user_groups[$i]; |
|
| 149 | - $f['member'] = $internalKey; |
|
| 150 | - $modx->db->insert($f, $tbl_member_groups); |
|
| 151 | - } |
|
| 152 | - } |
|
| 153 | - } |
|
| 154 | - // end of user_groups stuff! |
|
| 155 | - |
|
| 156 | - if($passwordnotifymethod == 'e') { |
|
| 157 | - sendMailMessage($email, $newusername, $newpassword, $fullname); |
|
| 158 | - if($input['stay'] != '') { |
|
| 159 | - $a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11"; |
|
| 160 | - $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
| 161 | - header($header); |
|
| 162 | - } else { |
|
| 163 | - $header = "Location: index.php?a=75&r=2"; |
|
| 164 | - header($header); |
|
| 165 | - } |
|
| 166 | - } else { |
|
| 167 | - if($input['stay'] != '') { |
|
| 168 | - $a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11"; |
|
| 169 | - $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
| 170 | - } else { |
|
| 171 | - $stayUrl = "index.php?a=75&r=2"; |
|
| 172 | - } |
|
| 173 | - |
|
| 174 | - include_once "header.inc.php"; |
|
| 175 | - ?> |
|
| 72 | + case '11' : // new user |
|
| 73 | + // check if this user name already exist |
|
| 74 | + $rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s'", $modx->db->escape($newusername))); |
|
| 75 | + $limit = $modx->db->getValue($rs); |
|
| 76 | + if($limit > 0) { |
|
| 77 | + webAlertAndQuit("User name is already in use!"); |
|
| 78 | + } |
|
| 79 | + |
|
| 80 | + // check if the email address already exist |
|
| 81 | + $rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND id!='%s'", $modx->db->escape($email), $id)); |
|
| 82 | + $limit = $modx->db->getValue($rs); |
|
| 83 | + if($limit > 0) { |
|
| 84 | + webAlertAndQuit("Email is already in use!"); |
|
| 85 | + } |
|
| 86 | + |
|
| 87 | + // generate a new password for this user |
|
| 88 | + if($specifiedpassword != "" && $passwordgenmethod == "spec") { |
|
| 89 | + if(strlen($specifiedpassword) < 6) { |
|
| 90 | + webAlertAndQuit("Password is too short!"); |
|
| 91 | + } else { |
|
| 92 | + $newpassword = $specifiedpassword; |
|
| 93 | + } |
|
| 94 | + } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") { |
|
| 95 | + webAlertAndQuit("You didn't specify a password for this user!"); |
|
| 96 | + } elseif($passwordgenmethod == 'g') { |
|
| 97 | + $newpassword = generate_password(8); |
|
| 98 | + } else { |
|
| 99 | + webAlertAndQuit("No password generation method specified!"); |
|
| 100 | + } |
|
| 101 | + |
|
| 102 | + // invoke OnBeforeUserFormSave event |
|
| 103 | + $modx->invokeEvent("OnBeforeUserFormSave", array( |
|
| 104 | + "mode" => "new", |
|
| 105 | + )); |
|
| 106 | + |
|
| 107 | + // create the user account |
|
| 108 | + $internalKey = $modx->db->insert(array('username' => $modx->db->escape($newusername)), $tbl_manager_users); |
|
| 109 | + |
|
| 110 | + $field = array(); |
|
| 111 | + $field['password'] = $modx->phpass->HashPassword($newpassword); |
|
| 112 | + $modx->db->update($field, $tbl_manager_users, "id='{$internalKey}'"); |
|
| 113 | + |
|
| 114 | + $field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter'); |
|
| 115 | + $field = $modx->db->escape($field); |
|
| 116 | + $modx->db->insert($field, $tbl_user_attributes); |
|
| 117 | + |
|
| 118 | + // Save user settings |
|
| 119 | + saveUserSettings($internalKey); |
|
| 120 | + |
|
| 121 | + // invoke OnManagerSaveUser event |
|
| 122 | + $modx->invokeEvent("OnManagerSaveUser", array( |
|
| 123 | + "mode" => "new", |
|
| 124 | + "userid" => $internalKey, |
|
| 125 | + "username" => $newusername, |
|
| 126 | + "userpassword" => $newpassword, |
|
| 127 | + "useremail" => $email, |
|
| 128 | + "userfullname" => $fullname, |
|
| 129 | + "userroleid" => $role |
|
| 130 | + )); |
|
| 131 | + |
|
| 132 | + // invoke OnUserFormSave event |
|
| 133 | + $modx->invokeEvent("OnUserFormSave", array( |
|
| 134 | + "mode" => "new", |
|
| 135 | + "id" => $internalKey |
|
| 136 | + )); |
|
| 137 | + |
|
| 138 | + // Set the item name for logger |
|
| 139 | + $_SESSION['itemname'] = $newusername; |
|
| 140 | + |
|
| 141 | + /*******************************************************************************/ |
|
| 142 | + // put the user in the user_groups he/ she should be in |
|
| 143 | + // first, check that up_perms are switched on! |
|
| 144 | + if($use_udperms == 1) { |
|
| 145 | + if(!empty($user_groups)) { |
|
| 146 | + for($i = 0; $i < count($user_groups); $i++) { |
|
| 147 | + $f = array(); |
|
| 148 | + $f['user_group'] = (int)$user_groups[$i]; |
|
| 149 | + $f['member'] = $internalKey; |
|
| 150 | + $modx->db->insert($f, $tbl_member_groups); |
|
| 151 | + } |
|
| 152 | + } |
|
| 153 | + } |
|
| 154 | + // end of user_groups stuff! |
|
| 155 | + |
|
| 156 | + if($passwordnotifymethod == 'e') { |
|
| 157 | + sendMailMessage($email, $newusername, $newpassword, $fullname); |
|
| 158 | + if($input['stay'] != '') { |
|
| 159 | + $a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11"; |
|
| 160 | + $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
| 161 | + header($header); |
|
| 162 | + } else { |
|
| 163 | + $header = "Location: index.php?a=75&r=2"; |
|
| 164 | + header($header); |
|
| 165 | + } |
|
| 166 | + } else { |
|
| 167 | + if($input['stay'] != '') { |
|
| 168 | + $a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11"; |
|
| 169 | + $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
| 170 | + } else { |
|
| 171 | + $stayUrl = "index.php?a=75&r=2"; |
|
| 172 | + } |
|
| 173 | + |
|
| 174 | + include_once "header.inc.php"; |
|
| 175 | + ?> |
|
| 176 | 176 | |
| 177 | 177 | <h1><?php echo $_lang['user_title']; ?></h1> |
| 178 | 178 | |
@@ -194,125 +194,125 @@ discard block |
||
| 194 | 194 | </div> |
| 195 | 195 | <?php |
| 196 | 196 | |
| 197 | - include_once "footer.inc.php"; |
|
| 198 | - } |
|
| 199 | - break; |
|
| 200 | - case '12' : // edit user |
|
| 201 | - // generate a new password for this user |
|
| 202 | - if($genpassword == 1) { |
|
| 203 | - if($specifiedpassword != "" && $passwordgenmethod == "spec") { |
|
| 204 | - if(strlen($specifiedpassword) < 6) { |
|
| 205 | - webAlertAndQuit("Password is too short!"); |
|
| 206 | - } else { |
|
| 207 | - $newpassword = $specifiedpassword; |
|
| 208 | - } |
|
| 209 | - } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") { |
|
| 210 | - webAlertAndQuit("You didn't specify a password for this user!"); |
|
| 211 | - } elseif($passwordgenmethod == 'g') { |
|
| 212 | - $newpassword = generate_password(8); |
|
| 213 | - } else { |
|
| 214 | - webAlertAndQuit("No password generation method specified!"); |
|
| 215 | - } |
|
| 216 | - } |
|
| 217 | - if($passwordnotifymethod == 'e') { |
|
| 218 | - sendMailMessage($email, $newusername, $newpassword, $fullname); |
|
| 219 | - } |
|
| 220 | - |
|
| 221 | - // check if the username already exist |
|
| 222 | - $rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s' AND id!='%s'", $modx->db->escape($newusername), $id)); |
|
| 223 | - $limit = $modx->db->getValue($rs); |
|
| 224 | - if($limit > 0) { |
|
| 225 | - webAlertAndQuit("User name is already in use!"); |
|
| 226 | - } |
|
| 227 | - |
|
| 228 | - // check if the email address already exists |
|
| 229 | - $rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND internalKey!='%s'", $modx->db->escape($email), $id)); |
|
| 230 | - $limit = $modx->db->getValue($rs); |
|
| 231 | - if($limit > 0) { |
|
| 232 | - webAlertAndQuit("Email is already in use!"); |
|
| 233 | - } |
|
| 234 | - |
|
| 235 | - // invoke OnBeforeUserFormSave event |
|
| 236 | - $modx->invokeEvent("OnBeforeUserFormSave", array( |
|
| 237 | - "mode" => "upd", |
|
| 238 | - "id" => $id |
|
| 239 | - )); |
|
| 240 | - |
|
| 241 | - // update user name and password |
|
| 242 | - $field = array(); |
|
| 243 | - $field['username'] = $modx->db->escape($newusername); |
|
| 244 | - if($genpassword == 1) { |
|
| 245 | - $field['password'] = $modx->phpass->HashPassword($newpassword); |
|
| 246 | - } |
|
| 247 | - $modx->db->update($field, $tbl_manager_users, "id='{$id}'"); |
|
| 248 | - $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter'); |
|
| 249 | - $field = $modx->db->escape($field); |
|
| 250 | - $modx->db->update($field, $tbl_user_attributes, "internalKey='{$id}'"); |
|
| 251 | - |
|
| 252 | - // Save user settings |
|
| 253 | - saveUserSettings($id); |
|
| 254 | - |
|
| 255 | - // Set the item name for logger |
|
| 256 | - $_SESSION['itemname'] = $newusername; |
|
| 257 | - |
|
| 258 | - // invoke OnManagerSaveUser event |
|
| 259 | - $modx->invokeEvent("OnManagerSaveUser", array( |
|
| 260 | - "mode" => "upd", |
|
| 261 | - "userid" => $id, |
|
| 262 | - "username" => $newusername, |
|
| 263 | - "userpassword" => $newpassword, |
|
| 264 | - "useremail" => $email, |
|
| 265 | - "userfullname" => $fullname, |
|
| 266 | - "userroleid" => $role, |
|
| 267 | - "oldusername" => (($oldusername != $newusername) ? $oldusername : ""), |
|
| 268 | - "olduseremail" => (($oldemail != $email) ? $oldemail : "") |
|
| 269 | - )); |
|
| 270 | - |
|
| 271 | - // invoke OnManagerChangePassword event |
|
| 272 | - if($genpassword == 1) { |
|
| 273 | - $modx->invokeEvent("OnManagerChangePassword", array( |
|
| 274 | - "userid" => $id, |
|
| 275 | - "username" => $newusername, |
|
| 276 | - "userpassword" => $newpassword |
|
| 277 | - )); |
|
| 278 | - } |
|
| 279 | - |
|
| 280 | - // invoke OnUserFormSave event |
|
| 281 | - $modx->invokeEvent("OnUserFormSave", array( |
|
| 282 | - "mode" => "upd", |
|
| 283 | - "id" => $id |
|
| 284 | - )); |
|
| 285 | - |
|
| 286 | - /*******************************************************************************/ |
|
| 287 | - // put the user in the user_groups he/ she should be in |
|
| 288 | - // first, check that up_perms are switched on! |
|
| 289 | - if($use_udperms == 1) { |
|
| 290 | - // as this is an existing user, delete his/ her entries in the groups before saving the new groups |
|
| 291 | - $modx->db->delete($tbl_member_groups, "member='{$id}'"); |
|
| 292 | - if(!empty($user_groups)) { |
|
| 293 | - for($i = 0; $i < count($user_groups); $i++) { |
|
| 294 | - $field = array(); |
|
| 295 | - $field['user_group'] = (int)$user_groups[$i]; |
|
| 296 | - $field['member'] = $id; |
|
| 297 | - $modx->db->insert($field, $tbl_member_groups); |
|
| 298 | - } |
|
| 299 | - } |
|
| 300 | - } |
|
| 301 | - // end of user_groups stuff! |
|
| 302 | - /*******************************************************************************/ |
|
| 303 | - if($id == $modx->getLoginUserID() && ($genpassword !== 1 && $passwordnotifymethod != 's')) { |
|
| 304 | - $modx->webAlertAndQuit($_lang["user_changeddata"], 'javascript:top.location.href="index.php?a=8";'); |
|
| 305 | - } |
|
| 306 | - if($genpassword == 1 && $passwordnotifymethod == 's') { |
|
| 307 | - if($input['stay'] != '') { |
|
| 308 | - $a = ($input['stay'] == '2') ? "12&id={$id}" : "11"; |
|
| 309 | - $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
| 310 | - } else { |
|
| 311 | - $stayUrl = "index.php?a=75&r=2"; |
|
| 312 | - } |
|
| 313 | - |
|
| 314 | - include_once "header.inc.php"; |
|
| 315 | - ?> |
|
| 197 | + include_once "footer.inc.php"; |
|
| 198 | + } |
|
| 199 | + break; |
|
| 200 | + case '12' : // edit user |
|
| 201 | + // generate a new password for this user |
|
| 202 | + if($genpassword == 1) { |
|
| 203 | + if($specifiedpassword != "" && $passwordgenmethod == "spec") { |
|
| 204 | + if(strlen($specifiedpassword) < 6) { |
|
| 205 | + webAlertAndQuit("Password is too short!"); |
|
| 206 | + } else { |
|
| 207 | + $newpassword = $specifiedpassword; |
|
| 208 | + } |
|
| 209 | + } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") { |
|
| 210 | + webAlertAndQuit("You didn't specify a password for this user!"); |
|
| 211 | + } elseif($passwordgenmethod == 'g') { |
|
| 212 | + $newpassword = generate_password(8); |
|
| 213 | + } else { |
|
| 214 | + webAlertAndQuit("No password generation method specified!"); |
|
| 215 | + } |
|
| 216 | + } |
|
| 217 | + if($passwordnotifymethod == 'e') { |
|
| 218 | + sendMailMessage($email, $newusername, $newpassword, $fullname); |
|
| 219 | + } |
|
| 220 | + |
|
| 221 | + // check if the username already exist |
|
| 222 | + $rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s' AND id!='%s'", $modx->db->escape($newusername), $id)); |
|
| 223 | + $limit = $modx->db->getValue($rs); |
|
| 224 | + if($limit > 0) { |
|
| 225 | + webAlertAndQuit("User name is already in use!"); |
|
| 226 | + } |
|
| 227 | + |
|
| 228 | + // check if the email address already exists |
|
| 229 | + $rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND internalKey!='%s'", $modx->db->escape($email), $id)); |
|
| 230 | + $limit = $modx->db->getValue($rs); |
|
| 231 | + if($limit > 0) { |
|
| 232 | + webAlertAndQuit("Email is already in use!"); |
|
| 233 | + } |
|
| 234 | + |
|
| 235 | + // invoke OnBeforeUserFormSave event |
|
| 236 | + $modx->invokeEvent("OnBeforeUserFormSave", array( |
|
| 237 | + "mode" => "upd", |
|
| 238 | + "id" => $id |
|
| 239 | + )); |
|
| 240 | + |
|
| 241 | + // update user name and password |
|
| 242 | + $field = array(); |
|
| 243 | + $field['username'] = $modx->db->escape($newusername); |
|
| 244 | + if($genpassword == 1) { |
|
| 245 | + $field['password'] = $modx->phpass->HashPassword($newpassword); |
|
| 246 | + } |
|
| 247 | + $modx->db->update($field, $tbl_manager_users, "id='{$id}'"); |
|
| 248 | + $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter'); |
|
| 249 | + $field = $modx->db->escape($field); |
|
| 250 | + $modx->db->update($field, $tbl_user_attributes, "internalKey='{$id}'"); |
|
| 251 | + |
|
| 252 | + // Save user settings |
|
| 253 | + saveUserSettings($id); |
|
| 254 | + |
|
| 255 | + // Set the item name for logger |
|
| 256 | + $_SESSION['itemname'] = $newusername; |
|
| 257 | + |
|
| 258 | + // invoke OnManagerSaveUser event |
|
| 259 | + $modx->invokeEvent("OnManagerSaveUser", array( |
|
| 260 | + "mode" => "upd", |
|
| 261 | + "userid" => $id, |
|
| 262 | + "username" => $newusername, |
|
| 263 | + "userpassword" => $newpassword, |
|
| 264 | + "useremail" => $email, |
|
| 265 | + "userfullname" => $fullname, |
|
| 266 | + "userroleid" => $role, |
|
| 267 | + "oldusername" => (($oldusername != $newusername) ? $oldusername : ""), |
|
| 268 | + "olduseremail" => (($oldemail != $email) ? $oldemail : "") |
|
| 269 | + )); |
|
| 270 | + |
|
| 271 | + // invoke OnManagerChangePassword event |
|
| 272 | + if($genpassword == 1) { |
|
| 273 | + $modx->invokeEvent("OnManagerChangePassword", array( |
|
| 274 | + "userid" => $id, |
|
| 275 | + "username" => $newusername, |
|
| 276 | + "userpassword" => $newpassword |
|
| 277 | + )); |
|
| 278 | + } |
|
| 279 | + |
|
| 280 | + // invoke OnUserFormSave event |
|
| 281 | + $modx->invokeEvent("OnUserFormSave", array( |
|
| 282 | + "mode" => "upd", |
|
| 283 | + "id" => $id |
|
| 284 | + )); |
|
| 285 | + |
|
| 286 | + /*******************************************************************************/ |
|
| 287 | + // put the user in the user_groups he/ she should be in |
|
| 288 | + // first, check that up_perms are switched on! |
|
| 289 | + if($use_udperms == 1) { |
|
| 290 | + // as this is an existing user, delete his/ her entries in the groups before saving the new groups |
|
| 291 | + $modx->db->delete($tbl_member_groups, "member='{$id}'"); |
|
| 292 | + if(!empty($user_groups)) { |
|
| 293 | + for($i = 0; $i < count($user_groups); $i++) { |
|
| 294 | + $field = array(); |
|
| 295 | + $field['user_group'] = (int)$user_groups[$i]; |
|
| 296 | + $field['member'] = $id; |
|
| 297 | + $modx->db->insert($field, $tbl_member_groups); |
|
| 298 | + } |
|
| 299 | + } |
|
| 300 | + } |
|
| 301 | + // end of user_groups stuff! |
|
| 302 | + /*******************************************************************************/ |
|
| 303 | + if($id == $modx->getLoginUserID() && ($genpassword !== 1 && $passwordnotifymethod != 's')) { |
|
| 304 | + $modx->webAlertAndQuit($_lang["user_changeddata"], 'javascript:top.location.href="index.php?a=8";'); |
|
| 305 | + } |
|
| 306 | + if($genpassword == 1 && $passwordnotifymethod == 's') { |
|
| 307 | + if($input['stay'] != '') { |
|
| 308 | + $a = ($input['stay'] == '2') ? "12&id={$id}" : "11"; |
|
| 309 | + $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
| 310 | + } else { |
|
| 311 | + $stayUrl = "index.php?a=75&r=2"; |
|
| 312 | + } |
|
| 313 | + |
|
| 314 | + include_once "header.inc.php"; |
|
| 315 | + ?> |
|
| 316 | 316 | |
| 317 | 317 | <h1><?php echo $_lang['user_title']; ?></h1> |
| 318 | 318 | |
@@ -332,20 +332,20 @@ discard block |
||
| 332 | 332 | </div> |
| 333 | 333 | <?php |
| 334 | 334 | |
| 335 | - include_once "footer.inc.php"; |
|
| 336 | - } else { |
|
| 337 | - if($input['stay'] != '') { |
|
| 338 | - $a = ($input['stay'] == '2') ? "12&id={$id}" : "11"; |
|
| 339 | - $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
| 340 | - header($header); |
|
| 341 | - } else { |
|
| 342 | - $header = "Location: index.php?a=75&r=2"; |
|
| 343 | - header($header); |
|
| 344 | - } |
|
| 345 | - } |
|
| 346 | - break; |
|
| 347 | - default: |
|
| 348 | - webAlertAndQuit("No operation set in request."); |
|
| 335 | + include_once "footer.inc.php"; |
|
| 336 | + } else { |
|
| 337 | + if($input['stay'] != '') { |
|
| 338 | + $a = ($input['stay'] == '2') ? "12&id={$id}" : "11"; |
|
| 339 | + $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay']; |
|
| 340 | + header($header); |
|
| 341 | + } else { |
|
| 342 | + $header = "Location: index.php?a=75&r=2"; |
|
| 343 | + header($header); |
|
| 344 | + } |
|
| 345 | + } |
|
| 346 | + break; |
|
| 347 | + default: |
|
| 348 | + webAlertAndQuit("No operation set in request."); |
|
| 349 | 349 | } |
| 350 | 350 | |
| 351 | 351 | /** |
@@ -357,31 +357,31 @@ discard block |
||
| 357 | 357 | * @param string $ufn |
| 358 | 358 | */ |
| 359 | 359 | function sendMailMessage($email, $uid, $pwd, $ufn) { |
| 360 | - $modx = evolutionCMS(); global $_lang, $signupemail_message; |
|
| 361 | - global $emailsubject, $emailsender; |
|
| 362 | - global $site_name; |
|
| 363 | - $manager_url = MODX_MANAGER_URL; |
|
| 364 | - $message = sprintf($signupemail_message, $uid, $pwd); // use old method |
|
| 365 | - // replace placeholders |
|
| 366 | - $message = str_replace("[+uid+]", $uid, $message); |
|
| 367 | - $message = str_replace("[+pwd+]", $pwd, $message); |
|
| 368 | - $message = str_replace("[+ufn+]", $ufn, $message); |
|
| 369 | - $message = str_replace("[+sname+]", $site_name, $message); |
|
| 370 | - $message = str_replace("[+saddr+]", $emailsender, $message); |
|
| 371 | - $message = str_replace("[+semail+]", $emailsender, $message); |
|
| 372 | - $message = str_replace("[+surl+]", $manager_url, $message); |
|
| 373 | - |
|
| 374 | - $param = array(); |
|
| 375 | - $param['from'] = "{$site_name}<{$emailsender}>"; |
|
| 376 | - $param['subject'] = $emailsubject; |
|
| 377 | - $param['body'] = $message; |
|
| 378 | - $param['to'] = $email; |
|
| 379 | - $param['type'] = 'text'; |
|
| 380 | - $rs = $modx->sendmail($param); |
|
| 381 | - if(!$rs) { |
|
| 382 | - $modx->manager->saveFormValues(); |
|
| 383 | - $modx->messageQuit("{$email} - {$_lang['error_sending_email']}"); |
|
| 384 | - } |
|
| 360 | + $modx = evolutionCMS(); global $_lang, $signupemail_message; |
|
| 361 | + global $emailsubject, $emailsender; |
|
| 362 | + global $site_name; |
|
| 363 | + $manager_url = MODX_MANAGER_URL; |
|
| 364 | + $message = sprintf($signupemail_message, $uid, $pwd); // use old method |
|
| 365 | + // replace placeholders |
|
| 366 | + $message = str_replace("[+uid+]", $uid, $message); |
|
| 367 | + $message = str_replace("[+pwd+]", $pwd, $message); |
|
| 368 | + $message = str_replace("[+ufn+]", $ufn, $message); |
|
| 369 | + $message = str_replace("[+sname+]", $site_name, $message); |
|
| 370 | + $message = str_replace("[+saddr+]", $emailsender, $message); |
|
| 371 | + $message = str_replace("[+semail+]", $emailsender, $message); |
|
| 372 | + $message = str_replace("[+surl+]", $manager_url, $message); |
|
| 373 | + |
|
| 374 | + $param = array(); |
|
| 375 | + $param['from'] = "{$site_name}<{$emailsender}>"; |
|
| 376 | + $param['subject'] = $emailsubject; |
|
| 377 | + $param['body'] = $message; |
|
| 378 | + $param['to'] = $email; |
|
| 379 | + $param['type'] = 'text'; |
|
| 380 | + $rs = $modx->sendmail($param); |
|
| 381 | + if(!$rs) { |
|
| 382 | + $modx->manager->saveFormValues(); |
|
| 383 | + $modx->messageQuit("{$email} - {$_lang['error_sending_email']}"); |
|
| 384 | + } |
|
| 385 | 385 | } |
| 386 | 386 | |
| 387 | 387 | /** |
@@ -390,86 +390,86 @@ discard block |
||
| 390 | 390 | * @param int $id |
| 391 | 391 | */ |
| 392 | 392 | function saveUserSettings($id) { |
| 393 | - $modx = evolutionCMS(); |
|
| 394 | - $tbl_user_settings = $modx->getFullTableName('user_settings'); |
|
| 395 | - |
|
| 396 | - $ignore = array( |
|
| 397 | - 'id', |
|
| 398 | - 'oldusername', |
|
| 399 | - 'oldemail', |
|
| 400 | - 'newusername', |
|
| 401 | - 'fullname', |
|
| 402 | - 'newpassword', |
|
| 403 | - 'newpasswordcheck', |
|
| 404 | - 'passwordgenmethod', |
|
| 405 | - 'passwordnotifymethod', |
|
| 406 | - 'specifiedpassword', |
|
| 407 | - 'confirmpassword', |
|
| 408 | - 'email', |
|
| 409 | - 'phone', |
|
| 410 | - 'mobilephone', |
|
| 411 | - 'fax', |
|
| 412 | - 'dob', |
|
| 413 | - 'country', |
|
| 414 | - 'street', |
|
| 415 | - 'city', |
|
| 416 | - 'state', |
|
| 417 | - 'zip', |
|
| 418 | - 'gender', |
|
| 419 | - 'photo', |
|
| 420 | - 'comment', |
|
| 421 | - 'role', |
|
| 422 | - 'failedlogincount', |
|
| 423 | - 'blocked', |
|
| 424 | - 'blockeduntil', |
|
| 425 | - 'blockedafter', |
|
| 426 | - 'user_groups', |
|
| 427 | - 'mode', |
|
| 428 | - 'blockedmode', |
|
| 429 | - 'stay', |
|
| 430 | - 'save', |
|
| 431 | - 'theme_refresher' |
|
| 432 | - ); |
|
| 433 | - |
|
| 434 | - // determine which settings can be saved blank (based on 'default_{settingname}' POST checkbox values) |
|
| 435 | - $defaults = array( |
|
| 436 | - 'upload_images', |
|
| 437 | - 'upload_media', |
|
| 438 | - 'upload_flash', |
|
| 439 | - 'upload_files' |
|
| 440 | - ); |
|
| 441 | - |
|
| 442 | - // get user setting field names |
|
| 443 | - $settings = array(); |
|
| 444 | - foreach($_POST as $n => $v) { |
|
| 445 | - if(in_array($n, $ignore) || (!in_array($n, $defaults) && is_scalar($v) && trim($v) == '') || (!in_array($n, $defaults) && is_array($v) && empty($v))) { |
|
| 446 | - continue; |
|
| 447 | - } // ignore blacklist and empties |
|
| 448 | - $settings[$n] = $v; // this value should be saved |
|
| 449 | - } |
|
| 450 | - |
|
| 451 | - foreach($defaults as $k) { |
|
| 452 | - if(isset($settings['default_' . $k]) && $settings['default_' . $k] == '1') { |
|
| 453 | - unset($settings[$k]); |
|
| 454 | - } |
|
| 455 | - unset($settings['default_' . $k]); |
|
| 456 | - } |
|
| 457 | - |
|
| 458 | - $modx->db->delete($tbl_user_settings, "user='{$id}'"); |
|
| 459 | - |
|
| 460 | - foreach($settings as $n => $vl) { |
|
| 461 | - if(is_array($vl)) { |
|
| 462 | - $vl = implode(",", $vl); |
|
| 463 | - } |
|
| 464 | - if($vl != '') { |
|
| 465 | - $f = array(); |
|
| 466 | - $f['user'] = $id; |
|
| 467 | - $f['setting_name'] = $n; |
|
| 468 | - $f['setting_value'] = $vl; |
|
| 469 | - $f = $modx->db->escape($f); |
|
| 470 | - $modx->db->insert($f, $tbl_user_settings); |
|
| 471 | - } |
|
| 472 | - } |
|
| 393 | + $modx = evolutionCMS(); |
|
| 394 | + $tbl_user_settings = $modx->getFullTableName('user_settings'); |
|
| 395 | + |
|
| 396 | + $ignore = array( |
|
| 397 | + 'id', |
|
| 398 | + 'oldusername', |
|
| 399 | + 'oldemail', |
|
| 400 | + 'newusername', |
|
| 401 | + 'fullname', |
|
| 402 | + 'newpassword', |
|
| 403 | + 'newpasswordcheck', |
|
| 404 | + 'passwordgenmethod', |
|
| 405 | + 'passwordnotifymethod', |
|
| 406 | + 'specifiedpassword', |
|
| 407 | + 'confirmpassword', |
|
| 408 | + 'email', |
|
| 409 | + 'phone', |
|
| 410 | + 'mobilephone', |
|
| 411 | + 'fax', |
|
| 412 | + 'dob', |
|
| 413 | + 'country', |
|
| 414 | + 'street', |
|
| 415 | + 'city', |
|
| 416 | + 'state', |
|
| 417 | + 'zip', |
|
| 418 | + 'gender', |
|
| 419 | + 'photo', |
|
| 420 | + 'comment', |
|
| 421 | + 'role', |
|
| 422 | + 'failedlogincount', |
|
| 423 | + 'blocked', |
|
| 424 | + 'blockeduntil', |
|
| 425 | + 'blockedafter', |
|
| 426 | + 'user_groups', |
|
| 427 | + 'mode', |
|
| 428 | + 'blockedmode', |
|
| 429 | + 'stay', |
|
| 430 | + 'save', |
|
| 431 | + 'theme_refresher' |
|
| 432 | + ); |
|
| 433 | + |
|
| 434 | + // determine which settings can be saved blank (based on 'default_{settingname}' POST checkbox values) |
|
| 435 | + $defaults = array( |
|
| 436 | + 'upload_images', |
|
| 437 | + 'upload_media', |
|
| 438 | + 'upload_flash', |
|
| 439 | + 'upload_files' |
|
| 440 | + ); |
|
| 441 | + |
|
| 442 | + // get user setting field names |
|
| 443 | + $settings = array(); |
|
| 444 | + foreach($_POST as $n => $v) { |
|
| 445 | + if(in_array($n, $ignore) || (!in_array($n, $defaults) && is_scalar($v) && trim($v) == '') || (!in_array($n, $defaults) && is_array($v) && empty($v))) { |
|
| 446 | + continue; |
|
| 447 | + } // ignore blacklist and empties |
|
| 448 | + $settings[$n] = $v; // this value should be saved |
|
| 449 | + } |
|
| 450 | + |
|
| 451 | + foreach($defaults as $k) { |
|
| 452 | + if(isset($settings['default_' . $k]) && $settings['default_' . $k] == '1') { |
|
| 453 | + unset($settings[$k]); |
|
| 454 | + } |
|
| 455 | + unset($settings['default_' . $k]); |
|
| 456 | + } |
|
| 457 | + |
|
| 458 | + $modx->db->delete($tbl_user_settings, "user='{$id}'"); |
|
| 459 | + |
|
| 460 | + foreach($settings as $n => $vl) { |
|
| 461 | + if(is_array($vl)) { |
|
| 462 | + $vl = implode(",", $vl); |
|
| 463 | + } |
|
| 464 | + if($vl != '') { |
|
| 465 | + $f = array(); |
|
| 466 | + $f['user'] = $id; |
|
| 467 | + $f['setting_name'] = $n; |
|
| 468 | + $f['setting_value'] = $vl; |
|
| 469 | + $f = $modx->db->escape($f); |
|
| 470 | + $modx->db->insert($f, $tbl_user_settings); |
|
| 471 | + } |
|
| 472 | + } |
|
| 473 | 473 | } |
| 474 | 474 | |
| 475 | 475 | /** |
@@ -478,10 +478,10 @@ discard block |
||
| 478 | 478 | * @param $msg |
| 479 | 479 | */ |
| 480 | 480 | function webAlertAndQuit($msg) { |
| 481 | - global $id, $modx; |
|
| 482 | - $mode = $_POST['mode']; |
|
| 483 | - $modx->manager->saveFormValues($mode); |
|
| 484 | - $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '12' ? "&id={$id}" : '')); |
|
| 481 | + global $id, $modx; |
|
| 482 | + $mode = $_POST['mode']; |
|
| 483 | + $modx->manager->saveFormValues($mode); |
|
| 484 | + $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '12' ? "&id={$id}" : '')); |
|
| 485 | 485 | } |
| 486 | 486 | |
| 487 | 487 | /** |
@@ -491,12 +491,12 @@ discard block |
||
| 491 | 491 | * @return string |
| 492 | 492 | */ |
| 493 | 493 | function generate_password($length = 10) { |
| 494 | - $allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789"; |
|
| 495 | - $ps_len = strlen($allowable_characters); |
|
| 496 | - mt_srand((double) microtime() * 1000000); |
|
| 497 | - $pass = ""; |
|
| 498 | - for($i = 0; $i < $length; $i++) { |
|
| 499 | - $pass .= $allowable_characters[mt_rand(0, $ps_len - 1)]; |
|
| 500 | - } |
|
| 501 | - return $pass; |
|
| 494 | + $allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789"; |
|
| 495 | + $ps_len = strlen($allowable_characters); |
|
| 496 | + mt_srand((double) microtime() * 1000000); |
|
| 497 | + $pass = ""; |
|
| 498 | + for($i = 0; $i < $length; $i++) { |
|
| 499 | + $pass .= $allowable_characters[mt_rand(0, $ps_len - 1)]; |
|
| 500 | + } |
|
| 501 | + return $pass; |
|
| 502 | 502 | } |
