@@ -203,6 +203,10 @@ |
||
203 | 203 | return $url; |
204 | 204 | } |
205 | 205 | |
206 | + /** |
|
207 | + * @param string $url |
|
208 | + * @param string $requestName |
|
209 | + */ |
|
206 | 210 | public function buildUrl($url, $requestName, $params){ |
207 | 211 | if ($requestName != '' && is_array($params)) { |
208 | 212 | $q = http_build_query(array_merge($params, array($this->getRequestName($requestName) => null))); |
@@ -184,12 +184,12 @@ discard block |
||
184 | 184 | switch ($this->DocLister->getCFGDef('paginate', '')) { |
185 | 185 | case 'offset': |
186 | 186 | $requestName = 'start'; |
187 | - $url = $this->buildUrl($url, $requestName, $params); |
|
187 | + $url = $this->buildUrl($url, $requestName, $params); |
|
188 | 188 | break; |
189 | 189 | case 'pages': |
190 | 190 | default: |
191 | 191 | $requestName = 'page'; |
192 | - $call = $this->DocLister->getCFGDef('makePaginateUrl', ''); |
|
192 | + $call = $this->DocLister->getCFGDef('makePaginateUrl', ''); |
|
193 | 193 | if((is_object($call) && ($call instanceof Closure)) || is_callable($call)){ |
194 | 194 | $url = call_user_func($call, compact('url', 'params'), $this->modx, $this->DocLister, $this); |
195 | 195 | }else{ |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | return $url; |
204 | 204 | } |
205 | 205 | |
206 | - public function buildUrl($url, $requestName, $params){ |
|
206 | + public function buildUrl($url, $requestName, $params){ |
|
207 | 207 | if ($requestName != '' && is_array($params)) { |
208 | 208 | $q = http_build_query(array_merge($params, array($this->getRequestName($requestName) => null))); |
209 | 209 | $url = explode("?", $url, 2); |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if (!defined('MODX_BASE_PATH')) { |
|
2 | +if ( ! defined('MODX_BASE_PATH')) { |
|
3 | 3 | die('HACK???'); |
4 | 4 | } |
5 | 5 | |
@@ -190,9 +190,9 @@ discard block |
||
190 | 190 | default: |
191 | 191 | $requestName = 'page'; |
192 | 192 | $call = $this->DocLister->getCFGDef('makePaginateUrl', ''); |
193 | - if((is_object($call) && ($call instanceof Closure)) || is_callable($call)){ |
|
193 | + if ((is_object($call) && ($call instanceof Closure)) || is_callable($call)) { |
|
194 | 194 | $url = call_user_func($call, compact('url', 'params'), $this->modx, $this->DocLister, $this); |
195 | - }else{ |
|
195 | + } else { |
|
196 | 196 | $url = $this->buildUrl($url, $requestName, $params); |
197 | 197 | } |
198 | 198 | break; |
@@ -203,12 +203,12 @@ discard block |
||
203 | 203 | return $url; |
204 | 204 | } |
205 | 205 | |
206 | - public function buildUrl($url, $requestName, $params){ |
|
206 | + public function buildUrl($url, $requestName, $params) { |
|
207 | 207 | if ($requestName != '' && is_array($params)) { |
208 | 208 | $q = http_build_query(array_merge($params, array($this->getRequestName($requestName) => null))); |
209 | 209 | $url = explode("?", $url, 2); |
210 | 210 | $url = $url[0]; |
211 | - if (!empty($q)) { |
|
211 | + if ( ! empty($q)) { |
|
212 | 212 | $url .= "?" . $q; |
213 | 213 | } |
214 | 214 | } |
@@ -190,9 +190,9 @@ discard block |
||
190 | 190 | default: |
191 | 191 | $requestName = 'page'; |
192 | 192 | $call = $this->DocLister->getCFGDef('makePaginateUrl', ''); |
193 | - if((is_object($call) && ($call instanceof Closure)) || is_callable($call)){ |
|
193 | + if((is_object($call) && ($call instanceof Closure)) || is_callable($call)) { |
|
194 | 194 | $url = call_user_func($call, compact('url', 'params'), $this->modx, $this->DocLister, $this); |
195 | - }else{ |
|
195 | + } else { |
|
196 | 196 | $url = $this->buildUrl($url, $requestName, $params); |
197 | 197 | } |
198 | 198 | break; |
@@ -203,7 +203,8 @@ discard block |
||
203 | 203 | return $url; |
204 | 204 | } |
205 | 205 | |
206 | - public function buildUrl($url, $requestName, $params){ |
|
206 | + public function buildUrl($url, $requestName, $params) |
|
207 | + { |
|
207 | 208 | if ($requestName != '' && is_array($params)) { |
208 | 209 | $q = http_build_query(array_merge($params, array($this->getRequestName($requestName) => null))); |
209 | 210 | $url = explode("?", $url, 2); |