@@ -101,7 +101,9 @@ discard block |
||
| 101 | 101 | $this->dlParams['table'] = $this->data->tableName(); |
| 102 | 102 | $this->dlParams['idField'] = $this->data->fieldPKName(); |
| 103 | 103 | $this->dlParams['addWhereList'] = "`{$this->rfName}`={$this->rid}"; |
| 104 | - if (isset($_REQUEST['rows'])) $this->dlParams['display'] = (int)$_REQUEST['rows']; |
|
| 104 | + if (isset($_REQUEST['rows'])) {
|
|
| 105 | + $this->dlParams['display'] = (int)$_REQUEST['rows']; |
|
| 106 | + } |
|
| 105 | 107 | $offset = isset($_REQUEST['page']) ? (int)$_REQUEST['page'] : 1; |
| 106 | 108 | $offset = $offset ? $offset : 1; |
| 107 | 109 | $offset = $this->dlParams['display']*abs($offset-1); |
@@ -113,7 +115,9 @@ discard block |
||
| 113 | 115 | $this->dlParams['sortDir'] = $_REQUEST['order']; |
| 114 | 116 | } |
| 115 | 117 | foreach ($this->dlParams as &$param) { |
| 116 | - if (empty($param)) unset($param); |
|
| 118 | + if (empty($param)) {
|
|
| 119 | + unset($param); |
|
| 120 | + } |
|
| 117 | 121 | } |
| 118 | 122 | } |
| 119 | 123 | |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php namespace SimpleTab; |
| 2 | 2 | |
| 3 | -require_once(MODX_BASE_PATH . 'assets/lib/Helpers/FS.php'); |
|
| 3 | +require_once(MODX_BASE_PATH.'assets/lib/Helpers/FS.php'); |
|
| 4 | 4 | |
| 5 | 5 | /** |
| 6 | 6 | * Class AbstractController |
@@ -186,8 +186,8 @@ discard block |
||
| 186 | 186 | public function getLanguageCode() |
| 187 | 187 | { |
| 188 | 188 | $manager_language = $this->modx->config['manager_language']; |
| 189 | - if (file_exists(MODX_MANAGER_PATH . "includes/lang/" . $manager_language . ".inc.php")) { |
|
| 190 | - include_once MODX_MANAGER_PATH . "includes/lang/" . $manager_language . ".inc.php"; |
|
| 189 | + if (file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) { |
|
| 190 | + include_once MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php"; |
|
| 191 | 191 | } |
| 192 | 192 | return isset($modx_lang_attribute) ? $modx_lang_attribute : null; |
| 193 | 193 | } |
@@ -108,7 +108,9 @@ discard block |
||
| 108 | 108 | } else if ($this->_useCut !== true && (mb_strlen($resource, 'UTF-8') > $truncLen)) { |
| 109 | 109 | |
| 110 | 110 | $summary = $this->html_substr($resource, $truncLen, $truncOffset, $truncChars); |
| 111 | - if ($resource != $summary) $this->_useSubstr = true; |
|
| 111 | + if ($resource != $summary) {
|
|
| 112 | + $this->_useSubstr = true; |
|
| 113 | + } |
|
| 112 | 114 | } else { |
| 113 | 115 | $summary = $resource; |
| 114 | 116 | } |
@@ -149,15 +151,23 @@ discard block |
||
| 149 | 151 | } |
| 150 | 152 | // Slash signifies an ending (like </a> or ... />) |
| 151 | 153 | // substract 2 |
| 152 | - if ($current_char == '/' && $tag_counter <> 0) $tag_counter -= 2; |
|
| 154 | + if ($current_char == '/' && $tag_counter <> 0) {
|
|
| 155 | + $tag_counter -= 2; |
|
| 156 | + } |
|
| 153 | 157 | // On a ">" substract 1 |
| 154 | - if ($current_char == '>') $tag_counter -= 1; |
|
| 158 | + if ($current_char == '>') {
|
|
| 159 | + $tag_counter -= 1; |
|
| 160 | + } |
|
| 155 | 161 | // If quotes are encountered, start ignoring the tags |
| 156 | 162 | // (for directory slashes) |
| 157 | - if ($current_char == '"') $quotes_on = TRUE; |
|
| 163 | + if ($current_char == '"') {
|
|
| 164 | + $quotes_on = TRUE; |
|
| 165 | + } |
|
| 158 | 166 | } else { |
| 159 | 167 | // IF quotes are encountered again, turn it back off |
| 160 | - if ($current_char == '"') $quotes_on = FALSE; |
|
| 168 | + if ($current_char == '"') {
|
|
| 169 | + $quotes_on = FALSE; |
|
| 170 | + } |
|
| 161 | 171 | } |
| 162 | 172 | |
| 163 | 173 | // Count only the chars outside html tags |
@@ -185,7 +195,9 @@ discard block |
||
| 185 | 195 | // Original PHP code from The Art of Web: www.the-art-of-web.com |
| 186 | 196 | |
| 187 | 197 | // return with no change if string is shorter than $limit |
| 188 | - if (mb_strlen($string, 'UTF-8') < $limit) return $string; |
|
| 198 | + if (mb_strlen($string, 'UTF-8') < $limit) {
|
|
| 199 | + return $string; |
|
| 200 | + } |
|
| 189 | 201 | |
| 190 | 202 | $string = mb_substr($string, 0, $limit, 'UTF-8'); |
| 191 | 203 | if (false !== ($breakpoint = mb_strrpos($string, $break, 'UTF-8'))) { |
@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | * @date 31.07.2013 |
| 13 | 13 | * @version 1.0.3 |
| 14 | 14 | */ |
| 15 | -include_once(MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php'); |
|
| 15 | +include_once(MODX_BASE_PATH.'assets/lib/APIHelpers.class.php'); |
|
| 16 | 16 | class SummaryText |
| 17 | 17 | { |
| 18 | 18 | private $_cfg = array('content' => '', 'summary' => '', 'original' => '', 'break' => ''); |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | protected function beforeCut($resource, $splitter = '') |
| 92 | 92 | { |
| 93 | 93 | if ($splitter !== '') { |
| 94 | - $summary = str_replace('<p>' . $splitter . '</p>', $splitter, $resource); // For TinyMCE or if it isn't wrapped inside paragraph tags |
|
| 94 | + $summary = str_replace('<p>'.$splitter.'</p>', $splitter, $resource); // For TinyMCE or if it isn't wrapped inside paragraph tags |
|
| 95 | 95 | $summary = explode($splitter, $summary, 2); |
| 96 | 96 | $this->_useCut = isset($summary[1]); |
| 97 | 97 | $summary = $summary['0']; |
@@ -252,10 +252,10 @@ discard block |
||
| 252 | 252 | $tag = mb_substr($tag, 0, strpos($tag, ' '), 'UTF-8'); |
| 253 | 253 | } |
| 254 | 254 | if (!mb_stristr($tag, 'br', 'UTF-8') && !mb_stristr($tag, 'img', 'UTF-8') && !empty ($tag)) { |
| 255 | - $endTags .= '</' . $tag . '>'; |
|
| 255 | + $endTags .= '</'.$tag.'>'; |
|
| 256 | 256 | } |
| 257 | 257 | } |
| 258 | 258 | } |
| 259 | - return $text . $endTags; |
|
| 259 | + return $text.$endTags; |
|
| 260 | 260 | } |
| 261 | 261 | } |
| 262 | 262 | \ No newline at end of file |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | /** |
| 72 | - * @return mixed |
|
| 72 | + * @return string |
|
| 73 | 73 | */ |
| 74 | 74 | public function getCut() |
| 75 | 75 | { |
@@ -149,8 +149,8 @@ discard block |
||
| 149 | 149 | /** |
| 150 | 150 | * @param $resource |
| 151 | 151 | * @param $truncLen |
| 152 | - * @param $truncOffset |
|
| 153 | - * @param $truncChars |
|
| 152 | + * @param integer $truncOffset |
|
| 153 | + * @param boolean $truncChars |
|
| 154 | 154 | * @param string $splitter |
| 155 | 155 | * @return array|mixed|string |
| 156 | 156 | */ |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | */ |
| 243 | 243 | /** |
| 244 | 244 | * @param $string |
| 245 | - * @param $limit |
|
| 245 | + * @param integer $limit |
|
| 246 | 246 | * @param string $break |
| 247 | 247 | * @return string |
| 248 | 248 | */ |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | /** |
| 268 | - * @param $str |
|
| 268 | + * @param string $str |
|
| 269 | 269 | * @return mixed |
| 270 | 270 | */ |
| 271 | 271 | protected function rTriming($str) |
@@ -40,7 +40,9 @@ discard block |
||
| 40 | 40 | $this->maxPasses = ($maxpass != '') ? $maxpass : 50; |
| 41 | 41 | $this->swapSnippetCache = array(); |
| 42 | 42 | $modx->setPlaceholder("phx", "&_PHX_INTERNAL_&"); |
| 43 | - if (function_exists('mb_internal_encoding')) mb_internal_encoding($modx->config['modx_charset']); |
|
| 43 | + if (function_exists('mb_internal_encoding')) {
|
|
| 44 | + mb_internal_encoding($modx->config['modx_charset']); |
|
| 45 | + } |
|
| 44 | 46 | } |
| 45 | 47 | |
| 46 | 48 | // Plugin event hook for MODx |
@@ -60,7 +62,9 @@ discard block |
||
| 60 | 62 | { |
| 61 | 63 | global $modx; |
| 62 | 64 | // If we already reached max passes don't get at it again. |
| 63 | - if ($this->curPass == $this->maxPasses) return $template; |
|
| 65 | + if ($this->curPass == $this->maxPasses) {
|
|
| 66 | + return $template; |
|
| 67 | + } |
|
| 64 | 68 | // Set template pre-process hash |
| 65 | 69 | $st = md5($template); |
| 66 | 70 | // Replace non-call characters in the template: [, ] |
@@ -78,7 +82,9 @@ discard block |
||
| 78 | 82 | // Set template post-process hash |
| 79 | 83 | $et = md5($template); |
| 80 | 84 | // If template has changed, parse it once more... |
| 81 | - if ($st != $et) $template = $this->Parse($template); |
|
| 85 | + if ($st != $et) {
|
|
| 86 | + $template = $this->Parse($template); |
|
| 87 | + } |
|
| 82 | 88 | // Write an event log if debugging is enabled and there is something to log |
| 83 | 89 | if ($this->debug && $this->debugLog) { |
| 84 | 90 | $modx->logEvent($this->curPass, 1, $this->createEventLog(), $this->name . ' ' . $this->version); |
@@ -196,9 +202,13 @@ discard block |
||
| 196 | 202 | $et = md5($template); // Post-process template hash |
| 197 | 203 | |
| 198 | 204 | // Log an event if this was the maximum pass |
| 199 | - if ($this->curPass == $this->maxPasses) $this->Log("Max passes reached. infinite loop protection so exiting.\n If you need the extra passes set the max passes to the highest count of nested tags in your template."); |
|
| 205 | + if ($this->curPass == $this->maxPasses) {
|
|
| 206 | + $this->Log("Max passes reached. infinite loop protection so exiting.\n If you need the extra passes set the max passes to the highest count of nested tags in your template.");
|
|
| 207 | + } |
|
| 200 | 208 | // If this pass is not at maximum passes and the template hash is not the same, get at it again. |
| 201 | - if (($this->curPass < $this->maxPasses) && ($st != $et)) $template = $this->ParseValues($template); |
|
| 209 | + if (($this->curPass < $this->maxPasses) && ($st != $et)) {
|
|
| 210 | + $template = $this->ParseValues($template); |
|
| 211 | + } |
|
| 202 | 212 | |
| 203 | 213 | return $template; |
| 204 | 214 | } |
@@ -217,7 +227,9 @@ discard block |
||
| 217 | 227 | for ($i = 0; $i < $count; $i++) { |
| 218 | 228 | $output = trim($output); |
| 219 | 229 | $this->Log(" |--- Modifier = '" . $modifier_cmd[$i] . "'"); |
| 220 | - if ($modifier_value[$i] != '') $this->Log(" |--- Options = '" . $modifier_value[$i] . "'"); |
|
| 230 | + if ($modifier_value[$i] != '') {
|
|
| 231 | + $this->Log(" |--- Options = '" . $modifier_value[$i] . "'");
|
|
| 232 | + } |
|
| 221 | 233 | switch ($modifier_cmd[$i]) { |
| 222 | 234 | ##### Conditional Modifiers |
| 223 | 235 | case "input": |
@@ -260,7 +272,9 @@ discard block |
||
| 260 | 272 | case "ir": |
| 261 | 273 | case "memberof": |
| 262 | 274 | case "mo": // Is Member Of (same as inrole but this one can be stringed as a conditional) |
| 263 | - if ($output == "&_PHX_INTERNAL_&") $output = $this->user["id"]; |
|
| 275 | + if ($output == "&_PHX_INTERNAL_&") {
|
|
| 276 | + $output = $this->user["id"]; |
|
| 277 | + } |
|
| 264 | 278 | $grps = ($this->strlen($modifier_value[$i]) > 0) ? explode(",", $modifier_value[$i]) : array(); |
| 265 | 279 | $condition[] = intval($this->isMemberOfWebGroupByUserId($output, $grps)); |
| 266 | 280 | break; |
@@ -377,11 +391,15 @@ discard block |
||
| 377 | 391 | $output = eval("return " . $filter . ";"); |
| 378 | 392 | break; |
| 379 | 393 | case "isnotempty": |
| 380 | - if (!empty($output)) $output = $modifier_value[$i]; |
|
| 394 | + if (!empty($output)) {
|
|
| 395 | + $output = $modifier_value[$i]; |
|
| 396 | + } |
|
| 381 | 397 | break; |
| 382 | 398 | case "isempty": |
| 383 | 399 | case "ifempty": |
| 384 | - if (empty($output)) $output = $modifier_value[$i]; |
|
| 400 | + if (empty($output)) {
|
|
| 401 | + $output = $modifier_value[$i]; |
|
| 402 | + } |
|
| 385 | 403 | break; |
| 386 | 404 | case "nl2br": |
| 387 | 405 | $output = nl2br($output); |
@@ -391,7 +409,9 @@ discard block |
||
| 391 | 409 | break; |
| 392 | 410 | case "set": |
| 393 | 411 | $c = $i + 1; |
| 394 | - if ($count > $c && $modifier_cmd[$c] == "value") $output = preg_replace("~([^a-zA-Z0-9])~", "", $modifier_value[$i]); |
|
| 412 | + if ($count > $c && $modifier_cmd[$c] == "value") {
|
|
| 413 | + $output = preg_replace("~([^a-zA-Z0-9])~", "", $modifier_value[$i]);
|
|
| 414 | + } |
|
| 395 | 415 | break; |
| 396 | 416 | case "value": |
| 397 | 417 | if ($i > 0 && $modifier_cmd[$i - 1] == "set") { |
@@ -403,11 +423,15 @@ discard block |
||
| 403 | 423 | $output = md5($output); |
| 404 | 424 | break; |
| 405 | 425 | case "userinfo": |
| 406 | - if ($output == "&_PHX_INTERNAL_&") $output = $this->user["id"]; |
|
| 426 | + if ($output == "&_PHX_INTERNAL_&") {
|
|
| 427 | + $output = $this->user["id"]; |
|
| 428 | + } |
|
| 407 | 429 | $output = $this->ModUser($output, $modifier_value[$i]); |
| 408 | 430 | break; |
| 409 | 431 | case "inrole": // deprecated |
| 410 | - if ($output == "&_PHX_INTERNAL_&") $output = $this->user["id"]; |
|
| 432 | + if ($output == "&_PHX_INTERNAL_&") {
|
|
| 433 | + $output = $this->user["id"]; |
|
| 434 | + } |
|
| 411 | 435 | $grps = ($this->strlen($modifier_value[$i]) > 0) ? explode(",", $modifier_value[$i]) : array(); |
| 412 | 436 | $output = intval($this->isMemberOfWebGroupByUserId($output, $grps)); |
| 413 | 437 | break; |
@@ -451,7 +475,9 @@ discard block |
||
| 451 | 475 | ob_end_clean(); |
| 452 | 476 | break; |
| 453 | 477 | } |
| 454 | - if (count($condition)) $this->Log(" |--- Condition = '" . $condition[count($condition) - 1] . "'"); |
|
| 478 | + if (count($condition)) {
|
|
| 479 | + $this->Log(" |--- Condition = '" . $condition[count($condition) - 1] . "'");
|
|
| 480 | + } |
|
| 455 | 481 | $this->Log(" |--- Output = '" . $output . "'"); |
| 456 | 482 | } |
| 457 | 483 | } |
@@ -531,7 +557,9 @@ discard block |
||
| 531 | 557 | global $modx; |
| 532 | 558 | |
| 533 | 559 | // if $groupNames is not an array return false |
| 534 | - if (!is_array($groupNames)) return false; |
|
| 560 | + if (!is_array($groupNames)) {
|
|
| 561 | + return false; |
|
| 562 | + } |
|
| 535 | 563 | |
| 536 | 564 | // if the user id is a negative number make it positive |
| 537 | 565 | if (intval($userid) < 0) { |
@@ -548,8 +576,9 @@ discard block |
||
| 548 | 576 | $grpNames = $this->cache["mo"][$userid]; |
| 549 | 577 | } |
| 550 | 578 | // Check if a supplied group matches a webgroup from the array we just created |
| 551 | - foreach ($groupNames as $k => $v) |
|
| 552 | - if (in_array(trim($v), $grpNames)) return true; |
|
| 579 | + foreach ($groupNames as $k => $v) {
|
|
| 580 | + if (in_array(trim($v), $grpNames)) return true; |
|
| 581 | + } |
|
| 553 | 582 | |
| 554 | 583 | // If we get here the above logic did not find a match, so return false |
| 555 | 584 | return false; |
@@ -572,52 +601,65 @@ discard block |
||
| 572 | 601 | // Sets a placeholder variable which can only be access by PHx |
| 573 | 602 | function setPHxVariable($name, $value) |
| 574 | 603 | { |
| 575 | - if ($name != "phx") $this->placeholders[$name] = $value; |
|
| 604 | + if ($name != "phx") {
|
|
| 605 | + $this->placeholders[$name] = $value; |
|
| 606 | + } |
|
| 576 | 607 | } |
| 577 | 608 | |
| 578 | 609 | //mbstring |
| 579 | 610 | function substr($str, $s, $l = null) |
| 580 | 611 | { |
| 581 | - if (function_exists('mb_substr')) return mb_substr($str, $s, $l); |
|
| 612 | + if (function_exists('mb_substr')) {
|
|
| 613 | + return mb_substr($str, $s, $l); |
|
| 614 | + } |
|
| 582 | 615 | return substr($str, $s, $l); |
| 583 | 616 | } |
| 584 | 617 | |
| 585 | 618 | function strlen($str) |
| 586 | 619 | { |
| 587 | - if (function_exists('mb_strlen')) return mb_strlen($str); |
|
| 620 | + if (function_exists('mb_strlen')) {
|
|
| 621 | + return mb_strlen($str); |
|
| 622 | + } |
|
| 588 | 623 | return strlen($str); |
| 589 | 624 | } |
| 590 | 625 | |
| 591 | 626 | function strtolower($str) |
| 592 | 627 | { |
| 593 | - if (function_exists('mb_strtolower')) return mb_strtolower($str); |
|
| 628 | + if (function_exists('mb_strtolower')) {
|
|
| 629 | + return mb_strtolower($str); |
|
| 630 | + } |
|
| 594 | 631 | return strtolower($str); |
| 595 | 632 | } |
| 596 | 633 | |
| 597 | 634 | function strtoupper($str) |
| 598 | 635 | { |
| 599 | - if (function_exists('mb_strtoupper')) return mb_strtoupper($str); |
|
| 636 | + if (function_exists('mb_strtoupper')) {
|
|
| 637 | + return mb_strtoupper($str); |
|
| 638 | + } |
|
| 600 | 639 | return strtoupper($str); |
| 601 | 640 | } |
| 602 | 641 | |
| 603 | 642 | function ucfirst($str) |
| 604 | 643 | { |
| 605 | - if (function_exists('mb_strtoupper') && function_exists('mb_substr') && function_exists('mb_strlen')) |
|
| 606 | - return mb_strtoupper(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str)); |
|
| 644 | + if (function_exists('mb_strtoupper') && function_exists('mb_substr') && function_exists('mb_strlen')) {
|
|
| 645 | + return mb_strtoupper(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str)); |
|
| 646 | + } |
|
| 607 | 647 | return ucfirst($str); |
| 608 | 648 | } |
| 609 | 649 | |
| 610 | 650 | function lcfirst($str) |
| 611 | 651 | { |
| 612 | - if (function_exists('mb_strtolower') && function_exists('mb_substr') && function_exists('mb_strlen')) |
|
| 613 | - return mb_strtolower(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str)); |
|
| 652 | + if (function_exists('mb_strtolower') && function_exists('mb_substr') && function_exists('mb_strlen')) {
|
|
| 653 | + return mb_strtolower(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str)); |
|
| 654 | + } |
|
| 614 | 655 | return lcfirst($str); |
| 615 | 656 | } |
| 616 | 657 | |
| 617 | 658 | function ucwords($str) |
| 618 | 659 | { |
| 619 | - if (function_exists('mb_convert_case')) |
|
| 620 | - return mb_convert_case($str, MB_CASE_TITLE); |
|
| 660 | + if (function_exists('mb_convert_case')) {
|
|
| 661 | + return mb_convert_case($str, MB_CASE_TITLE); |
|
| 662 | + } |
|
| 621 | 663 | return ucwords($str); |
| 622 | 664 | } |
| 623 | 665 | |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | // Parser: Preparation, cleaning and checkup |
| 121 | 121 | /** |
| 122 | 122 | * @param string $template |
| 123 | - * @return mixed|string |
|
| 123 | + * @return string |
|
| 124 | 124 | */ |
| 125 | 125 | public function Parse($template = '') |
| 126 | 126 | { |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | // Parser: modifier detection and eXtended processing if needed |
| 269 | 269 | /** |
| 270 | 270 | * @param $input |
| 271 | - * @param $modifiers |
|
| 271 | + * @param string $modifiers |
|
| 272 | 272 | * @return mixed|null|string |
| 273 | 273 | */ |
| 274 | 274 | public function Filter($input, $modifiers) |
@@ -600,8 +600,8 @@ discard block |
||
| 600 | 600 | // positive userid = manager, negative integer = webuser |
| 601 | 601 | /** |
| 602 | 602 | * @param $userid |
| 603 | - * @param $field |
|
| 604 | - * @return mixed |
|
| 603 | + * @param string $field |
|
| 604 | + * @return string |
|
| 605 | 605 | */ |
| 606 | 606 | public function ModUser($userid, $field) |
| 607 | 607 | { |
@@ -656,7 +656,7 @@ discard block |
||
| 656 | 656 | |
| 657 | 657 | // Returns the value of a PHx/MODx placeholder. |
| 658 | 658 | /** |
| 659 | - * @param $name |
|
| 659 | + * @param string $name |
|
| 660 | 660 | * @return mixed |
| 661 | 661 | */ |
| 662 | 662 | public function getPHxVariable($name) |
@@ -684,9 +684,9 @@ discard block |
||
| 684 | 684 | |
| 685 | 685 | //mbstring |
| 686 | 686 | /** |
| 687 | - * @param $str |
|
| 688 | - * @param $s |
|
| 689 | - * @param null $l |
|
| 687 | + * @param string $str |
|
| 688 | + * @param integer $s |
|
| 689 | + * @param integer $l |
|
| 690 | 690 | * @return string |
| 691 | 691 | */ |
| 692 | 692 | public function substr($str, $s, $l = null) |
@@ -696,7 +696,7 @@ discard block |
||
| 696 | 696 | } |
| 697 | 697 | |
| 698 | 698 | /** |
| 699 | - * @param $str |
|
| 699 | + * @param string $str |
|
| 700 | 700 | * @return int |
| 701 | 701 | */ |
| 702 | 702 | public function strlen($str) |
@@ -706,7 +706,7 @@ discard block |
||
| 706 | 706 | } |
| 707 | 707 | |
| 708 | 708 | /** |
| 709 | - * @param $str |
|
| 709 | + * @param string $str |
|
| 710 | 710 | * @return string |
| 711 | 711 | */ |
| 712 | 712 | public function strtolower($str) |
@@ -716,7 +716,7 @@ discard block |
||
| 716 | 716 | } |
| 717 | 717 | |
| 718 | 718 | /** |
| 719 | - * @param $str |
|
| 719 | + * @param string $str |
|
| 720 | 720 | * @return string |
| 721 | 721 | */ |
| 722 | 722 | public function strtoupper($str) |
@@ -726,7 +726,7 @@ discard block |
||
| 726 | 726 | } |
| 727 | 727 | |
| 728 | 728 | /** |
| 729 | - * @param $str |
|
| 729 | + * @param string $str |
|
| 730 | 730 | * @return string |
| 731 | 731 | */ |
| 732 | 732 | public function ucfirst($str) |
@@ -737,7 +737,7 @@ discard block |
||
| 737 | 737 | } |
| 738 | 738 | |
| 739 | 739 | /** |
| 740 | - * @param $str |
|
| 740 | + * @param string $str |
|
| 741 | 741 | * @return string |
| 742 | 742 | */ |
| 743 | 743 | public function lcfirst($str) |
@@ -748,7 +748,7 @@ discard block |
||
| 748 | 748 | } |
| 749 | 749 | |
| 750 | 750 | /** |
| 751 | - * @param $str |
|
| 751 | + * @param string $str |
|
| 752 | 752 | * @return string |
| 753 | 753 | */ |
| 754 | 754 | public function ucwords($str) |
@@ -759,7 +759,7 @@ discard block |
||
| 759 | 759 | } |
| 760 | 760 | |
| 761 | 761 | /** |
| 762 | - * @param $str |
|
| 762 | + * @param string $str |
|
| 763 | 763 | * @return string |
| 764 | 764 | */ |
| 765 | 765 | public function strrev($str) |
@@ -769,7 +769,7 @@ discard block |
||
| 769 | 769 | } |
| 770 | 770 | |
| 771 | 771 | /** |
| 772 | - * @param $str |
|
| 772 | + * @param string $str |
|
| 773 | 773 | * @return string |
| 774 | 774 | */ |
| 775 | 775 | public function str_shuffle($str) |
@@ -780,7 +780,7 @@ discard block |
||
| 780 | 780 | } |
| 781 | 781 | |
| 782 | 782 | /** |
| 783 | - * @param $str |
|
| 783 | + * @param string $str |
|
| 784 | 784 | * @return int |
| 785 | 785 | */ |
| 786 | 786 | public function str_word_count($str) |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | # Date: March 22, 2013 |
| 11 | 11 | # |
| 12 | 12 | ####*/ |
| 13 | -include_once(MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php'); |
|
| 13 | +include_once(MODX_BASE_PATH.'assets/lib/APIHelpers.class.php'); |
|
| 14 | 14 | |
| 15 | 15 | /** |
| 16 | 16 | * Class DLphx |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | preg_match_all('~(?:=`[^`@]*?)(\[\+([^:\+\[\]]+)([^\[\]]*?)\+\])~s', $template, $matches); |
| 138 | 138 | if ($matches[0]) { |
| 139 | 139 | $template = str_replace($matches[1], '', $template); |
| 140 | - $this->Log("Cleaning unsolved tags: \n" . implode("\n", $matches[2])); |
|
| 140 | + $this->Log("Cleaning unsolved tags: \n".implode("\n", $matches[2])); |
|
| 141 | 141 | } |
| 142 | 142 | // Restore non-call characters in the template: [, ] |
| 143 | 143 | $template = str_replace($this->safetags[1], $this->safetags[2], $template); |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | if ($st != $et) $template = $this->Parse($template); |
| 148 | 148 | // Write an event log if debugging is enabled and there is something to log |
| 149 | 149 | if ($this->debug && $this->debugLog) { |
| 150 | - $modx->logEvent($this->curPass, 1, $this->createEventLog(), $this->name . ' ' . $this->version); |
|
| 150 | + $modx->logEvent($this->curPass, 1, $this->createEventLog(), $this->name.' '.$this->version); |
|
| 151 | 151 | $this->debugLog = false; |
| 152 | 152 | } |
| 153 | 153 | // Return the processed template |
@@ -178,8 +178,8 @@ discard block |
||
| 178 | 178 | for ($i = 0; $i < $count; $i++) { |
| 179 | 179 | $var_search[] = $matches[0][$i]; |
| 180 | 180 | $input = $matches[1][$i]; |
| 181 | - $this->Log('MODX Chunk: ' . $input); |
|
| 182 | - $input = $modx->mergeChunkContent('{{' . $input . '}}'); |
|
| 181 | + $this->Log('MODX Chunk: '.$input); |
|
| 182 | + $input = $modx->mergeChunkContent('{{'.$input.'}}'); |
|
| 183 | 183 | $var_replace[] = $this->Filter($input, $matches[2][$i]); |
| 184 | 184 | } |
| 185 | 185 | $template = str_replace($var_search, $var_replace, $template); |
@@ -195,10 +195,10 @@ discard block |
||
| 195 | 195 | // for each detected snippet |
| 196 | 196 | for ($i = 0; $i < $count; $i++) { |
| 197 | 197 | $snippet = $matches[2][$i]; // snippet call |
| 198 | - $this->Log("MODx Snippet -> " . $snippet); |
|
| 198 | + $this->Log("MODx Snippet -> ".$snippet); |
|
| 199 | 199 | |
| 200 | 200 | // Let MODx evaluate snippet |
| 201 | - $replace = $modx->evalSnippets("[[" . $snippet . "]]"); |
|
| 201 | + $replace = $modx->evalSnippets("[[".$snippet."]]"); |
|
| 202 | 202 | $this->LogSnippet($replace); |
| 203 | 203 | |
| 204 | 204 | // Replace values |
@@ -227,19 +227,19 @@ discard block |
||
| 227 | 227 | switch ($matches[1][$i]) { |
| 228 | 228 | // Document / Template Variable eXtended |
| 229 | 229 | case "*": |
| 230 | - $this->Log("MODx TV/DV: " . $input); |
|
| 231 | - $input = $modx->mergeDocumentContent("[*" . $input . "*]"); |
|
| 230 | + $this->Log("MODx TV/DV: ".$input); |
|
| 231 | + $input = $modx->mergeDocumentContent("[*".$input."*]"); |
|
| 232 | 232 | $replace = $this->Filter($input, $modifiers); |
| 233 | 233 | break; |
| 234 | 234 | // MODx Setting eXtended |
| 235 | 235 | case "(": |
| 236 | - $this->Log("MODx Setting variable: " . $input); |
|
| 237 | - $input = $modx->mergeSettingsContent("[(" . $input . ")]"); |
|
| 236 | + $this->Log("MODx Setting variable: ".$input); |
|
| 237 | + $input = $modx->mergeSettingsContent("[(".$input.")]"); |
|
| 238 | 238 | $replace = $this->Filter($input, $modifiers); |
| 239 | 239 | break; |
| 240 | 240 | // MODx Placeholder eXtended |
| 241 | 241 | default: |
| 242 | - $this->Log("MODx / PHx placeholder variable: " . $input); |
|
| 242 | + $this->Log("MODx / PHx placeholder variable: ".$input); |
|
| 243 | 243 | // Check if placeholder is set |
| 244 | 244 | if (!array_key_exists($input, $this->placeholders) && !array_key_exists($input, $modx->placeholders)) { |
| 245 | 245 | // not set so try again later. |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | { |
| 276 | 276 | global $modx; |
| 277 | 277 | $output = $input; |
| 278 | - $this->Log(" |--- Input = '" . $output . "'"); |
|
| 278 | + $this->Log(" |--- Input = '".$output."'"); |
|
| 279 | 279 | if (preg_match_all('~:([^:=]+)(?:=`(.*?)`(?=:[^:=]+|$))?~s', $modifiers, $matches)) { |
| 280 | 280 | $modifier_cmd = $matches[1]; // modifier command |
| 281 | 281 | $modifier_value = $matches[2]; // modifier value |
@@ -283,8 +283,8 @@ discard block |
||
| 283 | 283 | $condition = array(); |
| 284 | 284 | for ($i = 0; $i < $count; $i++) { |
| 285 | 285 | $output = trim($output); |
| 286 | - $this->Log(" |--- Modifier = '" . $modifier_cmd[$i] . "'"); |
|
| 287 | - if ($modifier_value[$i] != '') $this->Log(" |--- Options = '" . $modifier_value[$i] . "'"); |
|
| 286 | + $this->Log(" |--- Modifier = '".$modifier_cmd[$i]."'"); |
|
| 287 | + if ($modifier_value[$i] != '') $this->Log(" |--- Options = '".$modifier_value[$i]."'"); |
|
| 288 | 288 | switch ($modifier_cmd[$i]) { |
| 289 | 289 | ##### Conditional Modifiers |
| 290 | 290 | case "input": |
@@ -339,14 +339,14 @@ discard block |
||
| 339 | 339 | break; |
| 340 | 340 | case "show": |
| 341 | 341 | $conditional = implode(' ', $condition); |
| 342 | - $isvalid = intval(eval("return (" . $conditional . ");")); |
|
| 342 | + $isvalid = intval(eval("return (".$conditional.");")); |
|
| 343 | 343 | if (!$isvalid) { |
| 344 | 344 | $output = NULL; |
| 345 | 345 | } |
| 346 | 346 | break; |
| 347 | 347 | case "then": |
| 348 | 348 | $conditional = implode(' ', $condition); |
| 349 | - $isvalid = intval(eval("return (" . $conditional . ");")); |
|
| 349 | + $isvalid = intval(eval("return (".$conditional.");")); |
|
| 350 | 350 | if ($isvalid) { |
| 351 | 351 | $output = $modifier_value[$i]; |
| 352 | 352 | } else { |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | break; |
| 356 | 356 | case "else": |
| 357 | 357 | $conditional = implode(' ', $condition); |
| 358 | - $isvalid = intval(eval("return (" . $conditional . ");")); |
|
| 358 | + $isvalid = intval(eval("return (".$conditional.");")); |
|
| 359 | 359 | if (!$isvalid) { |
| 360 | 360 | $output = $modifier_value[$i]; |
| 361 | 361 | } |
@@ -442,7 +442,7 @@ discard block |
||
| 442 | 442 | case "math": |
| 443 | 443 | $filter = preg_replace("~([a-zA-Z\n\r\t\s])~", "", $modifier_value[$i]); |
| 444 | 444 | $filter = str_replace("?", $output, $filter); |
| 445 | - $output = eval("return " . $filter . ";"); |
|
| 445 | + $output = eval("return ".$filter.";"); |
|
| 446 | 446 | break; |
| 447 | 447 | case "isnotempty": |
| 448 | 448 | if (!empty($output)) $output = $modifier_value[$i]; |
@@ -463,7 +463,7 @@ discard block |
||
| 463 | 463 | break; |
| 464 | 464 | case "value": |
| 465 | 465 | if ($i > 0 && $modifier_cmd[$i - 1] == "set") { |
| 466 | - $modx->SetPlaceholder("phx." . $output, $modifier_value[$i]); |
|
| 466 | + $modx->SetPlaceholder("phx.".$output, $modifier_value[$i]); |
|
| 467 | 467 | } |
| 468 | 468 | $output = NULL; |
| 469 | 469 | break; |
@@ -484,25 +484,25 @@ discard block |
||
| 484 | 484 | default: |
| 485 | 485 | $snippet = ''; |
| 486 | 486 | // modified by Anton Kuzmin (23.06.2010) // |
| 487 | - $snippetName = 'phx:' . $modifier_cmd[$i]; |
|
| 487 | + $snippetName = 'phx:'.$modifier_cmd[$i]; |
|
| 488 | 488 | if (isset($modx->snippetCache[$snippetName])) { |
| 489 | 489 | $snippet = $modx->snippetCache[$snippetName]; |
| 490 | 490 | } else { // not in cache so let's check the db |
| 491 | - $sql = "SELECT snippet FROM " . $modx->getFullTableName("site_snippets") . " WHERE " . $modx->getFullTableName("site_snippets") . ".name='" . $modx->db->escape($snippetName) . "';"; |
|
| 491 | + $sql = "SELECT snippet FROM ".$modx->getFullTableName("site_snippets")." WHERE ".$modx->getFullTableName("site_snippets").".name='".$modx->db->escape($snippetName)."';"; |
|
| 492 | 492 | $result = $modx->dbQuery($sql); |
| 493 | 493 | if ($modx->recordCount($result) == 1) { |
| 494 | 494 | $row = $modx->fetchRow($result); |
| 495 | 495 | $snippet = $modx->snippetCache[$row['name']] = $row['snippet']; |
| 496 | 496 | $this->Log(" |--- DB -> Custom Modifier"); |
| 497 | 497 | } else if ($modx->recordCount($result) == 0) { // If snippet not found, look in the modifiers folder |
| 498 | - $filename = $modx->config['rb_base_dir'] . 'plugins/phx/modifiers/' . $modifier_cmd[$i] . '.phx.php'; |
|
| 498 | + $filename = $modx->config['rb_base_dir'].'plugins/phx/modifiers/'.$modifier_cmd[$i].'.phx.php'; |
|
| 499 | 499 | if (@file_exists($filename)) { |
| 500 | 500 | $file_contents = @file_get_contents($filename); |
| 501 | - $file_contents = str_replace('<' . '?php', '', $file_contents); |
|
| 502 | - $file_contents = str_replace('?' . '>', '', $file_contents); |
|
| 501 | + $file_contents = str_replace('<'.'?php', '', $file_contents); |
|
| 502 | + $file_contents = str_replace('?'.'>', '', $file_contents); |
|
| 503 | 503 | $file_contents = str_replace('<?', '', $file_contents); |
| 504 | 504 | $snippet = $modx->snippetCache[$snippetName] = $file_contents; |
| 505 | - $modx->snippetCache[$snippetName . 'Props'] = ''; |
|
| 505 | + $modx->snippetCache[$snippetName.'Props'] = ''; |
|
| 506 | 506 | $this->Log(" |--- File ($filename) -> Custom Modifier"); |
| 507 | 507 | } else { |
| 508 | 508 | $this->Log(" |--- PHX Error: {$modifier_cmd[$i]} could not be found"); |
@@ -517,15 +517,15 @@ discard block |
||
| 517 | 517 | $options = $modifier_value[$i]; |
| 518 | 518 | $custom = eval($cm); |
| 519 | 519 | $msg = ob_get_contents(); |
| 520 | - $output = $msg . $custom; |
|
| 520 | + $output = $msg.$custom; |
|
| 521 | 521 | ob_end_clean(); |
| 522 | 522 | } else { |
| 523 | 523 | $output = ''; |
| 524 | 524 | } |
| 525 | 525 | break; |
| 526 | 526 | } |
| 527 | - if (count($condition)) $this->Log(" |--- Condition = '" . $condition[count($condition) - 1] . "'"); |
|
| 528 | - $this->Log(" |--- Output = '" . $output . "'"); |
|
| 527 | + if (count($condition)) $this->Log(" |--- Condition = '".$condition[count($condition) - 1]."'"); |
|
| 528 | + $this->Log(" |--- Output = '".$output."'"); |
|
| 529 | 529 | } |
| 530 | 530 | } |
| 531 | 531 | return $output; |
@@ -540,7 +540,7 @@ discard block |
||
| 540 | 540 | if (!empty($this->console)) { |
| 541 | 541 | $console = implode("\n", $this->console); |
| 542 | 542 | $this->console = array(); |
| 543 | - return '<pre style="overflow: auto;">' . $console . '</pre>'; |
|
| 543 | + return '<pre style="overflow: auto;">'.$console.'</pre>'; |
|
| 544 | 544 | } |
| 545 | 545 | } |
| 546 | 546 | |
@@ -564,7 +564,7 @@ discard block |
||
| 564 | 564 | { |
| 565 | 565 | if ($this->debug) { |
| 566 | 566 | $this->debugLog = true; |
| 567 | - $this->console[] = (count($this->console) + 1 - $this->curPass) . " [" . strftime("%H:%M:%S", time()) . "] " . $this->LogClean($string); |
|
| 567 | + $this->console[] = (count($this->console) + 1 - $this->curPass)." [".strftime("%H:%M:%S", time())."] ".$this->LogClean($string); |
|
| 568 | 568 | } |
| 569 | 569 | } |
| 570 | 570 | |
@@ -576,14 +576,14 @@ discard block |
||
| 576 | 576 | { |
| 577 | 577 | if ($this->debug) { |
| 578 | 578 | $this->debugLog = true; |
| 579 | - $this->console[] = (count($this->console) + 1 - $this->curPass) . " [" . strftime("%H:%M:%S", time()) . "] " . " |--- Returns: <div style='margin: 10px;'>" . $this->LogClean($string) . "</div>"; |
|
| 579 | + $this->console[] = (count($this->console) + 1 - $this->curPass)." [".strftime("%H:%M:%S", time())."] "." |--- Returns: <div style='margin: 10px;'>".$this->LogClean($string)."</div>"; |
|
| 580 | 580 | } |
| 581 | 581 | } |
| 582 | 582 | |
| 583 | 583 | // Log pass |
| 584 | 584 | public function LogPass() |
| 585 | 585 | { |
| 586 | - $this->console[] = "<div style='margin: 2px;margin-top: 5px;border-bottom: 1px solid black;'>Pass " . $this->curPass . "</div>"; |
|
| 586 | + $this->console[] = "<div style='margin: 2px;margin-top: 5px;border-bottom: 1px solid black;'>Pass ".$this->curPass."</div>"; |
|
| 587 | 587 | } |
| 588 | 588 | |
| 589 | 589 | // Log pass |
@@ -592,7 +592,7 @@ discard block |
||
| 592 | 592 | */ |
| 593 | 593 | public function LogSource($string) |
| 594 | 594 | { |
| 595 | - $this->console[] = "<div style='margin: 2px;margin-top: 5px;border-bottom: 1px solid black;'>Source:</div>" . $this->LogClean($string); |
|
| 595 | + $this->console[] = "<div style='margin: 2px;margin-top: 5px;border-bottom: 1px solid black;'>Source:</div>".$this->LogClean($string); |
|
| 596 | 596 | } |
| 597 | 597 | |
| 598 | 598 | |
@@ -641,7 +641,7 @@ discard block |
||
| 641 | 641 | if (!array_key_exists($userid, $this->cache["mo"])) { |
| 642 | 642 | $tbl = $modx->getFullTableName("webgroup_names"); |
| 643 | 643 | $tbl2 = $modx->getFullTableName("web_groups"); |
| 644 | - $sql = "SELECT wgn.name FROM $tbl wgn INNER JOIN $tbl2 wg ON wg.webgroup=wgn.id AND wg.webuser='" . $userid . "'"; |
|
| 644 | + $sql = "SELECT wgn.name FROM $tbl wgn INNER JOIN $tbl2 wg ON wg.webgroup=wgn.id AND wg.webuser='".$userid."'"; |
|
| 645 | 645 | $this->cache["mo"][$userid] = $grpNames = $modx->db->getColumn("name", $sql); |
| 646 | 646 | } else { |
| 647 | 647 | $grpNames = $this->cache["mo"][$userid]; |
@@ -732,7 +732,7 @@ discard block |
||
| 732 | 732 | public function ucfirst($str) |
| 733 | 733 | { |
| 734 | 734 | if (function_exists('mb_strtoupper') && function_exists('mb_substr') && function_exists('mb_strlen')) |
| 735 | - return mb_strtoupper(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str)); |
|
| 735 | + return mb_strtoupper(mb_substr($str, 0, 1)).mb_substr($str, 1, mb_strlen($str)); |
|
| 736 | 736 | return ucfirst($str); |
| 737 | 737 | } |
| 738 | 738 | |
@@ -743,7 +743,7 @@ discard block |
||
| 743 | 743 | public function lcfirst($str) |
| 744 | 744 | { |
| 745 | 745 | if (function_exists('mb_strtolower') && function_exists('mb_substr') && function_exists('mb_strlen')) |
| 746 | - return mb_strtolower(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str)); |
|
| 746 | + return mb_strtolower(mb_substr($str, 0, 1)).mb_substr($str, 1, mb_strlen($str)); |
|
| 747 | 747 | return lcfirst($str); |
| 748 | 748 | } |
| 749 | 749 | |
@@ -64,7 +64,9 @@ |
||
| 64 | 64 | {
|
| 65 | 65 | $out = array(); |
| 66 | 66 | $tv = $this->getTVid($tvlist); |
| 67 | - if (empty($tv)) return $out; |
|
| 67 | + if (empty($tv)) {
|
|
| 68 | + return $out; |
|
| 69 | + } |
|
| 68 | 70 | $tvId = array_keys($tv); |
| 69 | 71 | $tbl_site_tmplvar_contentvalues = $this->DocLister->getTable($this->tvValuesTable()); |
| 70 | 72 | $sanitarInIDs = $this->DocLister->sanitarIn($IDs); |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | $tvPrefix = $this->_TVprefix; |
| 110 | 110 | |
| 111 | 111 | foreach ($rows as $item) {
|
| 112 | - $out[$item['contentid']][$tvPrefix . $tv[$item['tmplvarid']]] = $item['value']; |
|
| 112 | + $out[$item['contentid']][$tvPrefix.$tv[$item['tmplvarid']]] = $item['value']; |
|
| 113 | 113 | } |
| 114 | 114 | $tmp = explode(",", $this->DocLister->sanitarIn($IDs, ',', false));
|
| 115 | 115 | foreach ($tmp as $item) {
|
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | $out = array_unique($tmp); |
| 160 | 160 | $tmp = array(); |
| 161 | 161 | foreach ($out as $item) {
|
| 162 | - $tmp[] = $this->_TVprefix . $item; |
|
| 162 | + $tmp[] = $this->_TVprefix.$item; |
|
| 163 | 163 | } |
| 164 | 164 | } |
| 165 | 165 | } else {
|
@@ -177,8 +177,8 @@ discard block |
||
| 177 | 177 | */ |
| 178 | 178 | public function renderTV($iddoc, $tvname, $tvval, $param) |
| 179 | 179 | {
|
| 180 | - include_once MODX_MANAGER_PATH . "includes/tmplvars.format.inc.php"; |
|
| 181 | - include_once MODX_MANAGER_PATH . "includes/tmplvars.commands.inc.php"; |
|
| 180 | + include_once MODX_MANAGER_PATH."includes/tmplvars.format.inc.php"; |
|
| 181 | + include_once MODX_MANAGER_PATH."includes/tmplvars.commands.inc.php"; |
|
| 182 | 182 | return getTVDisplayFormat($tvname, $tvval, $param['display'], $param['display_params'], $param['type'], $iddoc, ''); |
| 183 | 183 | } |
| 184 | 184 | |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | $rows = $this->modx->db->makeArray($rs); |
| 215 | 215 | $out = array(); |
| 216 | 216 | foreach ($rows as $item) {
|
| 217 | - $out[$this->_TVprefix . $item['name']] = $item; |
|
| 217 | + $out[$this->_TVprefix.$item['name']] = $item; |
|
| 218 | 218 | } |
| 219 | 219 | return $out; |
| 220 | 220 | } |
@@ -251,17 +251,17 @@ discard block |
||
| 251 | 251 | $item = explode(" ", trim($item), 2);
|
| 252 | 252 | if (isset($TVnames[$item[0]])) {
|
| 253 | 253 | $exists = $this->DocLister->checkTableAlias($item[0], $this->tvValuesTable()); |
| 254 | - $prefix = 'dltv_' . $item[0] . '_' . ($i + 1); |
|
| 254 | + $prefix = 'dltv_'.$item[0].'_'.($i + 1); |
|
| 255 | 255 | $prefix = $this->storeTable ? $this->DocLister->TableAlias($item[0], $this->tvValuesTable(), $prefix) : $prefix; |
| 256 | 256 | if (!$exists) {
|
| 257 | - $table .= " LEFT JOIN " . $this->DocLister->getTable($this->tvValuesTable(), $prefix) . " |
|
| 258 | - on `" . $prefix . "`.`contentid`=`c`.`id` AND `" . $prefix . "`.`tmplvarid`=" . $TVnames[$item[0]]; |
|
| 257 | + $table .= " LEFT JOIN ".$this->DocLister->getTable($this->tvValuesTable(), $prefix)." |
|
| 258 | + on `" . $prefix."`.`contentid`=`c`.`id` AND `".$prefix."`.`tmplvarid`=".$TVnames[$item[0]]; |
|
| 259 | 259 | } |
| 260 | 260 | if (in_array($item[0], $withDefault)) {
|
| 261 | 261 | $exists = $this->DocLister->checkTableAlias($item[0], "site_tmplvars"); |
| 262 | - $dPrefix = $this->storeTable ? $this->DocLister->TableAlias($item[0], "site_tmplvars", 'd_' . $prefix) : 'd_' . $prefix; |
|
| 262 | + $dPrefix = $this->storeTable ? $this->DocLister->TableAlias($item[0], "site_tmplvars", 'd_'.$prefix) : 'd_'.$prefix; |
|
| 263 | 263 | if (!$exists) {
|
| 264 | - $table .= " LEFT JOIN " . $this->DocLister->getTable("site_tmplvars", $dPrefix) . " on `" . $dPrefix . "`.`id` = " . $TVnames[$item[0]];
|
|
| 264 | + $table .= " LEFT JOIN ".$this->DocLister->getTable("site_tmplvars", $dPrefix)." on `".$dPrefix."`.`id` = ".$TVnames[$item[0]];
|
|
| 265 | 265 | } |
| 266 | 266 | $field = "IFNULL(`{$prefix}`.`value`, `{$dPrefix}`.`default_text`)";
|
| 267 | 267 | } else {
|
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | } |
| 272 | 272 | $item = implode(" ", $item);
|
| 273 | 273 | } |
| 274 | - $sort = "ORDER BY " . implode(",", $matches);
|
|
| 274 | + $sort = "ORDER BY ".implode(",", $matches);
|
|
| 275 | 275 | } |
| 276 | 276 | return array($table, $sort); |
| 277 | 277 | } |
@@ -82,7 +82,9 @@ |
||
| 82 | 82 | |
| 83 | 83 | private function getInfo($user = array()) |
| 84 | 84 | {
|
| 85 | - if (!isset($this->table['users'], $this->table['attributes'])) $this->table = $this->getTable(); |
|
| 85 | + if (!isset($this->table['users'], $this->table['attributes'])) {
|
|
| 86 | + $this->table = $this->getTable(); |
|
| 87 | + } |
|
| 86 | 88 | |
| 87 | 89 | $out = array(); |
| 88 | 90 | if (count($user) > 0) {
|
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | $comments = array(); |
| 23 | 23 | if (count($docs)) {
|
| 24 | 24 | $from = $this->DocLister->getTable('jot_content');
|
| 25 | - $rs = $this->DocLister->dbQuery("SELECT uparent, COUNT(*) as total FROM {$from} WHERE uparent IN (" . implode(',', $docs) . ") AND published=1 AND deleted=0 GROUP BY uparent");
|
|
| 25 | + $rs = $this->DocLister->dbQuery("SELECT uparent, COUNT(*) as total FROM {$from} WHERE uparent IN (".implode(',', $docs).") AND published=1 AND deleted=0 GROUP BY uparent");
|
|
| 26 | 26 | $counts = $this->modx->db->makeArray($rs); |
| 27 | 27 | foreach ($counts as $v) {
|
| 28 | 28 | $comments[$v['uparent']] = $v['total']; |
@@ -147,14 +147,14 @@ |
||
| 147 | 147 | $link = ''; |
| 148 | 148 | if (is_array($item) && count($item) > 0) {
|
| 149 | 149 | foreach ($item as $nameItem => $valItem) {
|
| 150 | - $link[] = $name . "[" . (intval($nameItem) ? "" : $nameItem) . "]=" . urlencode($valItem); |
|
| 150 | + $link[] = $name."[".(intval($nameItem) ? "" : $nameItem)."]=".urlencode($valItem); |
|
| 151 | 151 | } |
| 152 | 152 | $link = implode("&", $link);
|
| 153 | 153 | } else {
|
| 154 | 154 | if ($name == '') {
|
| 155 | 155 | $link = urlencode($item); |
| 156 | 156 | } else {
|
| 157 | - $link = $name . "=" . urlencode($item); |
|
| 157 | + $link = $name."=".urlencode($item); |
|
| 158 | 158 | } |
| 159 | 159 | } |
| 160 | 160 | return $link; |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | protected function run() |
| 18 | 18 | {
|
| 19 | 19 | if (!empty($this->_cfg['action']) && !empty($this->_cfg['content'])) {
|
| 20 | - include_once(MODX_BASE_PATH . 'assets/lib/class.summary.php'); |
|
| 20 | + include_once(MODX_BASE_PATH.'assets/lib/class.summary.php'); |
|
| 21 | 21 | $summary = new SummaryText($this->_cfg['content'], $this->_cfg['action'], $this->getCFGDef('breakSummary', null));
|
| 22 | 22 | $summary->setCut($this->getCFGDef('cutSummary', '<cut/>'));
|
| 23 | 23 | $this->_cfg['content'] = $summary->run($this->getCFGDef('dotSummary', 0));
|
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | * @author Agel_Nash <[email protected]> |
| 12 | 12 | * @see http://mis-algoritmos.com/2007/05/27/digg-style-pagination-class |
| 13 | 13 | */ |
| 14 | -include_once(MODX_BASE_PATH . "assets/snippets/DocLister/lib/DLpaginate.class.php"); |
|
| 14 | +include_once(MODX_BASE_PATH."assets/snippets/DocLister/lib/DLpaginate.class.php"); |
|
| 15 | 15 | |
| 16 | 16 | class paginate_DL_Extender extends extDocLister |
| 17 | 17 | {
|
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | $url = explode("?", $url, 2);
|
| 172 | 172 | $url = $url[0]; |
| 173 | 173 | if (!empty($q)) {
|
| 174 | - $url .= "?" . $q; |
|
| 174 | + $url .= "?".$q; |
|
| 175 | 175 | } |
| 176 | 176 | } |
| 177 | 177 | return $url; |
@@ -186,6 +186,6 @@ discard block |
||
| 186 | 186 | public function getRequestName($name) |
| 187 | 187 | {
|
| 188 | 188 | $id = $this->DocLister->getCFGDef('id', '');
|
| 189 | - return (($id != '') ? ($id . "_") : "") . $name; |
|
| 189 | + return (($id != '') ? ($id."_") : "").$name; |
|
| 190 | 190 | } |
| 191 | 191 | } |
@@ -180,7 +180,7 @@ |
||
| 180 | 180 | /** |
| 181 | 181 | * Имя REQUEST переменной в пагинаторе |
| 182 | 182 | * |
| 183 | - * @param $name основное имя REQUEST переменной в пагинаторе |
|
| 183 | + * @param string $name основное имя REQUEST переменной в пагинаторе |
|
| 184 | 184 | * @return string |
| 185 | 185 | */ |
| 186 | 186 | public function getRequestName($name) |