evolution-cms /
evolution
@@ -478,7 +478,8 @@ discard block |
||
| 478 | 478 | return s; |
| 479 | 479 | } |
| 480 | 480 | |
| 481 | - <?php if ($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?> |
|
| 481 | + <?php if ($content['type'] == 'reference' || $modx->manager->action == '72') { |
|
| 482 | +// Web Link specific ?> |
|
| 482 | 483 | var lastImageCtrl; |
| 483 | 484 | var lastFileCtrl; |
| 484 | 485 | |
@@ -694,7 +695,8 @@ discard block |
||
| 694 | 695 | </td> |
| 695 | 696 | </tr> |
| 696 | 697 | |
| 697 | - <?php if($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?> |
|
| 698 | + <?php if($content['type'] == 'reference' || $modx->manager->action == '72') { |
|
| 699 | +// Web Link specific ?> |
|
| 698 | 700 | |
| 699 | 701 | <tr> |
| 700 | 702 | <td><span class="warning"><?= $_lang['weblink'] ?></span> |
@@ -1353,7 +1355,9 @@ discard block |
||
| 1353 | 1355 | if($documentId > 0) { |
| 1354 | 1356 | // Load up, the permissions from the parent (if new document) or existing document |
| 1355 | 1357 | $rs = $modx->db->select('id, document_group', $tbl_document_groups, "document='{$documentId}'"); |
| 1356 | - while($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id']; |
|
| 1358 | + while($currentgroup = $modx->db->getRow($rs)) { |
|
| 1359 | + $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id']; |
|
| 1360 | + } |
|
| 1357 | 1361 | |
| 1358 | 1362 | // Load up the current permissions and names |
| 1359 | 1363 | $vs = array( |
@@ -1415,7 +1419,9 @@ discard block |
||
| 1415 | 1419 | |
| 1416 | 1420 | // Create attribute string list |
| 1417 | 1421 | $inputString = array(); |
| 1418 | - foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"'; |
|
| 1422 | + foreach($inputAttributes as $k => $v) { |
|
| 1423 | + $inputString[] = $k . '="' . $v . '"'; |
|
| 1424 | + } |
|
| 1419 | 1425 | |
| 1420 | 1426 | // Make the <input> HTML |
| 1421 | 1427 | $inputHTML = '<input ' . implode(' ', $inputString) . ' />'; |
@@ -1535,7 +1541,8 @@ discard block |
||
| 1535 | 1541 | /** |
| 1536 | 1542 | * @return string |
| 1537 | 1543 | */ |
| 1538 | -function getDefaultTemplate() { |
|
| 1544 | +function getDefaultTemplate() |
|
| 1545 | +{ |
|
| 1539 | 1546 | $modx = evolutionCMS(); |
| 1540 | 1547 | |
| 1541 | 1548 | $default_template = ''; |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 2 | +if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 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 | |
@@ -16,7 +16,8 @@ discard block |
||
| 16 | 16 | * @param array $ph |
| 17 | 17 | * @return string |
| 18 | 18 | */ |
| 19 | -function parsePh($tpl, $ph) {
|
|
| 19 | +function parsePh($tpl, $ph) |
|
| 20 | +{ |
|
| 20 | 21 | $modx = evolutionCMS(); global $_lang; |
| 21 | 22 | $tpl = $modx->parseText($tpl, $_lang, '[%', '%]'); |
| 22 | 23 | return $modx->parseText($tpl, $ph); |
@@ -26,7 +27,8 @@ discard block |
||
| 26 | 27 | * @param string|int $cssId |
| 27 | 28 | * @return string |
| 28 | 29 | */ |
| 29 | -function renderViewSwitchButtons($cssId) {
|
|
| 30 | +function renderViewSwitchButtons($cssId) |
|
| 31 | +{ |
|
| 30 | 32 | $modx = evolutionCMS(); global $_lang, $tpl; |
| 31 | 33 | |
| 32 | 34 | return parsePh($tpl['viewForm'], array( |
@@ -39,19 +41,20 @@ discard block |
||
| 39 | 41 | * @param mgrResources $resources |
| 40 | 42 | * @return string |
| 41 | 43 | */ |
| 42 | -function createResourceList($resourceTable, $resources) {
|
|
| 44 | +function createResourceList($resourceTable, $resources) |
|
| 45 | +{ |
|
| 43 | 46 | $modx = evolutionCMS(); global $_lang, $_style, $modx_textdir, $tpl; |
| 44 | 47 | |
| 45 | 48 | $items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false; |
| 46 | 49 | |
| 47 | - if( ! is_array($items) || empty($items)) {
|
|
| 50 | + if( ! is_array($items) || empty($items)) { |
|
| 48 | 51 | return $_lang['no_results']; |
| 49 | 52 | } |
| 50 | 53 | |
| 51 | 54 | // Prepare elements- and categories-list |
| 52 | 55 | $elements = array(); |
| 53 | 56 | $categories = array(); |
| 54 | - foreach($items as $row) {
|
|
| 57 | + foreach($items as $row) { |
|
| 55 | 58 | $catid = $row['catid'] ? $row['catid'] : 0; |
| 56 | 59 | $categories[$catid] = array('name' => stripslashes($row['category']));
|
| 57 | 60 | $elements[$catid][] = prepareElementRowPh($row, $resourceTable, $resources); |
@@ -59,7 +62,7 @@ discard block |
||
| 59 | 62 | |
| 60 | 63 | // Now render categories / panel-collapse |
| 61 | 64 | $panelGroup = ''; |
| 62 | - foreach($elements as $catid => $elList) {
|
|
| 65 | + foreach($elements as $catid => $elList) { |
|
| 63 | 66 | // Add panel-heading / category-collapse to output |
| 64 | 67 | $panelGroup .= parsePh($tpl['panelHeading'], array( |
| 65 | 68 | 'tab' => $resourceTable, |
@@ -70,7 +73,7 @@ discard block |
||
| 70 | 73 | |
| 71 | 74 | // Prepare content for panel-collapse |
| 72 | 75 | $panelCollapse = ''; |
| 73 | - foreach($elList as $el) {
|
|
| 76 | + foreach($elList as $el) { |
|
| 74 | 77 | $panelCollapse .= parsePh($tpl['elementsRow'], $el); |
| 75 | 78 | } |
| 76 | 79 | |
@@ -92,14 +95,15 @@ discard block |
||
| 92 | 95 | * @param mgrResources $resources |
| 93 | 96 | * @return string |
| 94 | 97 | */ |
| 95 | -function createCombinedView($resources) {
|
|
| 98 | +function createCombinedView($resources) |
|
| 99 | +{ |
|
| 96 | 100 | $modx = evolutionCMS(); global $_lang, $_style, $modx_textdir; |
| 97 | 101 | |
| 98 | 102 | $itemsPerCategory = isset($resources->itemsPerCategory) ? $resources->itemsPerCategory : false; |
| 99 | 103 | $types = isset($resources->types) ? $resources->types : false; |
| 100 | 104 | $categories = isset($resources->categories) ? $resources->categories : false; |
| 101 | 105 | |
| 102 | - if(!$itemsPerCategory) {
|
|
| 106 | + if(!$itemsPerCategory) { |
|
| 103 | 107 | return $_lang['no_results']; |
| 104 | 108 | } |
| 105 | 109 | |
@@ -112,10 +116,10 @@ discard block |
||
| 112 | 116 | |
| 113 | 117 | // Easily loop through $itemsPerCategory-Array |
| 114 | 118 | $panelGroup = ''; |
| 115 | - foreach($categories as $catid => $category) {
|
|
| 119 | + foreach($categories as $catid => $category) { |
|
| 116 | 120 | // Prepare collapse content / elements-list |
| 117 | 121 | $panelCollapse = ''; |
| 118 | - foreach($itemsPerCategory[$catid] as $el) {
|
|
| 122 | + foreach($itemsPerCategory[$catid] as $el) { |
|
| 119 | 123 | $resourceTable = $el['type']; |
| 120 | 124 | $ph = prepareElementRowPh($el, $resourceTable, $resources); |
| 121 | 125 | $panelCollapse .= parsePh($tpl['elementsRow'], $ph); |
@@ -149,14 +153,15 @@ discard block |
||
| 149 | 153 | * @param mgrResources $resources |
| 150 | 154 | * @return array |
| 151 | 155 | */ |
| 152 | -function prepareElementRowPh($row, $resourceTable, $resources) {
|
|
| 156 | +function prepareElementRowPh($row, $resourceTable, $resources) |
|
| 157 | +{ |
|
| 153 | 158 | $modx = evolutionCMS(); global $modx_textdir, $_style, $_lang; |
| 154 | 159 | |
| 155 | 160 | $types = isset($resources->types[$resourceTable]) ? $resources->types[$resourceTable] : false; |
| 156 | 161 | |
| 157 | 162 | $_lang["confirm_delete"] = $_lang["delete"]; |
| 158 | 163 | |
| 159 | - switch($resourceTable){
|
|
| 164 | + switch($resourceTable) { |
|
| 160 | 165 | case 'site_templates': |
| 161 | 166 | $class = $row['selectable'] ? '' : 'disabledPlugin'; |
| 162 | 167 | $lockElementType = 1; |
@@ -193,56 +198,56 @@ discard block |
||
| 193 | 198 | // Prepare displaying user-locks |
| 194 | 199 | $lockedByUser = ''; |
| 195 | 200 | $rowLock = $modx->elementIsLocked($lockElementType, $row['id'], true); |
| 196 | - if($rowLock && $modx->hasPermission('display_locks')) {
|
|
| 197 | - if($rowLock['sid'] == $modx->sid) {
|
|
| 201 | + if($rowLock && $modx->hasPermission('display_locks')) { |
|
| 202 | + if($rowLock['sid'] == $modx->sid) { |
|
| 198 | 203 | $title = $modx->parseText($_lang["lock_element_editing"], array( |
| 199 | 204 | 'element_type' => $_lang["lock_element_type_" . $lockElementType], |
| 200 | 205 | 'lasthit_df' => $rowLock['lasthit_df'] |
| 201 | 206 | )); |
| 202 | 207 | $lockedByUser = '<span title="' . $title . '" class="editResource" style="cursor:context-menu;">' . $_style['tree_preview_resource'] . '</span> '; |
| 203 | - } else {
|
|
| 208 | + } else { |
|
| 204 | 209 | $title = $modx->parseText($_lang["lock_element_locked_by"], array( |
| 205 | 210 | 'element_type' => $_lang["lock_element_type_" . $lockElementType], |
| 206 | 211 | 'username' => $rowLock['username'], |
| 207 | 212 | 'lasthit_df' => $rowLock['lasthit_df'] |
| 208 | 213 | )); |
| 209 | - if($modx->hasPermission('remove_locks')) {
|
|
| 214 | + if($modx->hasPermission('remove_locks')) { |
|
| 210 | 215 | $lockedByUser = '<a href="javascript:;" onclick="unlockElement(' . $lockElementType . ', ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource"><i class="' . $_style['icons_secured'] . '"></i></a>';
|
| 211 | - } else {
|
|
| 216 | + } else { |
|
| 212 | 217 | $lockedByUser = '<span title="' . $title . '" class="lockedResource" style="cursor:context-menu;"><i class="' . $_style['icons_secured'] . '"></i></span>'; |
| 213 | 218 | } |
| 214 | 219 | } |
| 215 | 220 | } |
| 216 | - if($lockedByUser) {
|
|
| 221 | + if($lockedByUser) { |
|
| 217 | 222 | $lockedByUser = '<div class="lockCell">' . $lockedByUser . '</div>'; |
| 218 | 223 | } |
| 219 | 224 | |
| 220 | 225 | // Caption |
| 221 | - if($resourceTable == 'site_tmplvars') {
|
|
| 226 | + if($resourceTable == 'site_tmplvars') { |
|
| 222 | 227 | $caption = !empty($row['description']) ? ' ' . $row['caption'] . ' <small>(' . $row['description'] . ')</small>' : ' ' . $row['caption'];
|
| 223 | - } else {
|
|
| 228 | + } else { |
|
| 224 | 229 | $caption = !empty($row['description']) ? ' ' . $row['description'] : ''; |
| 225 | 230 | } |
| 226 | 231 | |
| 227 | 232 | // Special marks |
| 228 | 233 | $tplInfo = array(); |
| 229 | - if($row['locked']) {
|
|
| 234 | + if($row['locked']) { |
|
| 230 | 235 | $tplInfo[] = $_lang['locked']; |
| 231 | 236 | } |
| 232 | - if($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {
|
|
| 237 | + if($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') { |
|
| 233 | 238 | $tplInfo[] = $_lang['defaulttemplate_title']; |
| 234 | 239 | } |
| 235 | 240 | $marks = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';
|
| 236 | 241 | |
| 237 | 242 | /* row buttons */ |
| 238 | 243 | $buttons = ''; |
| 239 | - if($modx->hasPermission($types['actions']['edit'][1])) {
|
|
| 244 | + if($modx->hasPermission($types['actions']['edit'][1])) { |
|
| 240 | 245 | $buttons .= '<li><a title="' . $_lang["edit_resource"] . '" href="index.php?a=' . $types['actions']['edit'][0] . '&id=' . $row['id'] . '"><i class="fa fa-edit fa-fw"></i></a></li>'; |
| 241 | 246 | } |
| 242 | - if($modx->hasPermission($types['actions']['duplicate'][1])) {
|
|
| 247 | + if($modx->hasPermission($types['actions']['duplicate'][1])) { |
|
| 243 | 248 | $buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_duplicate_record"] . '\')" title="' . $_lang["resource_duplicate"] . '" href="index.php?a=' . $types['actions']['duplicate'][0] . '&id=' . $row['id'] . '"><i class="fa fa-clone fa-fw"></i></a></li>'; |
| 244 | 249 | } |
| 245 | - if($modx->hasPermission($types['actions']['remove'][1])) {
|
|
| 250 | + if($modx->hasPermission($types['actions']['remove'][1])) { |
|
| 246 | 251 | $buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_delete"] . '\')" title="' . $_lang["delete"] . '" href="index.php?a=' . $types['actions']['remove'][0] . '&id=' . $row['id'] . '"><i class="fa fa-trash fa-fw"></i></a></li>'; |
| 247 | 252 | } |
| 248 | 253 | $buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">' . $buttons . '</ul></div>' : ''; |
@@ -3,7 +3,8 @@ 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 | |
| 6 | -class mgrResources { |
|
| 6 | +class mgrResources |
|
| 7 | +{ |
|
| 7 | 8 | /** |
| 8 | 9 | * @var array |
| 9 | 10 | */ |
@@ -24,7 +25,8 @@ discard block |
||
| 24 | 25 | /** |
| 25 | 26 | * mgrResources constructor. |
| 26 | 27 | */ |
| 27 | - public function __construct() { |
|
| 28 | + public function __construct() |
|
| 29 | + { |
|
| 28 | 30 | $this->setTypes(); |
| 29 | 31 | $this->queryItemsFromDB(); |
| 30 | 32 | $this->prepareCategoryArrays(); |
@@ -33,7 +35,8 @@ discard block |
||
| 33 | 35 | /** |
| 34 | 36 | * @return void |
| 35 | 37 | */ |
| 36 | - public function setTypes() { |
|
| 38 | + public function setTypes() |
|
| 39 | + { |
|
| 37 | 40 | global $_lang; |
| 38 | 41 | $this->types['site_templates'] = array( |
| 39 | 42 | 'title'=>$_lang["manage_templates"], |
@@ -71,7 +74,8 @@ discard block |
||
| 71 | 74 | /** |
| 72 | 75 | * @return void |
| 73 | 76 | */ |
| 74 | - public function queryItemsFromDB() { |
|
| 77 | + public function queryItemsFromDB() |
|
| 78 | + { |
|
| 75 | 79 | foreach($this->types as $resourceTable=>$type) { |
| 76 | 80 | if($this->hasAnyPermissions($type['permissions'])) { |
| 77 | 81 | $nameField = isset($type['name']) ? $type['name'] : 'name'; |
@@ -84,11 +88,13 @@ discard block |
||
| 84 | 88 | * @param array $permissions |
| 85 | 89 | * @return bool |
| 86 | 90 | */ |
| 87 | - public function hasAnyPermissions($permissions) { |
|
| 91 | + public function hasAnyPermissions($permissions) |
|
| 92 | + { |
|
| 88 | 93 | $modx = evolutionCMS(); |
| 89 | 94 | |
| 90 | - foreach($permissions as $p) |
|
| 91 | - if($modx->hasPermission($p)) return true; |
|
| 95 | + foreach($permissions as $p) { |
|
| 96 | + if($modx->hasPermission($p)) return true; |
|
| 97 | + } |
|
| 92 | 98 | |
| 93 | 99 | return false; |
| 94 | 100 | } |
@@ -98,7 +104,8 @@ discard block |
||
| 98 | 104 | * @param string $nameField |
| 99 | 105 | * @return array|bool |
| 100 | 106 | */ |
| 101 | - public function queryResources($resourceTable, $nameField = 'name') { |
|
| 107 | + public function queryResources($resourceTable, $nameField = 'name') |
|
| 108 | + { |
|
| 102 | 109 | $modx = evolutionCMS(); global $_lang; |
| 103 | 110 | |
| 104 | 111 | $allowed = array( |
@@ -115,8 +122,9 @@ discard block |
||
| 115 | 122 | $tvsql = 'site_tmplvars.caption, '; |
| 116 | 123 | $tvjoin = sprintf('LEFT JOIN %s AS stt ON site_tmplvars.id=stt.tmplvarid GROUP BY site_tmplvars.id,reltpl', $modx->getFullTableName('site_tmplvar_templates')); |
| 117 | 124 | $sttfield = 'IF(stt.templateid,1,0) AS reltpl,'; |
| 125 | + } else { |
|
| 126 | + $sttfield = ''; |
|
| 118 | 127 | } |
| 119 | - else $sttfield = ''; |
|
| 120 | 128 | |
| 121 | 129 | $selectableTemplates = $resourceTable === 'site_templates' ? "{$resourceTable}.selectable, " : ""; |
| 122 | 130 | |
@@ -129,7 +137,9 @@ discard block |
||
| 129 | 137 | ); |
| 130 | 138 | $limit = $modx->db->getRecordCount($rs); |
| 131 | 139 | |
| 132 | - if($limit < 1) return false; |
|
| 140 | + if($limit < 1) { |
|
| 141 | + return false; |
|
| 142 | + } |
|
| 133 | 143 | |
| 134 | 144 | $result = array(); |
| 135 | 145 | while ($row = $modx->db->getRow($rs)) { |
@@ -141,7 +151,8 @@ discard block |
||
| 141 | 151 | /** |
| 142 | 152 | * @return void |
| 143 | 153 | */ |
| 144 | - public function prepareCategoryArrays() { |
|
| 154 | + public function prepareCategoryArrays() |
|
| 155 | + { |
|
| 145 | 156 | foreach($this->items as $type=>$items) { |
| 146 | 157 | foreach((array)$items as $item) { |
| 147 | 158 | $catid = $item['catid'] ? $item['catid'] : 0; |
@@ -157,7 +168,7 @@ discard block |
||
| 157 | 168 | |
| 158 | 169 | // Now sort by name |
| 159 | 170 | foreach($this->itemsPerCategory as $catid=>$items) { |
| 160 | - usort($this->itemsPerCategory[$catid], function ($a, $b) { |
|
| 171 | + usort($this->itemsPerCategory[$catid], function ($a, $b){ |
|
| 161 | 172 | return strcasecmp($a['name'], $b['name']); |
| 162 | 173 | }); |
| 163 | 174 | } |
@@ -299,7 +299,8 @@ |
||
| 299 | 299 | * @param string $status |
| 300 | 300 | * @return string |
| 301 | 301 | */ |
| 302 | -function render_form($name, $label, $status = '') { |
|
| 302 | +function render_form($name, $label, $status = '') |
|
| 303 | +{ |
|
| 303 | 304 | $modx = evolutionCMS(); global $roledata; |
| 304 | 305 | |
| 305 | 306 | $tpl = '<label class="d-block" for="[+name+]check"> |
@@ -893,7 +893,9 @@ |
||
| 893 | 893 | $modx = evolutionCMS(); global $_lang, $startpath, $filemanager_path, $uploadablefiles, $new_file_permissions; |
| 894 | 894 | $msg = ''; |
| 895 | 895 | foreach ($_FILES['userfile']['name'] as $i => $name) { |
| 896 | - if (empty($_FILES['userfile']['tmp_name'][$i])) continue; |
|
| 896 | + if (empty($_FILES['userfile']['tmp_name'][$i])) { |
|
| 897 | + continue; |
|
| 898 | + } |
|
| 897 | 899 | $userfile= array(); |
| 898 | 900 | |
| 899 | 901 | $userfile['tmp_name'] = $_FILES['userfile']['tmp_name'][$i]; |
@@ -12,7 +12,8 @@ discard block |
||
| 12 | 12 | * @param array $tvsArray |
| 13 | 13 | * @return string |
| 14 | 14 | */ |
| 15 | -function renderFormElement($field_type, $field_id, $default_text = '', $field_elements = '', $field_value = '', $field_style = '', $row = array(), $tvsArray = array()) { |
|
| 15 | +function renderFormElement($field_type, $field_id, $default_text = '', $field_elements = '', $field_value = '', $field_style = '', $row = array(), $tvsArray = array()) |
|
| 16 | +{ |
|
| 16 | 17 | $modx = evolutionCMS(); |
| 17 | 18 | global $_style; |
| 18 | 19 | global $_lang; |
@@ -384,13 +385,16 @@ discard block |
||
| 384 | 385 | * @param string|array|mysqli_result $v |
| 385 | 386 | * @return array |
| 386 | 387 | */ |
| 387 | -function ParseIntputOptions($v) { |
|
| 388 | +function ParseIntputOptions($v) |
|
| 389 | +{ |
|
| 388 | 390 | $modx = evolutionCMS(); |
| 389 | 391 | $a = array(); |
| 390 | 392 | if(is_array($v)) { |
| 391 | 393 | return $v; |
| 392 | 394 | } else if($modx->db->isResult($v)) { |
| 393 | - while($cols = $modx->db->getRow($v, 'num')) $a[] = $cols; |
|
| 395 | + while($cols = $modx->db->getRow($v, 'num')) { |
|
| 396 | + $a[] = $cols; |
|
| 397 | + } |
|
| 394 | 398 | } else { |
| 395 | 399 | $a = explode("||", $v); |
| 396 | 400 | } |
@@ -41,7 +41,8 @@ discard block |
||
| 41 | 41 | ## see sample.php for test and usage |
| 42 | 42 | ## sample URL: http://www.program-ruti.org/veriword/ |
| 43 | 43 | #### |
| 44 | -class VeriWord { |
|
| 44 | +class VeriWord |
|
| 45 | +{ |
|
| 45 | 46 | |
| 46 | 47 | /* path to font directory*/ |
| 47 | 48 | public $dir_font = "ttf/"; |
@@ -52,7 +53,8 @@ discard block |
||
| 52 | 53 | public $im_height = 0; |
| 53 | 54 | public $im; |
| 54 | 55 | |
| 55 | - public function __construct($w=200, $h=80) { |
|
| 56 | + public function __construct($w=200, $h=80) |
|
| 57 | + { |
|
| 56 | 58 | /* create session to set word for verification */ |
| 57 | 59 | $this->set_veriword(); |
| 58 | 60 | $this->dir_font = dirname(__FILE__) . '/' . $this->dir_font; |
@@ -60,21 +62,24 @@ discard block |
||
| 60 | 62 | $this->im_height = $h; |
| 61 | 63 | } |
| 62 | 64 | |
| 63 | - public function set_veriword() { |
|
| 65 | + public function set_veriword() |
|
| 66 | + { |
|
| 64 | 67 | /* create session variable for verification, |
| 65 | 68 | you may change the session variable name */ |
| 66 | 69 | $this->word = $this->pick_word(); |
| 67 | 70 | $_SESSION['veriword'] = $this->word; |
| 68 | 71 | } |
| 69 | 72 | |
| 70 | - public function output_image() { |
|
| 73 | + public function output_image() |
|
| 74 | + { |
|
| 71 | 75 | /* output the image as jpeg */ |
| 72 | 76 | $this->draw_image(); |
| 73 | 77 | header("Content-type: image/jpeg"); |
| 74 | 78 | imagejpeg($this->im); |
| 75 | 79 | } |
| 76 | 80 | |
| 77 | - public function pick_word() { |
|
| 81 | + public function pick_word() |
|
| 82 | + { |
|
| 78 | 83 | $modx = evolutionCMS(); |
| 79 | 84 | // set default words |
| 80 | 85 | $words="MODX,Access,Better,BitCode,Chunk,Cache,Desc,Design,Excell,Enjoy,URLs,TechView,Gerald,Griff,Humphrey,Holiday,Intel,Integration,Joystick,Join(),Oscope,Genetic,Light,Likeness,Marit,Maaike,Niche,Netherlands,Ordinance,Oscillo,Parser,Phusion,Query,Question,Regalia,Righteous,Snippet,Sentinel,Template,Thespian,Unity,Enterprise,Verily,Veri,Website,WideWeb,Yap,Yellow,Zebra,Zygote"; |
@@ -85,7 +90,8 @@ discard block |
||
| 85 | 90 | return (string) $arr_words[array_rand($arr_words)].rand(10,999); |
| 86 | 91 | } |
| 87 | 92 | |
| 88 | - public function draw_text() { |
|
| 93 | + public function draw_text() |
|
| 94 | + { |
|
| 89 | 95 | $dir = dir($this->dir_font); |
| 90 | 96 | $fontstmp = array(); |
| 91 | 97 | while (false !== ($file = $dir->read())) { |
@@ -140,7 +146,8 @@ discard block |
||
| 140 | 146 | } |
| 141 | 147 | |
| 142 | 148 | |
| 143 | - public function draw_image() { |
|
| 149 | + public function draw_image() |
|
| 150 | + { |
|
| 144 | 151 | |
| 145 | 152 | /* pick one background image randomly from image directory */ |
| 146 | 153 | $img_file = $this->dir_noise."noise".rand(1,4).".jpg"; |
@@ -171,7 +178,8 @@ discard block |
||
| 171 | 178 | return $this->im; |
| 172 | 179 | } |
| 173 | 180 | |
| 174 | - public function destroy_image() { |
|
| 181 | + public function destroy_image() |
|
| 182 | + { |
|
| 175 | 183 | |
| 176 | 184 | imagedestroy($this->im); |
| 177 | 185 | |
@@ -116,7 +116,8 @@ discard block |
||
| 116 | 116 | * @return string |
| 117 | 117 | */ |
| 118 | 118 | public function getHashType($db_value = '') |
| 119 | - { // md5 | v1 | phpass |
|
| 119 | + { |
|
| 120 | +// md5 | v1 | phpass |
|
| 120 | 121 | $c = substr($db_value, 0, 1); |
| 121 | 122 | if ($c === '$') { |
| 122 | 123 | return 'phpass'; |
@@ -135,7 +136,8 @@ discard block |
||
| 135 | 136 | * @return string |
| 136 | 137 | */ |
| 137 | 138 | public function genV1Hash($password, $seed = '1') |
| 138 | - { // $seed is user_id basically |
|
| 139 | + { |
|
| 140 | +// $seed is user_id basically |
|
| 139 | 141 | $modx = evolutionCMS(); |
| 140 | 142 | |
| 141 | 143 | if (isset($modx->config['pwd_hash_algo']) && !empty($modx->config['pwd_hash_algo'])) { |
@@ -1,8 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if(!defined('MODX_CORE_PATH')) define('MODX_CORE_PATH', MODX_MANAGER_PATH.'includes/'); |
|
| 3 | +if(!defined('MODX_CORE_PATH')) { |
|
| 4 | + define('MODX_CORE_PATH', MODX_MANAGER_PATH.'includes/'); |
|
| 5 | +} |
|
| 4 | 6 | |
| 5 | -class MODIFIERS { |
|
| 7 | +class MODIFIERS |
|
| 8 | +{ |
|
| 6 | 9 | /** |
| 7 | 10 | * @var array |
| 8 | 11 | */ |
@@ -60,7 +63,9 @@ discard block |
||
| 60 | 63 | public function __construct() |
| 61 | 64 | { |
| 62 | 65 | $modx = evolutionCMS(); |
| 63 | - if (function_exists('mb_internal_encoding')) mb_internal_encoding($modx->config['modx_charset']); |
|
| 66 | + if (function_exists('mb_internal_encoding')) { |
|
| 67 | + mb_internal_encoding($modx->config['modx_charset']); |
|
| 68 | + } |
|
| 64 | 69 | $this->condModifiers = '=,is,eq,equals,ne,neq,notequals,isnot,isnt,not,%,isempty,isnotempty,isntempty,>=,gte,eg,gte,greaterthan,>,gt,isgreaterthan,isgt,lowerthan,<,lt,<=,lte,islte,islowerthan,islt,el,find,in,inarray,in_array,fnmatch,wcard,wcard_match,wildcard,wildcard_match,is_file,is_dir,file_exists,is_readable,is_writable,is_image,regex,preg,preg_match,memberof,mo,isinrole,ir'; |
| 65 | 70 | } |
| 66 | 71 | |
@@ -73,7 +78,9 @@ discard block |
||
| 73 | 78 | public function phxFilter($key,$value,$modifiers) |
| 74 | 79 | { |
| 75 | 80 | $modx = evolutionCMS(); |
| 76 | - if(substr($modifiers,0,3)!=='id(') $value = $this->parseDocumentSource($value); |
|
| 81 | + if(substr($modifiers,0,3)!=='id(') { |
|
| 82 | + $value = $this->parseDocumentSource($value); |
|
| 83 | + } |
|
| 77 | 84 | $this->srcValue = $value; |
| 78 | 85 | $modifiers = trim($modifiers); |
| 79 | 86 | $modifiers = ':'.trim($modifiers,':'); |
@@ -96,13 +103,18 @@ discard block |
||
| 96 | 103 | * @param string $modifiers |
| 97 | 104 | * @return bool|string |
| 98 | 105 | */ |
| 99 | - public function _getDelim($mode,$modifiers) { |
|
| 106 | + public function _getDelim($mode,$modifiers) |
|
| 107 | + { |
|
| 100 | 108 | $c = substr($modifiers,0,1); |
| 101 | - if(!in_array($c, array('"', "'", '`')) ) return false; |
|
| 109 | + if(!in_array($c, array('"', "'", '`')) ) { |
|
| 110 | + return false; |
|
| 111 | + } |
|
| 102 | 112 | |
| 103 | 113 | $modifiers = substr($modifiers,1); |
| 104 | 114 | $closure = $mode=='(' ? "{$c})" : $c; |
| 105 | - if(strpos($modifiers, $closure)===false) return false; |
|
| 115 | + if(strpos($modifiers, $closure)===false) { |
|
| 116 | + return false; |
|
| 117 | + } |
|
| 106 | 118 | |
| 107 | 119 | return $c; |
| 108 | 120 | } |
@@ -113,52 +125,65 @@ discard block |
||
| 113 | 125 | * @param string $modifiers |
| 114 | 126 | * @return bool|string |
| 115 | 127 | */ |
| 116 | - public function _getOpt($mode,$delim,$modifiers) { |
|
| 128 | + public function _getOpt($mode,$delim,$modifiers) |
|
| 129 | + { |
|
| 117 | 130 | if($delim) { |
| 118 | - if($mode=='(') return substr($modifiers,1,strpos($modifiers, $delim . ')' )-1); |
|
| 131 | + if($mode=='(') { |
|
| 132 | + return substr($modifiers,1,strpos($modifiers, $delim . ')' )-1); |
|
| 133 | + } |
|
| 119 | 134 | |
| 120 | 135 | return substr($modifiers,1,strpos($modifiers,$delim,1)-1); |
| 121 | - } |
|
| 122 | - else { |
|
| 123 | - if($mode=='(') return substr($modifiers,0,strpos($modifiers, ')') ); |
|
| 136 | + } else { |
|
| 137 | + if($mode=='(') { |
|
| 138 | + return substr($modifiers,0,strpos($modifiers, ')') ); |
|
| 139 | + } |
|
| 124 | 140 | |
| 125 | 141 | $chars = str_split($modifiers); |
| 126 | 142 | $opt=''; |
| 127 | 143 | foreach($chars as $c) { |
| 128 | - if($c==':' || $c==')') break; |
|
| 144 | + if($c==':' || $c==')') { |
|
| 145 | + break; |
|
| 146 | + } |
|
| 129 | 147 | $opt .=$c; |
| 130 | 148 | } |
| 131 | 149 | return $opt; |
| 132 | 150 | } |
| 133 | 151 | } |
| 134 | - public function _getRemainModifiers($mode,$delim,$modifiers) { |
|
| 152 | + public function _getRemainModifiers($mode,$delim,$modifiers) |
|
| 153 | + { |
|
| 135 | 154 | if($delim) { |
| 136 | - if($mode=='(') |
|
| 137 | - return $this->_fetchContent($modifiers, $delim . ')'); |
|
| 138 | - else { |
|
| 155 | + if($mode=='(') { |
|
| 156 | + return $this->_fetchContent($modifiers, $delim . ')'); |
|
| 157 | + } else { |
|
| 139 | 158 | $modifiers = trim($modifiers); |
| 140 | 159 | $modifiers = substr($modifiers,1); |
| 141 | 160 | return $this->_fetchContent($modifiers, $delim); |
| 142 | 161 | } |
| 143 | - } |
|
| 144 | - else { |
|
| 145 | - if($mode=='(') return $this->_fetchContent($modifiers, ')'); |
|
| 162 | + } else { |
|
| 163 | + if($mode=='(') { |
|
| 164 | + return $this->_fetchContent($modifiers, ')'); |
|
| 165 | + } |
|
| 146 | 166 | $chars = str_split($modifiers); |
| 147 | 167 | foreach($chars as $c) { |
| 148 | - if($c==':') return $modifiers; |
|
| 149 | - else $modifiers = substr($modifiers,1); |
|
| 168 | + if($c==':') { |
|
| 169 | + return $modifiers; |
|
| 170 | + } else { |
|
| 171 | + $modifiers = substr($modifiers,1); |
|
| 172 | + } |
|
| 150 | 173 | } |
| 151 | 174 | return $modifiers; |
| 152 | 175 | } |
| 153 | 176 | } |
| 154 | 177 | |
| 155 | - public function _fetchContent($string,$delim) { |
|
| 178 | + public function _fetchContent($string,$delim) |
|
| 179 | + { |
|
| 156 | 180 | $len = strlen($delim); |
| 157 | 181 | $string = $this->parseDocumentSource($string); |
| 158 | 182 | return substr($string,strpos($string, $delim)+$len); |
| 159 | 183 | } |
| 160 | 184 | |
| 161 | - public function splitEachModifiers($modifiers) { |
|
| 185 | + public function splitEachModifiers($modifiers) |
|
| 186 | + { |
|
| 162 | 187 | $modx = evolutionCMS(); |
| 163 | 188 | |
| 164 | 189 | $cmd = ''; |
@@ -169,11 +194,15 @@ discard block |
||
| 169 | 194 | $c = substr($modifiers,0,1); |
| 170 | 195 | $modifiers = substr($modifiers,1); |
| 171 | 196 | |
| 172 | - if($c===':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>= |
|
| 197 | + if($c===':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { |
|
| 198 | +// :=, :!=, :<=, :>=, :!<=, :!>= |
|
| 173 | 199 | $c = substr($modifiers,strlen($match[1]),1); |
| 174 | 200 | $debuginfo = "#i=0 #c=[{$c}] #m=[{$modifiers}]"; |
| 175 | - if($c==='(') $modifiers = substr($modifiers,strlen($match[1])+1); |
|
| 176 | - else $modifiers = substr($modifiers,strlen($match[1])); |
|
| 201 | + if($c==='(') { |
|
| 202 | + $modifiers = substr($modifiers,strlen($match[1])+1); |
|
| 203 | + } else { |
|
| 204 | + $modifiers = substr($modifiers,strlen($match[1])); |
|
| 205 | + } |
|
| 177 | 206 | |
| 178 | 207 | $delim = $this->_getDelim($c,$modifiers); |
| 179 | 208 | $opt = $this->_getOpt($c,$delim,$modifiers); |
@@ -181,13 +210,12 @@ discard block |
||
| 181 | 210 | |
| 182 | 211 | $result[]=array('cmd'=>trim($match[1]),'opt'=>$opt,'debuginfo'=>$debuginfo); |
| 183 | 212 | $cmd = ''; |
| 184 | - } |
|
| 185 | - elseif(in_array($c,array('+','-','*','/')) && preg_match('@^[0-9]+@', $modifiers, $match)) { // :+3, :-3, :*3 ... |
|
| 213 | + } elseif(in_array($c,array('+','-','*','/')) && preg_match('@^[0-9]+@', $modifiers, $match)) { |
|
| 214 | +// :+3, :-3, :*3 ... |
|
| 186 | 215 | $modifiers = substr($modifiers,strlen($match[0])); |
| 187 | 216 | $result[]=array('cmd'=>'math','opt'=>'%s'.$c.$match[0]); |
| 188 | 217 | $cmd = ''; |
| 189 | - } |
|
| 190 | - elseif($c==='(' || $c==='=') { |
|
| 218 | + } elseif($c==='(' || $c==='=') { |
|
| 191 | 219 | $modifiers = $m1 = trim($modifiers); |
| 192 | 220 | $delim = $this->_getDelim($c,$modifiers); |
| 193 | 221 | $opt = $this->_getOpt($c,$delim,$modifiers); |
@@ -197,29 +225,29 @@ discard block |
||
| 197 | 225 | $result[]=array('cmd'=>trim($cmd),'opt'=>$opt,'debuginfo'=>$debuginfo); |
| 198 | 226 | |
| 199 | 227 | $cmd = ''; |
| 200 | - } |
|
| 201 | - elseif($c==':') { |
|
| 228 | + } elseif($c==':') { |
|
| 202 | 229 | $debuginfo = "#i=2 #c=[{$c}] #m=[{$modifiers}]"; |
| 203 | - if($cmd!=='') $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo); |
|
| 230 | + if($cmd!=='') { |
|
| 231 | + $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo); |
|
| 232 | + } |
|
| 204 | 233 | |
| 205 | 234 | $cmd = ''; |
| 206 | - } |
|
| 207 | - elseif(trim($modifiers)=='' && trim($cmd)!=='') { |
|
| 235 | + } elseif(trim($modifiers)=='' && trim($cmd)!=='') { |
|
| 208 | 236 | $debuginfo = "#i=3 #c=[{$c}] #m=[{$modifiers}]"; |
| 209 | 237 | $cmd .= $c; |
| 210 | 238 | $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo); |
| 211 | 239 | |
| 212 | 240 | break; |
| 213 | - } |
|
| 214 | - else { |
|
| 241 | + } else { |
|
| 215 | 242 | $cmd .= $c; |
| 216 | 243 | } |
| 217 | 244 | } |
| 218 | 245 | |
| 219 | - if(empty($result)) return array(); |
|
| 246 | + if(empty($result)) { |
|
| 247 | + return array(); |
|
| 248 | + } |
|
| 220 | 249 | |
| 221 | - foreach($result as $i=>$a) |
|
| 222 | - { |
|
| 250 | + foreach($result as $i=>$a) { |
|
| 223 | 251 | $a['opt'] = $this->parseDocumentSource($a['opt']); |
| 224 | 252 | $result[$i]['opt'] = $modx->mergePlaceholderContent($a['opt'],$this->placeholders); |
| 225 | 253 | } |
@@ -232,22 +260,23 @@ discard block |
||
| 232 | 260 | $modx = evolutionCMS(); |
| 233 | 261 | $lastKey = ''; |
| 234 | 262 | $cacheKey = md5(sprintf('parsePhx#%s#%s#%s',$key,$value,print_r($modifiers,true))); |
| 235 | - if(isset($this->tmpCache[$cacheKey])) return $this->tmpCache[$cacheKey]; |
|
| 236 | - if(empty($modifiers)) return ''; |
|
| 263 | + if(isset($this->tmpCache[$cacheKey])) { |
|
| 264 | + return $this->tmpCache[$cacheKey]; |
|
| 265 | + } |
|
| 266 | + if(empty($modifiers)) { |
|
| 267 | + return ''; |
|
| 268 | + } |
|
| 237 | 269 | |
| 238 | - foreach($modifiers as $m) |
|
| 239 | - { |
|
| 270 | + foreach($modifiers as $m) { |
|
| 240 | 271 | $lastKey = strtolower($m['cmd']); |
| 241 | 272 | } |
| 242 | 273 | $_ = explode(',',$this->condModifiers); |
| 243 | - if(in_array($lastKey,$_)) |
|
| 244 | - { |
|
| 274 | + if(in_array($lastKey,$_)) { |
|
| 245 | 275 | $modifiers[] = array('cmd'=>'then','opt'=>'1'); |
| 246 | 276 | $modifiers[] = array('cmd'=>'else','opt'=>'0'); |
| 247 | 277 | } |
| 248 | 278 | |
| 249 | - foreach($modifiers as $i=>$a) |
|
| 250 | - { |
|
| 279 | + foreach($modifiers as $i=>$a) { |
|
| 251 | 280 | $value = $this->Filter($key,$value, $a['cmd'], $a['opt']); |
| 252 | 281 | } |
| 253 | 282 | $this->tmpCache[$cacheKey] = $value; |
@@ -259,25 +288,32 @@ discard block |
||
| 259 | 288 | { |
| 260 | 289 | $modx = evolutionCMS(); |
| 261 | 290 | |
| 262 | - if($key==='documentObject') $value = $modx->documentIdentifier; |
|
| 291 | + if($key==='documentObject') { |
|
| 292 | + $value = $modx->documentIdentifier; |
|
| 293 | + } |
|
| 263 | 294 | $cmd = $this->parseDocumentSource($cmd); |
| 264 | - if(preg_match('@^[1-9][/0-9]*$@',$cmd)) |
|
| 265 | - { |
|
| 266 | - if(strpos($cmd,'/')!==false) |
|
| 267 | - $cmd = $this->substr($cmd,strrpos($cmd,'/')+1); |
|
| 295 | + if(preg_match('@^[1-9][/0-9]*$@',$cmd)) { |
|
| 296 | + if(strpos($cmd,'/')!==false) { |
|
| 297 | + $cmd = $this->substr($cmd,strrpos($cmd,'/')+1); |
|
| 298 | + } |
|
| 268 | 299 | $opt = $cmd; |
| 269 | 300 | $cmd = 'id'; |
| 270 | 301 | } |
| 271 | 302 | |
| 272 | - if(isset($modx->snippetCache["phx:{$cmd}"])) $this->elmName = "phx:{$cmd}"; |
|
| 273 | - elseif(isset($modx->chunkCache["phx:{$cmd}"])) $this->elmName = "phx:{$cmd}"; |
|
| 274 | - else $this->elmName = ''; |
|
| 303 | + if(isset($modx->snippetCache["phx:{$cmd}"])) { |
|
| 304 | + $this->elmName = "phx:{$cmd}"; |
|
| 305 | + } elseif(isset($modx->chunkCache["phx:{$cmd}"])) { |
|
| 306 | + $this->elmName = "phx:{$cmd}"; |
|
| 307 | + } else { |
|
| 308 | + $this->elmName = ''; |
|
| 309 | + } |
|
| 275 | 310 | |
| 276 | 311 | $cmd = strtolower($cmd); |
| 277 | - if($this->elmName!=='') |
|
| 278 | - $value = $this->getValueFromElement($key, $value, $cmd, $opt); |
|
| 279 | - else |
|
| 280 | - $value = $this->getValueFromPreset($key, $value, $cmd, $opt); |
|
| 312 | + if($this->elmName!=='') { |
|
| 313 | + $value = $this->getValueFromElement($key, $value, $cmd, $opt); |
|
| 314 | + } else { |
|
| 315 | + $value = $this->getValueFromPreset($key, $value, $cmd, $opt); |
|
| 316 | + } |
|
| 281 | 317 | |
| 282 | 318 | $value = str_replace('[+key+]', $key, $value); |
| 283 | 319 | |
@@ -286,29 +322,37 @@ discard block |
||
| 286 | 322 | |
| 287 | 323 | public function isEmpty($cmd,$value) |
| 288 | 324 | { |
| 289 | - if($value!=='') return false; |
|
| 325 | + if($value!=='') { |
|
| 326 | + return false; |
|
| 327 | + } |
|
| 290 | 328 | |
| 291 | 329 | $_ = explode(',', $this->condModifiers . ',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary'); |
| 292 | - if(in_array($cmd,$_)) return false; |
|
| 293 | - else return true; |
|
| 330 | + if(in_array($cmd,$_)) { |
|
| 331 | + return false; |
|
| 332 | + } else { |
|
| 333 | + return true; |
|
| 334 | + } |
|
| 294 | 335 | } |
| 295 | 336 | |
| 296 | 337 | public function getValueFromPreset($key, $value, $cmd, $opt) |
| 297 | 338 | { |
| 298 | 339 | $modx = evolutionCMS(); |
| 299 | 340 | |
| 300 | - if($this->isEmpty($cmd,$value)) return ''; |
|
| 341 | + if($this->isEmpty($cmd,$value)) { |
|
| 342 | + return ''; |
|
| 343 | + } |
|
| 301 | 344 | |
| 302 | 345 | $this->key = $key; |
| 303 | 346 | $this->value = $value; |
| 304 | 347 | $this->opt = $opt; |
| 305 | 348 | |
| 306 | - switch ($cmd) |
|
| 307 | - { |
|
| 349 | + switch ($cmd) { |
|
| 308 | 350 | ##### Conditional Modifiers |
| 309 | 351 | case 'input': |
| 310 | 352 | case 'if': |
| 311 | - if(!$opt) return $value; |
|
| 353 | + if(!$opt) { |
|
| 354 | + return $value; |
|
| 355 | + } |
|
| 312 | 356 | return $opt; |
| 313 | 357 | case '=': |
| 314 | 358 | case 'eq': |
@@ -369,14 +413,24 @@ discard block |
||
| 369 | 413 | case 'file_exists': |
| 370 | 414 | case 'is_readable': |
| 371 | 415 | case 'is_writable': |
| 372 | - if(!$opt) $path = $value; |
|
| 373 | - else $path = $opt; |
|
| 374 | - if(strpos($path,MODX_MANAGER_PATH)!==false) exit('Can not read core path'); |
|
| 375 | - if(strpos($path,$modx->config['base_path'])===false) $path = ltrim($path,'/'); |
|
| 416 | + if(!$opt) { |
|
| 417 | + $path = $value; |
|
| 418 | + } else { |
|
| 419 | + $path = $opt; |
|
| 420 | + } |
|
| 421 | + if(strpos($path,MODX_MANAGER_PATH)!==false) { |
|
| 422 | + exit('Can not read core path'); |
|
| 423 | + } |
|
| 424 | + if(strpos($path,$modx->config['base_path'])===false) { |
|
| 425 | + $path = ltrim($path,'/'); |
|
| 426 | + } |
|
| 376 | 427 | $this->condition[] = (int)($cmd($path)!==false);break; |
| 377 | 428 | case 'is_image': |
| 378 | - if(!$opt) $path = $value; |
|
| 379 | - else $path = $opt; |
|
| 429 | + if(!$opt) { |
|
| 430 | + $path = $value; |
|
| 431 | + } else { |
|
| 432 | + $path = $opt; |
|
| 433 | + } |
|
| 380 | 434 | if(!is_file($path)) {$this->condition[]='0';break;} |
| 381 | 435 | $_ = getimagesize($path); |
| 382 | 436 | $this->condition[] = (int)($_[0]);break; |
@@ -399,17 +453,23 @@ discard block |
||
| 399 | 453 | case 'this': |
| 400 | 454 | $conditional = implode(' ',$this->condition); |
| 401 | 455 | $isvalid = (int)(eval("return ({$conditional});")); |
| 402 | - if ($isvalid) return $this->srcValue; |
|
| 456 | + if ($isvalid) { |
|
| 457 | + return $this->srcValue; |
|
| 458 | + } |
|
| 403 | 459 | return NULL; |
| 404 | 460 | case 'then': |
| 405 | 461 | $conditional = implode(' ',$this->condition); |
| 406 | 462 | $isvalid = (int)eval("return ({$conditional});"); |
| 407 | - if ($isvalid) return $opt; |
|
| 463 | + if ($isvalid) { |
|
| 464 | + return $opt; |
|
| 465 | + } |
|
| 408 | 466 | return null; |
| 409 | 467 | case 'else': |
| 410 | 468 | $conditional = implode(' ',$this->condition); |
| 411 | 469 | $isvalid = (int)eval("return ({$conditional});"); |
| 412 | - if (!$isvalid) return $opt; |
|
| 470 | + if (!$isvalid) { |
|
| 471 | + return $opt; |
|
| 472 | + } |
|
| 413 | 473 | break; |
| 414 | 474 | case 'select': |
| 415 | 475 | case 'switch': |
@@ -420,8 +480,11 @@ discard block |
||
| 420 | 480 | $mi = explode('=',$raw[$m],2); |
| 421 | 481 | $map[$mi[0]] = $mi[1]; |
| 422 | 482 | } |
| 423 | - if(isset($map[$value])) return $map[$value]; |
|
| 424 | - else return ''; |
|
| 483 | + if(isset($map[$value])) { |
|
| 484 | + return $map[$value]; |
|
| 485 | + } else { |
|
| 486 | + return ''; |
|
| 487 | + } |
|
| 425 | 488 | ##### End of Conditional Modifiers |
| 426 | 489 | |
| 427 | 490 | ##### Encode / Decode / Hash / Escape |
@@ -447,24 +510,25 @@ discard block |
||
| 447 | 510 | case 'spam_protect': |
| 448 | 511 | return str_replace(array('@','.'),array('@','.'),$value); |
| 449 | 512 | case 'strip': |
| 450 | - if($opt==='') $opt = ' '; |
|
| 513 | + if($opt==='') { |
|
| 514 | + $opt = ' '; |
|
| 515 | + } |
|
| 451 | 516 | return preg_replace('/[\n\r\t\s]+/', $opt, $value); |
| 452 | 517 | case 'strip_linefeeds': |
| 453 | 518 | return str_replace(array("\n","\r"), '', $value); |
| 454 | 519 | case 'notags': |
| 455 | 520 | case 'strip_tags': |
| 456 | 521 | case 'remove_html': |
| 457 | - if($opt!=='') |
|
| 458 | - { |
|
| 522 | + if($opt!=='') { |
|
| 459 | 523 | $param = array(); |
| 460 | - foreach(explode(',',$opt) as $v) |
|
| 461 | - { |
|
| 524 | + foreach(explode(',',$opt) as $v) { |
|
| 462 | 525 | $v = trim($v,'</> '); |
| 463 | 526 | $param[] = "<{$v}>"; |
| 464 | 527 | } |
| 465 | 528 | $params = implode(',',$param); |
| 529 | + } else { |
|
| 530 | + $params = ''; |
|
| 466 | 531 | } |
| 467 | - else $params = ''; |
|
| 468 | 532 | if(!strpos($params,'<br>')===false) { |
| 469 | 533 | $value = preg_replace('@(<br[ /]*>)\n@','$1',$value); |
| 470 | 534 | $value = preg_replace('@<br[ /]*>@',"\n",$value); |
@@ -475,8 +539,11 @@ discard block |
||
| 475 | 539 | case 'encode_url': |
| 476 | 540 | return urlencode($value); |
| 477 | 541 | case 'base64_decode': |
| 478 | - if($opt!=='false') $opt = true; |
|
| 479 | - else $opt = false; |
|
| 542 | + if($opt!=='false') { |
|
| 543 | + $opt = true; |
|
| 544 | + } else { |
|
| 545 | + $opt = false; |
|
| 546 | + } |
|
| 480 | 547 | return base64_decode($value,$opt); |
| 481 | 548 | case 'encode_sha1': $cmd = 'sha1'; |
| 482 | 549 | case 'addslashes': |
@@ -502,16 +569,19 @@ discard block |
||
| 502 | 569 | return $this->strtoupper($value); |
| 503 | 570 | case 'capitalize': |
| 504 | 571 | $_ = explode(' ',$value); |
| 505 | - foreach($_ as $i=>$v) |
|
| 506 | - { |
|
| 572 | + foreach($_ as $i=>$v) { |
|
| 507 | 573 | $_[$i] = ucfirst($v); |
| 508 | 574 | } |
| 509 | 575 | return implode(' ',$_); |
| 510 | 576 | case 'zenhan': |
| 511 | - if(empty($opt)) $opt='VKas'; |
|
| 577 | + if(empty($opt)) { |
|
| 578 | + $opt='VKas'; |
|
| 579 | + } |
|
| 512 | 580 | return mb_convert_kana($value,$opt,$modx->config['modx_charset']); |
| 513 | 581 | case 'hanzen': |
| 514 | - if(empty($opt)) $opt='VKAS'; |
|
| 582 | + if(empty($opt)) { |
|
| 583 | + $opt='VKAS'; |
|
| 584 | + } |
|
| 515 | 585 | return mb_convert_kana($value,$opt,$modx->config['modx_charset']); |
| 516 | 586 | case 'str_shuffle': |
| 517 | 587 | case 'shuffle': |
@@ -536,13 +606,18 @@ discard block |
||
| 536 | 606 | $value = preg_replace('/\r/', '', $value); |
| 537 | 607 | return count(preg_split('/\n+/',$value)); |
| 538 | 608 | case 'strpos': |
| 539 | - if($opt!=0&&empty($opt)) return $value; |
|
| 609 | + if($opt!=0&&empty($opt)) { |
|
| 610 | + return $value; |
|
| 611 | + } |
|
| 540 | 612 | return $this->strpos($value,$opt); |
| 541 | 613 | case 'wordwrap': |
| 542 | 614 | // default: 70 |
| 543 | 615 | $wrapat = (int)$opt > 0 ? (int)$opt : 70; |
| 544 | - if (version_compare(PHP_VERSION, '5.3.0') >= 0) return $this->includeMdfFile('wordwrap'); |
|
| 545 | - else return preg_replace("@(\b\w+\b)@e","wordwrap('\\1',\$wrapat,' ',1)",$value); |
|
| 616 | + if (version_compare(PHP_VERSION, '5.3.0') >= 0) { |
|
| 617 | + return $this->includeMdfFile('wordwrap'); |
|
| 618 | + } else { |
|
| 619 | + return preg_replace("@(\b\w+\b)@e","wordwrap('\\1',\$wrapat,' ',1)",$value); |
|
| 620 | + } |
|
| 546 | 621 | case 'wrap_text': |
| 547 | 622 | $width = preg_match('/^[1-9][0-9]*$/',$opt) ? $opt : 70; |
| 548 | 623 | if($modx->config['manager_language']==='japanese-utf8') { |
@@ -558,30 +633,36 @@ discard block |
||
| 558 | 633 | $value = $this->substr($value,$width); |
| 559 | 634 | } |
| 560 | 635 | return implode("\n",$chunk); |
| 636 | + } else { |
|
| 637 | + return wordwrap($value,$width,"\n",true); |
|
| 561 | 638 | } |
| 562 | - else |
|
| 563 | - return wordwrap($value,$width,"\n",true); |
|
| 564 | 639 | case 'substr': |
| 565 | - if(empty($opt)) break; |
|
| 640 | + if(empty($opt)) { |
|
| 641 | + break; |
|
| 642 | + } |
|
| 566 | 643 | if(strpos($opt,',')!==false) { |
| 567 | 644 | list($b,$e) = explode(',',$opt,2); |
| 568 | 645 | return $this->substr($value,$b,(int)$e); |
| 646 | + } else { |
|
| 647 | + return $this->substr($value,$opt); |
|
| 569 | 648 | } |
| 570 | - else return $this->substr($value,$opt); |
|
| 571 | 649 | case 'limit': |
| 572 | 650 | case 'trim_to': // http://www.movabletype.jp/documentation/appendices/modifiers/trim_to.html |
| 573 | - if(strpos($opt,'+')!==false) |
|
| 574 | - list($len,$str) = explode('+',$opt,2); |
|
| 575 | - else { |
|
| 651 | + if(strpos($opt,'+')!==false) { |
|
| 652 | + list($len,$str) = explode('+',$opt,2); |
|
| 653 | + } else { |
|
| 576 | 654 | $len = $opt; |
| 577 | 655 | $str = ''; |
| 578 | 656 | } |
| 579 | - if($len==='') $len = 100; |
|
| 580 | - if(abs($len) > $this->strlen($value)) $str =''; |
|
| 657 | + if($len==='') { |
|
| 658 | + $len = 100; |
|
| 659 | + } |
|
| 660 | + if(abs($len) > $this->strlen($value)) { |
|
| 661 | + $str =''; |
|
| 662 | + } |
|
| 581 | 663 | if(preg_match('/^[1-9][0-9]*$/',$len)) { |
| 582 | 664 | return $this->substr($value,0,$len) . $str; |
| 583 | - } |
|
| 584 | - elseif(preg_match('/^\-[1-9][0-9]*$/',$len)) { |
|
| 665 | + } elseif(preg_match('/^\-[1-9][0-9]*$/',$len)) { |
|
| 585 | 666 | return $str . $this->substr($value,$len); |
| 586 | 667 | } |
| 587 | 668 | break; |
@@ -591,18 +672,30 @@ discard block |
||
| 591 | 672 | return $this->includeMdfFile('summary'); |
| 592 | 673 | case 'replace': |
| 593 | 674 | case 'str_replace': |
| 594 | - if(empty($opt) || strpos($opt,',')===false) break; |
|
| 595 | - if (substr_count($opt, ',') ==1) $delim = ','; |
|
| 596 | - elseif(substr_count($opt, '|') ==1) $delim = '|'; |
|
| 597 | - elseif(substr_count($opt, '=>')==1) $delim = '=>'; |
|
| 598 | - elseif(substr_count($opt, '/') ==1) $delim = '/'; |
|
| 599 | - else break; |
|
| 675 | + if(empty($opt) || strpos($opt,',')===false) { |
|
| 676 | + break; |
|
| 677 | + } |
|
| 678 | + if (substr_count($opt, ',') ==1) { |
|
| 679 | + $delim = ','; |
|
| 680 | + } elseif(substr_count($opt, '|') ==1) { |
|
| 681 | + $delim = '|'; |
|
| 682 | + } elseif(substr_count($opt, '=>')==1) { |
|
| 683 | + $delim = '=>'; |
|
| 684 | + } elseif(substr_count($opt, '/') ==1) { |
|
| 685 | + $delim = '/'; |
|
| 686 | + } else { |
|
| 687 | + break; |
|
| 688 | + } |
|
| 600 | 689 | list($s,$r) = explode($delim,$opt); |
| 601 | - if($value!=='') return str_replace($s,$r,$value); |
|
| 690 | + if($value!=='') { |
|
| 691 | + return str_replace($s,$r,$value); |
|
| 692 | + } |
|
| 602 | 693 | break; |
| 603 | 694 | case 'replace_to': |
| 604 | 695 | case 'tpl': |
| 605 | - if($value!=='') return str_replace(array('[+value+]','[+output+]','{value}','%s'),$value,$opt); |
|
| 696 | + if($value!=='') { |
|
| 697 | + return str_replace(array('[+value+]','[+output+]','{value}','%s'),$value,$opt); |
|
| 698 | + } |
|
| 606 | 699 | break; |
| 607 | 700 | case 'eachtpl': |
| 608 | 701 | $value = explode('||',$value); |
@@ -613,59 +706,83 @@ discard block |
||
| 613 | 706 | return implode("\n", $_); |
| 614 | 707 | case 'array_pop': |
| 615 | 708 | case 'array_shift': |
| 616 | - if(strpos($value,'||')!==false) $delim = '||'; |
|
| 617 | - else $delim = ','; |
|
| 709 | + if(strpos($value,'||')!==false) { |
|
| 710 | + $delim = '||'; |
|
| 711 | + } else { |
|
| 712 | + $delim = ','; |
|
| 713 | + } |
|
| 618 | 714 | return $cmd(explode($delim,$value)); |
| 619 | 715 | case 'preg_replace': |
| 620 | 716 | case 'regex_replace': |
| 621 | - if(empty($opt) || strpos($opt,',')===false) break; |
|
| 717 | + if(empty($opt) || strpos($opt,',')===false) { |
|
| 718 | + break; |
|
| 719 | + } |
|
| 622 | 720 | list($s,$r) = explode(',',$opt,2); |
| 623 | - if($value!=='') return preg_replace($s,$r,$value); |
|
| 721 | + if($value!=='') { |
|
| 722 | + return preg_replace($s,$r,$value); |
|
| 723 | + } |
|
| 624 | 724 | break; |
| 625 | 725 | case 'cat': |
| 626 | 726 | case 'concatenate': |
| 627 | 727 | case '.': |
| 628 | - if($value!=='') return $value . $opt; |
|
| 728 | + if($value!=='') { |
|
| 729 | + return $value . $opt; |
|
| 730 | + } |
|
| 629 | 731 | break; |
| 630 | 732 | case 'sprintf': |
| 631 | 733 | case 'string_format': |
| 632 | - if($value!=='') return sprintf($opt,$value); |
|
| 734 | + if($value!=='') { |
|
| 735 | + return sprintf($opt,$value); |
|
| 736 | + } |
|
| 633 | 737 | break; |
| 634 | 738 | case 'number_format': |
| 635 | - if($opt=='') $opt = 0; |
|
| 739 | + if($opt=='') { |
|
| 740 | + $opt = 0; |
|
| 741 | + } |
|
| 636 | 742 | return number_format($value,$opt); |
| 637 | 743 | case 'money_format': |
| 638 | 744 | setlocale(LC_MONETARY,setlocale(LC_TIME,0)); |
| 639 | - if($value!=='') return money_format($opt,(double)$value); |
|
| 745 | + if($value!=='') { |
|
| 746 | + return money_format($opt,(double)$value); |
|
| 747 | + } |
|
| 640 | 748 | break; |
| 641 | 749 | case 'tobool': |
| 642 | 750 | return boolval($value); |
| 643 | 751 | case 'nl2lf': |
| 644 | - if($value!=='') return str_replace(array("\r\n","\n", "\r"), '\n', $value); |
|
| 752 | + if($value!=='') { |
|
| 753 | + return str_replace(array("\r\n","\n", "\r"), '\n', $value); |
|
| 754 | + } |
|
| 645 | 755 | break; |
| 646 | 756 | case 'br2nl': |
| 647 | 757 | return preg_replace('@<br[\s/]*>@i', "\n", $value); |
| 648 | 758 | case 'nl2br': |
| 649 | - if (version_compare(PHP_VERSION, '5.3.0', '<')) |
|
| 650 | - return nl2br($value); |
|
| 651 | - if($opt!=='') |
|
| 652 | - { |
|
| 759 | + if (version_compare(PHP_VERSION, '5.3.0', '<')) { |
|
| 760 | + return nl2br($value); |
|
| 761 | + } |
|
| 762 | + if($opt!=='') { |
|
| 653 | 763 | $opt = trim($opt); |
| 654 | 764 | $opt = strtolower($opt); |
| 655 | - if($opt==='false') $opt = false; |
|
| 656 | - elseif($opt==='0') $opt = false; |
|
| 657 | - else $opt = true; |
|
| 765 | + if($opt==='false') { |
|
| 766 | + $opt = false; |
|
| 767 | + } elseif($opt==='0') { |
|
| 768 | + $opt = false; |
|
| 769 | + } else { |
|
| 770 | + $opt = true; |
|
| 771 | + } |
|
| 772 | + } elseif(isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html') { |
|
| 773 | + $opt = false; |
|
| 774 | + } else { |
|
| 775 | + $opt = true; |
|
| 658 | 776 | } |
| 659 | - elseif(isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html') |
|
| 660 | - $opt = false; |
|
| 661 | - else $opt = true; |
|
| 662 | 777 | return nl2br($value,$opt); |
| 663 | 778 | case 'ltrim': |
| 664 | 779 | case 'rtrim': |
| 665 | 780 | case 'trim': // ref http://mblo.info/modifiers/custom-modifiers/rtrim_opt.html |
| 666 | - if($opt==='') |
|
| 667 | - return $cmd($value); |
|
| 668 | - else return $cmd($value,$opt); |
|
| 781 | + if($opt==='') { |
|
| 782 | + return $cmd($value); |
|
| 783 | + } else { |
|
| 784 | + return $cmd($value,$opt); |
|
| 785 | + } |
|
| 669 | 786 | // These are all straight wrappers for PHP functions |
| 670 | 787 | case 'ucfirst': |
| 671 | 788 | case 'lcfirst': |
@@ -676,15 +793,24 @@ discard block |
||
| 676 | 793 | case 'strftime': |
| 677 | 794 | case 'date': |
| 678 | 795 | case 'dateformat': |
| 679 | - if(empty($opt)) $opt = $modx->toDateFormat(null, 'formatOnly'); |
|
| 680 | - if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value); |
|
| 681 | - if(strpos($opt,'%')!==false) |
|
| 682 | - return strftime($opt,0+$value); |
|
| 683 | - else |
|
| 684 | - return date($opt,0+$value); |
|
| 796 | + if(empty($opt)) { |
|
| 797 | + $opt = $modx->toDateFormat(null, 'formatOnly'); |
|
| 798 | + } |
|
| 799 | + if(!preg_match('@^[0-9]+$@',$value)) { |
|
| 800 | + $value = strtotime($value); |
|
| 801 | + } |
|
| 802 | + if(strpos($opt,'%')!==false) { |
|
| 803 | + return strftime($opt,0+$value); |
|
| 804 | + } else { |
|
| 805 | + return date($opt,0+$value); |
|
| 806 | + } |
|
| 685 | 807 | case 'time': |
| 686 | - if(empty($opt)) $opt = '%H:%M'; |
|
| 687 | - if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value); |
|
| 808 | + if(empty($opt)) { |
|
| 809 | + $opt = '%H:%M'; |
|
| 810 | + } |
|
| 811 | + if(!preg_match('@^[0-9]+$@',$value)) { |
|
| 812 | + $value = strtotime($value); |
|
| 813 | + } |
|
| 688 | 814 | return strftime($opt,0+$value); |
| 689 | 815 | case 'strtotime': |
| 690 | 816 | return strtotime($value); |
@@ -694,7 +820,9 @@ discard block |
||
| 694 | 820 | case 'tofloat': |
| 695 | 821 | return floatval($value); |
| 696 | 822 | case 'round': |
| 697 | - if(!$opt) $opt = 0; |
|
| 823 | + if(!$opt) { |
|
| 824 | + $opt = 0; |
|
| 825 | + } |
|
| 698 | 826 | return $cmd($value,$opt); |
| 699 | 827 | case 'max': |
| 700 | 828 | case 'min': |
@@ -706,28 +834,42 @@ discard block |
||
| 706 | 834 | case 'math': |
| 707 | 835 | case 'calc': |
| 708 | 836 | $value = (int)$value; |
| 709 | - if(empty($value)) $value = '0'; |
|
| 837 | + if(empty($value)) { |
|
| 838 | + $value = '0'; |
|
| 839 | + } |
|
| 710 | 840 | $filter = str_replace(array('[+value+]','[+output+]','{value}','%s'),'?',$opt); |
| 711 | 841 | $filter = preg_replace('@([a-zA-Z\n\r\t\s])@','',$filter); |
| 712 | - if(strpos($filter,'?')===false) $filter = "?{$filter}"; |
|
| 842 | + if(strpos($filter,'?')===false) { |
|
| 843 | + $filter = "?{$filter}"; |
|
| 844 | + } |
|
| 713 | 845 | $filter = str_replace('?',$value,$filter); |
| 714 | 846 | return eval("return {$filter};"); |
| 715 | 847 | case 'count': |
| 716 | - if($value=='') return 0; |
|
| 848 | + if($value=='') { |
|
| 849 | + return 0; |
|
| 850 | + } |
|
| 717 | 851 | $value = explode(',',$value); |
| 718 | 852 | return count($value); |
| 719 | 853 | case 'sort': |
| 720 | 854 | case 'rsort': |
| 721 | - if(strpos($value,"\n")!==false) $delim="\n"; |
|
| 722 | - else $delim = ','; |
|
| 855 | + if(strpos($value,"\n")!==false) { |
|
| 856 | + $delim="\n"; |
|
| 857 | + } else { |
|
| 858 | + $delim = ','; |
|
| 859 | + } |
|
| 723 | 860 | $swap = explode($delim,$value); |
| 724 | - if(!$opt) $opt = SORT_REGULAR; |
|
| 725 | - else $opt = constant($opt); |
|
| 861 | + if(!$opt) { |
|
| 862 | + $opt = SORT_REGULAR; |
|
| 863 | + } else { |
|
| 864 | + $opt = constant($opt); |
|
| 865 | + } |
|
| 726 | 866 | $cmd($swap,$opt); |
| 727 | 867 | return implode($delim,$swap); |
| 728 | 868 | ##### Resource fields |
| 729 | 869 | case 'id': |
| 730 | - if($opt) return $this->getDocumentObject($opt,$key); |
|
| 870 | + if($opt) { |
|
| 871 | + return $this->getDocumentObject($opt,$key); |
|
| 872 | + } |
|
| 731 | 873 | break; |
| 732 | 874 | case 'type': |
| 733 | 875 | case 'contenttype': |
@@ -764,7 +906,9 @@ discard block |
||
| 764 | 906 | case 'privatemgr': |
| 765 | 907 | case 'content_dispo': |
| 766 | 908 | case 'hidemenu': |
| 767 | - if($cmd==='contenttype') $cmd = 'contentType'; |
|
| 909 | + if($cmd==='contenttype') { |
|
| 910 | + $cmd = 'contentType'; |
|
| 911 | + } |
|
| 768 | 912 | return $this->getDocumentObject($value,$cmd); |
| 769 | 913 | case 'title': |
| 770 | 914 | $pagetitle = $this->getDocumentObject($value,'pagetitle'); |
@@ -779,13 +923,20 @@ discard block |
||
| 779 | 923 | $templateName = $modx->db->getValue($rs); |
| 780 | 924 | return !$templateName ? '(blank)' : $templateName; |
| 781 | 925 | case 'getfield': |
| 782 | - if(!$opt) $opt = 'content'; |
|
| 926 | + if(!$opt) { |
|
| 927 | + $opt = 'content'; |
|
| 928 | + } |
|
| 783 | 929 | return $modx->getField($opt,$value); |
| 784 | 930 | case 'children': |
| 785 | 931 | case 'childids': |
| 786 | - if($value=='') $value = 0; // 値がない場合はルートと見なす |
|
| 932 | + if($value=='') { |
|
| 933 | + $value = 0; |
|
| 934 | + } |
|
| 935 | + // 値がない場合はルートと見なす |
|
| 787 | 936 | $published = 1; |
| 788 | - if($opt=='') $opt = 'page'; |
|
| 937 | + if($opt=='') { |
|
| 938 | + $opt = 'page'; |
|
| 939 | + } |
|
| 789 | 940 | $_ = explode(',',$opt); |
| 790 | 941 | $where = array(); |
| 791 | 942 | foreach($_ as $opt) { |
@@ -801,29 +952,43 @@ discard block |
||
| 801 | 952 | $where = implode(' AND ', $where); |
| 802 | 953 | $children = $modx->getDocumentChildren($value, $published, '0', 'id', $where); |
| 803 | 954 | $result = array(); |
| 804 | - foreach((array)$children as $child){ |
|
| 955 | + foreach((array)$children as $child) { |
|
| 805 | 956 | $result[] = $child['id']; |
| 806 | 957 | } |
| 807 | 958 | return implode(',', $result); |
| 808 | 959 | case 'fullurl': |
| 809 | - if(!is_numeric($value)) return $value; |
|
| 960 | + if(!is_numeric($value)) { |
|
| 961 | + return $value; |
|
| 962 | + } |
|
| 810 | 963 | return $modx->makeUrl($value); |
| 811 | 964 | case 'makeurl': |
| 812 | - if(!is_numeric($value)) return $value; |
|
| 813 | - if(!$opt) $opt = 'full'; |
|
| 965 | + if(!is_numeric($value)) { |
|
| 966 | + return $value; |
|
| 967 | + } |
|
| 968 | + if(!$opt) { |
|
| 969 | + $opt = 'full'; |
|
| 970 | + } |
|
| 814 | 971 | return $modx->makeUrl($value,'','',$opt); |
| 815 | 972 | |
| 816 | 973 | ##### File system |
| 817 | 974 | case 'getimageinfo': |
| 818 | 975 | case 'imageinfo': |
| 819 | - if(!is_file($value)) return ''; |
|
| 976 | + if(!is_file($value)) { |
|
| 977 | + return ''; |
|
| 978 | + } |
|
| 820 | 979 | $_ = getimagesize($value); |
| 821 | - if(!$_[0]) return ''; |
|
| 980 | + if(!$_[0]) { |
|
| 981 | + return ''; |
|
| 982 | + } |
|
| 822 | 983 | $info['width'] = $_[0]; |
| 823 | 984 | $info['height'] = $_[1]; |
| 824 | - if ($_[0] > $_[1]) $info['aspect'] = 'landscape'; |
|
| 825 | - elseif($_[0] < $_[1]) $info['aspect'] = 'portrait'; |
|
| 826 | - else $info['aspect'] = 'square'; |
|
| 985 | + if ($_[0] > $_[1]) { |
|
| 986 | + $info['aspect'] = 'landscape'; |
|
| 987 | + } elseif($_[0] < $_[1]) { |
|
| 988 | + $info['aspect'] = 'portrait'; |
|
| 989 | + } else { |
|
| 990 | + $info['aspect'] = 'square'; |
|
| 991 | + } |
|
| 827 | 992 | switch($_[2]) { |
| 828 | 993 | case IMAGETYPE_GIF : $info['type'] = 'gif'; break; |
| 829 | 994 | case IMAGETYPE_JPEG : $info['type'] = 'jpg'; break; |
@@ -842,33 +1007,47 @@ discard block |
||
| 842 | 1007 | |
| 843 | 1008 | case 'file_get_contents': |
| 844 | 1009 | case 'readfile': |
| 845 | - if(!is_file($value)) return $value; |
|
| 1010 | + if(!is_file($value)) { |
|
| 1011 | + return $value; |
|
| 1012 | + } |
|
| 846 | 1013 | $value = realpath($value); |
| 847 | - if(strpos($value,MODX_MANAGER_PATH)!==false) exit('Can not read core file'); |
|
| 1014 | + if(strpos($value,MODX_MANAGER_PATH)!==false) { |
|
| 1015 | + exit('Can not read core file'); |
|
| 1016 | + } |
|
| 848 | 1017 | $ext = strtolower(substr($value,-4)); |
| 849 | - if($ext==='.php') exit('Can not read php file'); |
|
| 850 | - if($ext==='.cgi') exit('Can not read cgi file'); |
|
| 1018 | + if($ext==='.php') { |
|
| 1019 | + exit('Can not read php file'); |
|
| 1020 | + } |
|
| 1021 | + if($ext==='.cgi') { |
|
| 1022 | + exit('Can not read cgi file'); |
|
| 1023 | + } |
|
| 851 | 1024 | return file_get_contents($value); |
| 852 | 1025 | case 'filesize': |
| 853 | - if($value == '') return ''; |
|
| 1026 | + if($value == '') { |
|
| 1027 | + return ''; |
|
| 1028 | + } |
|
| 854 | 1029 | $filename = $value; |
| 855 | 1030 | |
| 856 | 1031 | $site_url = $modx->config['site_url']; |
| 857 | - if(strpos($filename,$site_url) === 0) |
|
| 858 | - $filename = substr($filename,0,strlen($site_url)); |
|
| 1032 | + if(strpos($filename,$site_url) === 0) { |
|
| 1033 | + $filename = substr($filename,0,strlen($site_url)); |
|
| 1034 | + } |
|
| 859 | 1035 | $filename = trim($filename,'/'); |
| 860 | 1036 | |
| 861 | 1037 | $opt = trim($opt,'/'); |
| 862 | - if($opt!=='') $opt .= '/'; |
|
| 1038 | + if($opt!=='') { |
|
| 1039 | + $opt .= '/'; |
|
| 1040 | + } |
|
| 863 | 1041 | |
| 864 | 1042 | $filename = MODX_BASE_PATH.$opt.$filename; |
| 865 | 1043 | |
| 866 | - if(is_file($filename)){ |
|
| 1044 | + if(is_file($filename)) { |
|
| 867 | 1045 | clearstatcache(); |
| 868 | 1046 | $size = filesize($filename); |
| 869 | 1047 | return $size; |
| 1048 | + } else { |
|
| 1049 | + return ''; |
|
| 870 | 1050 | } |
| 871 | - else return ''; |
|
| 872 | 1051 | ##### User info |
| 873 | 1052 | case 'username': |
| 874 | 1053 | case 'fullname': |
@@ -896,32 +1075,47 @@ discard block |
||
| 896 | 1075 | $this->opt = $cmd; |
| 897 | 1076 | return $this->includeMdfFile('moduser'); |
| 898 | 1077 | case 'userinfo': |
| 899 | - if(empty($opt)) $this->opt = 'username'; |
|
| 1078 | + if(empty($opt)) { |
|
| 1079 | + $this->opt = 'username'; |
|
| 1080 | + } |
|
| 900 | 1081 | return $this->includeMdfFile('moduser'); |
| 901 | 1082 | case 'webuserinfo': |
| 902 | - if(empty($opt)) $this->opt = 'username'; |
|
| 1083 | + if(empty($opt)) { |
|
| 1084 | + $this->opt = 'username'; |
|
| 1085 | + } |
|
| 903 | 1086 | $this->value = -$value; |
| 904 | 1087 | return $this->includeMdfFile('moduser'); |
| 905 | 1088 | ##### Special functions |
| 906 | 1089 | case 'ifempty': |
| 907 | 1090 | case '_default': |
| 908 | 1091 | case 'default': |
| 909 | - if (empty($value)) return $opt; break; |
|
| 1092 | + if (empty($value)) { |
|
| 1093 | + return $opt; |
|
| 1094 | + } |
|
| 1095 | + break; |
|
| 910 | 1096 | case 'ifnotempty': |
| 911 | - if (!empty($value)) return $opt; break; |
|
| 1097 | + if (!empty($value)) { |
|
| 1098 | + return $opt; |
|
| 1099 | + } |
|
| 1100 | + break; |
|
| 912 | 1101 | case 'datagrid': |
| 913 | 1102 | include_once(MODX_CORE_PATH . 'controls/datagrid.class.php'); |
| 914 | 1103 | $grd = new DataGrid(null, trim($value)); |
| 915 | 1104 | $grd->itemStyle = ''; |
| 916 | 1105 | $grd->altItemStyle = ''; |
| 917 | 1106 | $pos = strpos($value,"\n"); |
| 918 | - if($pos) $_ = substr($value,0,$pos); |
|
| 919 | - else $_ = $pos; |
|
| 1107 | + if($pos) { |
|
| 1108 | + $_ = substr($value,0,$pos); |
|
| 1109 | + } else { |
|
| 1110 | + $_ = $pos; |
|
| 1111 | + } |
|
| 920 | 1112 | $grd->cdelim = strpos($_,"\t")!==false ? 'tab' : ','; |
| 921 | 1113 | return $grd->render(); |
| 922 | 1114 | case 'rotate': |
| 923 | 1115 | case 'evenodd': |
| 924 | - if(strpos($opt,',')===false) $opt = 'odd,even'; |
|
| 1116 | + if(strpos($opt,',')===false) { |
|
| 1117 | + $opt = 'odd,even'; |
|
| 1118 | + } |
|
| 925 | 1119 | $_ = explode(',', $opt); |
| 926 | 1120 | $c = count($_); |
| 927 | 1121 | $i = $value + $c; |
@@ -930,7 +1124,9 @@ discard block |
||
| 930 | 1124 | case 'takeval': |
| 931 | 1125 | $arr = explode(",",$opt); |
| 932 | 1126 | $idx = $value; |
| 933 | - if(!is_numeric($idx)) return $value; |
|
| 1127 | + if(!is_numeric($idx)) { |
|
| 1128 | + return $value; |
|
| 1129 | + } |
|
| 934 | 1130 | return $arr[$idx]; |
| 935 | 1131 | case 'getimage': |
| 936 | 1132 | return $this->includeMdfFile('getimage'); |
@@ -938,14 +1134,18 @@ discard block |
||
| 938 | 1134 | return $modx->nicesize($value); |
| 939 | 1135 | case 'googlemap': |
| 940 | 1136 | case 'googlemaps': |
| 941 | - if(empty($opt)) $opt = 'border:none;width:500px;height:350px;'; |
|
| 1137 | + if(empty($opt)) { |
|
| 1138 | + $opt = 'border:none;width:500px;height:350px;'; |
|
| 1139 | + } |
|
| 942 | 1140 | $tpl = '<iframe style="[+style+]" src="https://maps.google.co.jp/maps?ll=[+value+]&output=embed&z=15"></iframe>'; |
| 943 | 1141 | $ph['style'] = $opt; |
| 944 | 1142 | $ph['value'] = $value; |
| 945 | 1143 | return $modx->parseText($tpl,$ph); |
| 946 | 1144 | case 'youtube': |
| 947 | 1145 | case 'youtube16x9': |
| 948 | - if(empty($opt)) $opt = 560; |
|
| 1146 | + if(empty($opt)) { |
|
| 1147 | + $opt = 560; |
|
| 1148 | + } |
|
| 949 | 1149 | $h = round($opt*0.5625); |
| 950 | 1150 | $tpl = '<iframe width="%s" height="%s" src="https://www.youtube.com/embed/%s" frameborder="0" allowfullscreen></iframe>'; |
| 951 | 1151 | return sprintf($tpl,$opt,$h,$value); |
@@ -978,7 +1178,8 @@ discard block |
||
| 978 | 1178 | return $value; |
| 979 | 1179 | } |
| 980 | 1180 | |
| 981 | - public function includeMdfFile($cmd) { |
|
| 1181 | + public function includeMdfFile($cmd) |
|
| 1182 | + { |
|
| 982 | 1183 | $modx = evolutionCMS(); |
| 983 | 1184 | $key = $this->key; |
| 984 | 1185 | $value = $this->value; |
@@ -989,55 +1190,65 @@ discard block |
||
| 989 | 1190 | public function getValueFromElement($key, $value, $cmd, $opt) |
| 990 | 1191 | { |
| 991 | 1192 | $modx = evolutionCMS(); |
| 992 | - if( isset($modx->snippetCache[$this->elmName]) ) |
|
| 993 | - { |
|
| 1193 | + if( isset($modx->snippetCache[$this->elmName]) ) { |
|
| 994 | 1194 | $php = $modx->snippetCache[$this->elmName]; |
| 995 | - } |
|
| 996 | - else |
|
| 997 | - { |
|
| 1195 | + } else { |
|
| 998 | 1196 | $esc_elmName = $modx->db->escape($this->elmName); |
| 999 | 1197 | $result = $modx->db->select('snippet','[+prefix+]site_snippets',"name='{$esc_elmName}'"); |
| 1000 | 1198 | $total = $modx->db->getRecordCount($result); |
| 1001 | - if($total == 1) |
|
| 1002 | - { |
|
| 1199 | + if($total == 1) { |
|
| 1003 | 1200 | $row = $modx->db->getRow($result); |
| 1004 | 1201 | $php = $row['snippet']; |
| 1005 | - } |
|
| 1006 | - elseif($total == 0) |
|
| 1007 | - { |
|
| 1202 | + } elseif($total == 0) { |
|
| 1008 | 1203 | $assets_path = MODX_BASE_PATH.'assets/'; |
| 1009 | - if(is_file($assets_path."modifiers/mdf_{$cmd}.inc.php")) |
|
| 1010 | - $modifiers_path = $assets_path."modifiers/mdf_{$cmd}.inc.php"; |
|
| 1011 | - elseif(is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php")) |
|
| 1012 | - $modifiers_path = $assets_path."plugins/phx/modifiers/{$cmd}.phx.php"; |
|
| 1013 | - elseif(is_file(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php")) |
|
| 1014 | - $modifiers_path = MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php"; |
|
| 1015 | - else $modifiers_path = false; |
|
| 1204 | + if(is_file($assets_path."modifiers/mdf_{$cmd}.inc.php")) { |
|
| 1205 | + $modifiers_path = $assets_path."modifiers/mdf_{$cmd}.inc.php"; |
|
| 1206 | + } elseif(is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php")) { |
|
| 1207 | + $modifiers_path = $assets_path."plugins/phx/modifiers/{$cmd}.phx.php"; |
|
| 1208 | + } elseif(is_file(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php")) { |
|
| 1209 | + $modifiers_path = MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php"; |
|
| 1210 | + } else { |
|
| 1211 | + $modifiers_path = false; |
|
| 1212 | + } |
|
| 1016 | 1213 | |
| 1017 | 1214 | if($modifiers_path !== false) { |
| 1018 | 1215 | $php = @file_get_contents($modifiers_path); |
| 1019 | 1216 | $php = trim($php); |
| 1020 | - if(substr($php,0,5)==='<?php') $php = substr($php,6); |
|
| 1021 | - if(substr($php,0,2)==='<?') $php = substr($php,3); |
|
| 1022 | - if(substr($php,-2)==='?>') $php = substr($php,0,-2); |
|
| 1023 | - if($this->elmName!=='') |
|
| 1024 | - $modx->snippetCache[$this->elmName.'Props'] = ''; |
|
| 1025 | - } |
|
| 1026 | - else |
|
| 1027 | - $php = false; |
|
| 1217 | + if(substr($php,0,5)==='<?php') { |
|
| 1218 | + $php = substr($php,6); |
|
| 1219 | + } |
|
| 1220 | + if(substr($php,0,2)==='<?') { |
|
| 1221 | + $php = substr($php,3); |
|
| 1222 | + } |
|
| 1223 | + if(substr($php,-2)==='?>') { |
|
| 1224 | + $php = substr($php,0,-2); |
|
| 1225 | + } |
|
| 1226 | + if($this->elmName!=='') { |
|
| 1227 | + $modx->snippetCache[$this->elmName.'Props'] = ''; |
|
| 1228 | + } |
|
| 1229 | + } else { |
|
| 1230 | + $php = false; |
|
| 1231 | + } |
|
| 1232 | + } else { |
|
| 1233 | + $php = false; |
|
| 1234 | + } |
|
| 1235 | + if($this->elmName!=='') { |
|
| 1236 | + $modx->snippetCache[$this->elmName]= $php; |
|
| 1028 | 1237 | } |
| 1029 | - else $php = false; |
|
| 1030 | - if($this->elmName!=='') $modx->snippetCache[$this->elmName]= $php; |
|
| 1031 | 1238 | } |
| 1032 | - if($php==='') $php=false; |
|
| 1239 | + if($php==='') { |
|
| 1240 | + $php=false; |
|
| 1241 | + } |
|
| 1033 | 1242 | |
| 1034 | - if($php===false) $html = $modx->getChunk($this->elmName); |
|
| 1035 | - else $html = false; |
|
| 1243 | + if($php===false) { |
|
| 1244 | + $html = $modx->getChunk($this->elmName); |
|
| 1245 | + } else { |
|
| 1246 | + $html = false; |
|
| 1247 | + } |
|
| 1036 | 1248 | |
| 1037 | 1249 | $self = '[+output+]'; |
| 1038 | 1250 | |
| 1039 | - if($php !== false) |
|
| 1040 | - { |
|
| 1251 | + if($php !== false) { |
|
| 1041 | 1252 | ob_start(); |
| 1042 | 1253 | $options = $opt; |
| 1043 | 1254 | $output = $value; |
@@ -1049,19 +1260,19 @@ discard block |
||
| 1049 | 1260 | $this->vars['options'] = & $opt; |
| 1050 | 1261 | $custom = eval($php); |
| 1051 | 1262 | $msg = ob_get_contents(); |
| 1052 | - if($value===$this->bt) $value = $msg . $custom; |
|
| 1263 | + if($value===$this->bt) { |
|
| 1264 | + $value = $msg . $custom; |
|
| 1265 | + } |
|
| 1053 | 1266 | ob_end_clean(); |
| 1054 | - } |
|
| 1055 | - elseif($html!==false && isset($value) && $value!=='') |
|
| 1056 | - { |
|
| 1267 | + } elseif($html!==false && isset($value) && $value!=='') { |
|
| 1057 | 1268 | $html = str_replace(array($self,'[+value+]'), $value, $html); |
| 1058 | 1269 | $value = str_replace(array('[+options+]','[+param+]'), $opt, $html); |
| 1270 | + } else { |
|
| 1271 | + return false; |
|
| 1059 | 1272 | } |
| 1060 | - else return false; |
|
| 1061 | 1273 | |
| 1062 | 1274 | if($php===false && $html===false && $value!=='' |
| 1063 | - && (strpos($cmd,'[+value+]')!==false || strpos($cmd,$self)!==false)) |
|
| 1064 | - { |
|
| 1275 | + && (strpos($cmd,'[+value+]')!==false || strpos($cmd,$self)!==false)) { |
|
| 1065 | 1276 | $value = str_replace(array('[+value+]',$self),$value,$cmd); |
| 1066 | 1277 | } |
| 1067 | 1278 | return $value; |
@@ -1071,23 +1282,39 @@ discard block |
||
| 1071 | 1282 | { |
| 1072 | 1283 | $modx = evolutionCMS(); |
| 1073 | 1284 | |
| 1074 | - if(strpos($content,'[')===false && strpos($content,'{')===false) return $content; |
|
| 1285 | + if(strpos($content,'[')===false && strpos($content,'{')===false) { |
|
| 1286 | + return $content; |
|
| 1287 | + } |
|
| 1075 | 1288 | |
| 1076 | - if(!$modx->maxParserPasses) $modx->maxParserPasses = 10; |
|
| 1289 | + if(!$modx->maxParserPasses) { |
|
| 1290 | + $modx->maxParserPasses = 10; |
|
| 1291 | + } |
|
| 1077 | 1292 | $bt=''; |
| 1078 | 1293 | $i=0; |
| 1079 | - while($bt!==$content) |
|
| 1080 | - { |
|
| 1294 | + while($bt!==$content) { |
|
| 1081 | 1295 | $bt = $content; |
| 1082 | - if(strpos($content,'[*')!==false && $modx->documentIdentifier) |
|
| 1083 | - $content = $modx->mergeDocumentContent($content); |
|
| 1084 | - if(strpos($content,'[(')!==false) $content = $modx->mergeSettingsContent($content); |
|
| 1085 | - if(strpos($content,'{{')!==false) $content = $modx->mergeChunkContent($content); |
|
| 1086 | - if(strpos($content,'[!')!==false) $content = str_replace(array('[!','!]'),array('[[',']]'),$content); |
|
| 1087 | - if(strpos($content,'[[')!==false) $content = $modx->evalSnippets($content); |
|
| 1088 | - |
|
| 1089 | - if($content===$bt) break; |
|
| 1090 | - if($modx->maxParserPasses < $i) break; |
|
| 1296 | + if(strpos($content,'[*')!==false && $modx->documentIdentifier) { |
|
| 1297 | + $content = $modx->mergeDocumentContent($content); |
|
| 1298 | + } |
|
| 1299 | + if(strpos($content,'[(')!==false) { |
|
| 1300 | + $content = $modx->mergeSettingsContent($content); |
|
| 1301 | + } |
|
| 1302 | + if(strpos($content,'{{')!==false) { |
|
| 1303 | + $content = $modx->mergeChunkContent($content); |
|
| 1304 | + } |
|
| 1305 | + if(strpos($content,'[!')!==false) { |
|
| 1306 | + $content = str_replace(array('[!','!]'),array('[[',']]'),$content); |
|
| 1307 | + } |
|
| 1308 | + if(strpos($content,'[[')!==false) { |
|
| 1309 | + $content = $modx->evalSnippets($content); |
|
| 1310 | + } |
|
| 1311 | + |
|
| 1312 | + if($content===$bt) { |
|
| 1313 | + break; |
|
| 1314 | + } |
|
| 1315 | + if($modx->maxParserPasses < $i) { |
|
| 1316 | + break; |
|
| 1317 | + } |
|
| 1091 | 1318 | $i++; |
| 1092 | 1319 | } |
| 1093 | 1320 | return $content; |
@@ -1098,103 +1325,138 @@ discard block |
||
| 1098 | 1325 | $modx = evolutionCMS(); |
| 1099 | 1326 | |
| 1100 | 1327 | $target = trim($target); |
| 1101 | - if(empty($target)) $target = $modx->config['site_start']; |
|
| 1102 | - if(preg_match('@^[1-9][0-9]*$@',$target)) $method='id'; |
|
| 1103 | - else $method = 'alias'; |
|
| 1328 | + if(empty($target)) { |
|
| 1329 | + $target = $modx->config['site_start']; |
|
| 1330 | + } |
|
| 1331 | + if(preg_match('@^[1-9][0-9]*$@',$target)) { |
|
| 1332 | + $method='id'; |
|
| 1333 | + } else { |
|
| 1334 | + $method = 'alias'; |
|
| 1335 | + } |
|
| 1104 | 1336 | |
| 1105 | - if(!isset($this->documentObject[$target])) |
|
| 1106 | - { |
|
| 1337 | + if(!isset($this->documentObject[$target])) { |
|
| 1107 | 1338 | $this->documentObject[$target] = $modx->getDocumentObject($method,$target,'direct'); |
| 1108 | 1339 | } |
| 1109 | 1340 | |
| 1110 | - if($this->documentObject[$target]['publishedon']==='0') |
|
| 1111 | - return ''; |
|
| 1112 | - elseif(isset($this->documentObject[$target][$field])) |
|
| 1113 | - { |
|
| 1114 | - if(is_array($this->documentObject[$target][$field])) |
|
| 1115 | - { |
|
| 1341 | + if($this->documentObject[$target]['publishedon']==='0') { |
|
| 1342 | + return ''; |
|
| 1343 | + } elseif(isset($this->documentObject[$target][$field])) { |
|
| 1344 | + if(is_array($this->documentObject[$target][$field])) { |
|
| 1116 | 1345 | $a = $modx->getTemplateVarOutput($field,$target); |
| 1117 | 1346 | $this->documentObject[$target][$field] = $a[$field]; |
| 1118 | 1347 | } |
| 1348 | + } else { |
|
| 1349 | + $this->documentObject[$target][$field] = false; |
|
| 1119 | 1350 | } |
| 1120 | - else $this->documentObject[$target][$field] = false; |
|
| 1121 | 1351 | |
| 1122 | 1352 | return $this->documentObject[$target][$field]; |
| 1123 | 1353 | } |
| 1124 | 1354 | |
| 1125 | - public function setPlaceholders($value = '', $key = '', $path = '') { |
|
| 1126 | - if($path!=='') $key = "{$path}.{$key}"; |
|
| 1355 | + public function setPlaceholders($value = '', $key = '', $path = '') |
|
| 1356 | + { |
|
| 1357 | + if($path!=='') { |
|
| 1358 | + $key = "{$path}.{$key}"; |
|
| 1359 | + } |
|
| 1127 | 1360 | if (is_array($value)) { |
| 1128 | 1361 | foreach ($value as $subkey => $subval) { |
| 1129 | 1362 | $this->setPlaceholders($subval, $subkey, $key); |
| 1130 | 1363 | } |
| 1364 | + } else { |
|
| 1365 | + $this->setModifiersVariable($key, $value); |
|
| 1131 | 1366 | } |
| 1132 | - else $this->setModifiersVariable($key, $value); |
|
| 1133 | 1367 | } |
| 1134 | 1368 | |
| 1135 | 1369 | // Sets a placeholder variable which can only be access by Modifiers |
| 1136 | - public function setModifiersVariable($key, $value) { |
|
| 1137 | - if ($key != 'phx' && $key != 'dummy') $this->placeholders[$key] = $value; |
|
| 1370 | + public function setModifiersVariable($key, $value) |
|
| 1371 | + { |
|
| 1372 | + if ($key != 'phx' && $key != 'dummy') { |
|
| 1373 | + $this->placeholders[$key] = $value; |
|
| 1374 | + } |
|
| 1138 | 1375 | } |
| 1139 | 1376 | |
| 1140 | 1377 | //mbstring |
| 1141 | - public function substr($str, $s, $l = null) { |
|
| 1378 | + public function substr($str, $s, $l = null) |
|
| 1379 | + { |
|
| 1142 | 1380 | $modx = evolutionCMS(); |
| 1143 | - if(is_null($l)) $l = $this->strlen($str); |
|
| 1144 | - if (function_exists('mb_substr')) |
|
| 1145 | - { |
|
| 1146 | - if(strpos($str,"\r")!==false) |
|
| 1147 | - $str = str_replace(array("\r\n","\r"), "\n", $str); |
|
| 1381 | + if(is_null($l)) { |
|
| 1382 | + $l = $this->strlen($str); |
|
| 1383 | + } |
|
| 1384 | + if (function_exists('mb_substr')) { |
|
| 1385 | + if(strpos($str,"\r")!==false) { |
|
| 1386 | + $str = str_replace(array("\r\n","\r"), "\n", $str); |
|
| 1387 | + } |
|
| 1148 | 1388 | return mb_substr($str, $s, $l, $modx->config['modx_charset']); |
| 1149 | 1389 | } |
| 1150 | 1390 | return substr($str, $s, $l); |
| 1151 | 1391 | } |
| 1152 | - public function strpos($haystack,$needle,$offset=0) { |
|
| 1392 | + public function strpos($haystack,$needle,$offset=0) |
|
| 1393 | + { |
|
| 1153 | 1394 | $modx = evolutionCMS(); |
| 1154 | - if (function_exists('mb_strpos')) return mb_strpos($haystack,$needle,$offset,$modx->config['modx_charset']); |
|
| 1395 | + if (function_exists('mb_strpos')) { |
|
| 1396 | + return mb_strpos($haystack,$needle,$offset,$modx->config['modx_charset']); |
|
| 1397 | + } |
|
| 1155 | 1398 | return strpos($haystack,$needle,$offset); |
| 1156 | 1399 | } |
| 1157 | - public function strlen($str) { |
|
| 1400 | + public function strlen($str) |
|
| 1401 | + { |
|
| 1158 | 1402 | $modx = evolutionCMS(); |
| 1159 | - if (function_exists('mb_strlen')) return mb_strlen(str_replace("\r\n", "\n", $str),$modx->config['modx_charset']); |
|
| 1403 | + if (function_exists('mb_strlen')) { |
|
| 1404 | + return mb_strlen(str_replace("\r\n", "\n", $str),$modx->config['modx_charset']); |
|
| 1405 | + } |
|
| 1160 | 1406 | return strlen($str); |
| 1161 | 1407 | } |
| 1162 | - public function strtolower($str) { |
|
| 1163 | - if (function_exists('mb_strtolower')) return mb_strtolower($str); |
|
| 1408 | + public function strtolower($str) |
|
| 1409 | + { |
|
| 1410 | + if (function_exists('mb_strtolower')) { |
|
| 1411 | + return mb_strtolower($str); |
|
| 1412 | + } |
|
| 1164 | 1413 | return strtolower($str); |
| 1165 | 1414 | } |
| 1166 | - public function strtoupper($str) { |
|
| 1167 | - if (function_exists('mb_strtoupper')) return mb_strtoupper($str); |
|
| 1415 | + public function strtoupper($str) |
|
| 1416 | + { |
|
| 1417 | + if (function_exists('mb_strtoupper')) { |
|
| 1418 | + return mb_strtoupper($str); |
|
| 1419 | + } |
|
| 1168 | 1420 | return strtoupper($str); |
| 1169 | 1421 | } |
| 1170 | - public function ucfirst($str) { |
|
| 1171 | - if (function_exists('mb_strtoupper')) |
|
| 1172 | - return mb_strtoupper($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str)); |
|
| 1422 | + public function ucfirst($str) |
|
| 1423 | + { |
|
| 1424 | + if (function_exists('mb_strtoupper')) { |
|
| 1425 | + return mb_strtoupper($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str)); |
|
| 1426 | + } |
|
| 1173 | 1427 | return ucfirst($str); |
| 1174 | 1428 | } |
| 1175 | - public function lcfirst($str) { |
|
| 1176 | - if (function_exists('mb_strtolower')) |
|
| 1177 | - return mb_strtolower($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str)); |
|
| 1429 | + public function lcfirst($str) |
|
| 1430 | + { |
|
| 1431 | + if (function_exists('mb_strtolower')) { |
|
| 1432 | + return mb_strtolower($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str)); |
|
| 1433 | + } |
|
| 1178 | 1434 | return lcfirst($str); |
| 1179 | 1435 | } |
| 1180 | - public function ucwords($str) { |
|
| 1181 | - if (function_exists('mb_convert_case')) |
|
| 1182 | - return mb_convert_case($str, MB_CASE_TITLE); |
|
| 1436 | + public function ucwords($str) |
|
| 1437 | + { |
|
| 1438 | + if (function_exists('mb_convert_case')) { |
|
| 1439 | + return mb_convert_case($str, MB_CASE_TITLE); |
|
| 1440 | + } |
|
| 1183 | 1441 | return ucwords($str); |
| 1184 | 1442 | } |
| 1185 | - public function strrev($str) { |
|
| 1443 | + public function strrev($str) |
|
| 1444 | + { |
|
| 1186 | 1445 | preg_match_all('/./us', $str, $ar); |
| 1187 | 1446 | return implode(array_reverse($ar[0])); |
| 1188 | 1447 | } |
| 1189 | - public function str_shuffle($str) { |
|
| 1448 | + public function str_shuffle($str) |
|
| 1449 | + { |
|
| 1190 | 1450 | preg_match_all('/./us', $str, $ar); |
| 1191 | 1451 | shuffle($ar[0]); |
| 1192 | 1452 | return implode($ar[0]); |
| 1193 | 1453 | } |
| 1194 | - public function str_word_count($str) { |
|
| 1454 | + public function str_word_count($str) |
|
| 1455 | + { |
|
| 1195 | 1456 | return count(preg_split('~[^\p{L}\p{N}\']+~u',$str)); |
| 1196 | 1457 | } |
| 1197 | - public function strip_tags($value,$params='') { |
|
| 1458 | + public function strip_tags($value,$params='') |
|
| 1459 | + { |
|
| 1198 | 1460 | $modx = evolutionCMS(); |
| 1199 | 1461 | |
| 1200 | 1462 | if(stripos($params,'style')===false && stripos($value,'</style>')!==false) { |
