@@ -6,7 +6,7 @@ |
||
6 | 6 | |
7 | 7 | /** |
8 | 8 | * @return Nip_Form_Renderer_Abstract |
9 | - */ |
|
9 | + */ |
|
10 | 10 | public function getRenderer() { |
11 | 11 | return $this->_renderer; |
12 | 12 | } |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | } |
43 | 43 | |
44 | 44 | public function renderElement() { |
45 | - $return = $this->renderDecorators($this->generateElement(), 'element'); |
|
45 | + $return = $this->renderDecorators($this->generateElement(), 'element'); |
|
46 | 46 | $this->getElement()->setRendered(true); |
47 | 47 | return $return; |
48 | 48 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | if ($this->getElement()->isError() && $this->getElement()->getForm()->getOption('renderElementErrors') !== false) { |
69 | 69 | $errors = $this->getElement()->getErrors(); |
70 | 70 | $errors_string = implode('<br />', $errors); |
71 | - $return .= '<span class="help-inline">' . $errors_string .'</span>'; |
|
71 | + $return .= '<span class="help-inline">' . $errors_string . '</span>'; |
|
72 | 72 | } |
73 | 73 | return $return; |
74 | 74 | } |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | $value = $overrides[$name]; |
87 | 87 | } |
88 | 88 | if ($name == "name" && $this->getElement()->isGroup()) { |
89 | - $value = $value."[]"; |
|
89 | + $value = $value . "[]"; |
|
90 | 90 | } |
91 | 91 | $return .= ' ' . $name . '="' . $value . '"'; |
92 | 92 | } |
@@ -8,8 +8,8 @@ |
||
8 | 8 | foreach ($elements as $key=>$element) { |
9 | 9 | $element->addClass('form-control'); |
10 | 10 | $returnElements[] = |
11 | - '<div class="col-xs-4" style="max-width: 100px;">'. |
|
12 | - $element->render(). |
|
11 | + '<div class="col-xs-4" style="max-width: 100px;">' . |
|
12 | + $element->render() . |
|
13 | 13 | '</div>'; |
14 | 14 | } |
15 | 15 |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | $return = '<form '; |
74 | 74 | $atributes = $this->getForm()->getAttribs(); |
75 | 75 | foreach ($atributes as $name => $value) { |
76 | - $return .= $name.'="'.$value.'" '; |
|
76 | + $return .= $name . '="' . $value . '" '; |
|
77 | 77 | } |
78 | 78 | $return .= '>'; |
79 | 79 | |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | if ($buttons) { |
141 | 141 | $return .= '<div class="form-actions">'; |
142 | 142 | foreach ($buttons as $button) { |
143 | - $return .= $button->render()."\n"; |
|
143 | + $return .= $button->render() . "\n"; |
|
144 | 144 | } |
145 | 145 | $return .= ' <div class="clear"></div>'; |
146 | 146 | $return .= '</div>'; |
@@ -165,8 +165,8 @@ discard block |
||
165 | 165 | $error = $element->isError(); |
166 | 166 | } |
167 | 167 | |
168 | - $return = '<label class="col-sm-3 '.($error ? ' error' : '').'">'; |
|
169 | - $return .= $label.':'; |
|
168 | + $return = '<label class="col-sm-3 ' . ($error ? ' error' : '') . '">'; |
|
169 | + $return .= $label . ':'; |
|
170 | 170 | |
171 | 171 | if ($required) { |
172 | 172 | $return .= '<span class="required">*</span>'; |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | protected function getNewElementRenderer(Nip_Form_Element_Abstract $element) |
191 | 191 | { |
192 | 192 | $type = $element->getType(); |
193 | - $name = 'Nip_Form_Renderer_Elements_'.ucfirst($type); |
|
193 | + $name = 'Nip_Form_Renderer_Elements_' . ucfirst($type); |
|
194 | 194 | $renderer = new $name(); |
195 | 195 | $renderer->setRenderer($this); |
196 | 196 | $renderer->setElement($element); |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | protected function getNewButtonRenderer(Nip_Form_Button_Abstract $button) |
212 | 212 | { |
213 | 213 | $type = $button->getType(); |
214 | - $name = 'Nip_Form_Renderer_Button_'.ucfirst($type); |
|
214 | + $name = 'Nip_Form_Renderer_Button_' . ucfirst($type); |
|
215 | 215 | $renderer = new $name(); |
216 | 216 | $renderer->setRenderer($this); |
217 | 217 | $renderer->setItem($button); |
@@ -79,10 +79,10 @@ |
||
79 | 79 | $add = $this->_slots[$id]; |
80 | 80 | if ($add) { |
81 | 81 | return " |
82 | - <!-- ".$add['unitName']." --> |
|
83 | - <div id='".$add['divId']."' style='width:".$add['width']."px; height:".$add['height']."px;'> |
|
82 | + <!-- ".$add['unitName'] . " --> |
|
83 | + <div id='".$add['divId'] . "' style='width:" . $add['width'] . "px; height:" . $add['height'] . "px;'> |
|
84 | 84 | <script type='text/javascript'> |
85 | - googletag.cmd.push(function() { googletag.display('".$add['divId']."'); }); |
|
85 | + googletag.cmd.push(function() { googletag.display('".$add['divId'] . "'); }); |
|
86 | 86 | </script> |
87 | 87 | </div>"; |
88 | 88 | } |
@@ -192,43 +192,43 @@ |
||
192 | 192 | public function __toString() |
193 | 193 | { |
194 | 194 | if ($this->title) { |
195 | - $return[] = '<title>'.$this->title.'</title>'; |
|
195 | + $return[] = '<title>' . $this->title . '</title>'; |
|
196 | 196 | } |
197 | 197 | |
198 | 198 | $return[] = '<meta http-equiv="Content-Type" content="text/html;" />'; |
199 | - $return[] = '<meta charset="'.$this->charset.'">'; |
|
200 | - $return[] = '<meta http-equiv="content-language" content="'.$this->language.'" />'; |
|
199 | + $return[] = '<meta charset="' . $this->charset . '">'; |
|
200 | + $return[] = '<meta http-equiv="content-language" content="' . $this->language . '" />'; |
|
201 | 201 | |
202 | 202 | $return[] = '<meta name="viewport" |
203 | 203 | content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"/>'; |
204 | 204 | |
205 | 205 | if ($this->authors) { |
206 | - $return[] = '<meta name="author" content="'.implode(", ", $this->authors).'" />'; |
|
206 | + $return[] = '<meta name="author" content="' . implode(", ", $this->authors) . '" />'; |
|
207 | 207 | } |
208 | 208 | if ($this->publisher) { |
209 | - $return[] = '<meta name="publisher" content="'.$this->publisher.'" />'; |
|
209 | + $return[] = '<meta name="publisher" content="' . $this->publisher . '" />'; |
|
210 | 210 | } |
211 | 211 | if ($this->copyright) { |
212 | - $return[] = '<meta name="copyright" content="'.$this->copyright.'" />'; |
|
212 | + $return[] = '<meta name="copyright" content="' . $this->copyright . '" />'; |
|
213 | 213 | } |
214 | 214 | |
215 | - $return[] = '<meta name="robots" content="'.$this->robots.'" />'; |
|
215 | + $return[] = '<meta name="robots" content="' . $this->robots . '" />'; |
|
216 | 216 | |
217 | 217 | if ($this->keywords) { |
218 | - $return[] = '<meta name="keywords" content="'.implode(",", $this->keywords).'" />'; |
|
218 | + $return[] = '<meta name="keywords" content="' . implode(",", $this->keywords) . '" />'; |
|
219 | 219 | } |
220 | 220 | |
221 | 221 | if (!empty($this->description)) { |
222 | - $return[] = '<meta name="description" content="'.$this->description.'" />'; |
|
222 | + $return[] = '<meta name="description" content="' . $this->description . '" />'; |
|
223 | 223 | } |
224 | 224 | |
225 | 225 | if (!empty($this->verify_v1)) { |
226 | - $return[] = '<meta name="verify-v1" content="'.$this->verify_v1.'" />'; |
|
226 | + $return[] = '<meta name="verify-v1" content="' . $this->verify_v1 . '" />'; |
|
227 | 227 | } |
228 | 228 | |
229 | 229 | foreach ($this->feeds as $feed) { |
230 | 230 | $return[] = '<link rel="alternate" |
231 | - type="application/rss+xml" title="'.$feed->title.'" href="'.$feed->url.'" />'; |
|
231 | + type="application/rss+xml" title="'.$feed->title . '" href="' . $feed->url . '" />'; |
|
232 | 232 | } |
233 | 233 | |
234 | 234 | // $return[] = '<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />'; |
@@ -5,15 +5,15 @@ discard block |
||
5 | 5 | class Paginator extends AbstractHelper |
6 | 6 | { |
7 | 7 | |
8 | - protected $_url; |
|
8 | + protected $_url; |
|
9 | 9 | protected $_interval = []; |
10 | - protected $_paginator; |
|
11 | - protected $_viewPath = "/pagination"; |
|
10 | + protected $_paginator; |
|
11 | + protected $_viewPath = "/pagination"; |
|
12 | 12 | |
13 | - public function __call($name, $arguments) |
|
14 | - { |
|
15 | - return call_user_func_array(array($this->getPaginator(), $name), $arguments); |
|
16 | - } |
|
13 | + public function __call($name, $arguments) |
|
14 | + { |
|
15 | + return call_user_func_array(array($this->getPaginator(), $name), $arguments); |
|
16 | + } |
|
17 | 17 | |
18 | 18 | /** |
19 | 19 | * @return \Nip_Record_Paginator |
@@ -30,75 +30,75 @@ discard block |
||
30 | 30 | return $this; |
31 | 31 | } |
32 | 32 | |
33 | - public function url($page) |
|
34 | - { |
|
35 | - $return = $this->_url; |
|
33 | + public function url($page) |
|
34 | + { |
|
35 | + $return = $this->_url; |
|
36 | 36 | $return = str_replace('&page=' . $this->getPaginator()->getPage(), '', $return); |
37 | 37 | $return = str_replace('&page=' . $this->getPaginator()->getPage(), '', $return); |
38 | 38 | $return = str_replace('page=' . $this->getPaginator()->getPage(), '', $return); |
39 | 39 | |
40 | - if ($page > 1) { |
|
41 | - $return = rtrim($return, "/"); |
|
40 | + if ($page > 1) { |
|
41 | + $return = rtrim($return, "/"); |
|
42 | 42 | |
43 | 43 | if (strpos($return, '?') === false) { |
44 | - $return .= '?page=' . $page; |
|
45 | - } else { |
|
46 | - $return .= '&page=' . $page; |
|
47 | - } |
|
44 | + $return .= '?page=' . $page; |
|
45 | + } else { |
|
46 | + $return .= '&page=' . $page; |
|
47 | + } |
|
48 | + } |
|
49 | + return $return; |
|
50 | + } |
|
51 | + |
|
52 | + public function render() |
|
53 | + { |
|
54 | + $return = ''; |
|
55 | + |
|
56 | + if ($this->getPaginator() && $this->getPaginator()->getPages() > 1) { |
|
57 | + $this->getView()->paginator = $this; |
|
58 | + $this->getView()->pages = $this->getPaginator()->getPages(); |
|
59 | + $this->getView()->page = $this->getPaginator()->getPage(); |
|
60 | + $this->getView()->interval = $this->getInterval(); |
|
61 | + |
|
62 | + $return = $this->getView()->load($this->_viewPath, array(), true); |
|
63 | + } |
|
64 | + |
|
65 | + return $return; |
|
66 | + } |
|
67 | + |
|
68 | + public function getInterval() |
|
69 | + { |
|
70 | + $this->interval['min'] = 1; |
|
71 | + $this->interval['max'] = $this->getPaginator()->getPages(); |
|
72 | + |
|
73 | + $pages = $this->interval['max']; |
|
74 | + $page = $this->getPaginator()->getPage(); |
|
75 | + |
|
76 | + if ($pages > 7) { |
|
77 | + if ($page <= 6) { |
|
78 | + $this->interval['min'] = 1; |
|
79 | + $this->interval['max'] = 7; |
|
80 | + } elseif ($pages - $page <= 5) { |
|
81 | + $this->interval['min'] = $pages - 6; |
|
82 | + $this->interval['max'] = $pages; |
|
83 | + } else { |
|
84 | + $this->interval['min'] = $page - 3; |
|
85 | + $this->interval['max'] = $page + 3; |
|
86 | + } |
|
48 | 87 | } |
49 | - return $return; |
|
50 | - } |
|
51 | - |
|
52 | - public function render() |
|
53 | - { |
|
54 | - $return = ''; |
|
55 | - |
|
56 | - if ($this->getPaginator() && $this->getPaginator()->getPages() > 1) { |
|
57 | - $this->getView()->paginator = $this; |
|
58 | - $this->getView()->pages = $this->getPaginator()->getPages(); |
|
59 | - $this->getView()->page = $this->getPaginator()->getPage(); |
|
60 | - $this->getView()->interval = $this->getInterval(); |
|
61 | - |
|
62 | - $return = $this->getView()->load($this->_viewPath, array(), true); |
|
63 | - } |
|
64 | - |
|
65 | - return $return; |
|
66 | - } |
|
67 | - |
|
68 | - public function getInterval() |
|
69 | - { |
|
70 | - $this->interval['min'] = 1; |
|
71 | - $this->interval['max'] = $this->getPaginator()->getPages(); |
|
72 | - |
|
73 | - $pages = $this->interval['max']; |
|
74 | - $page = $this->getPaginator()->getPage(); |
|
75 | - |
|
76 | - if ($pages > 7) { |
|
77 | - if ($page <= 6) { |
|
78 | - $this->interval['min'] = 1; |
|
79 | - $this->interval['max'] = 7; |
|
80 | - } elseif ($pages - $page <= 5) { |
|
81 | - $this->interval['min'] = $pages - 6; |
|
82 | - $this->interval['max'] = $pages; |
|
83 | - } else { |
|
84 | - $this->interval['min'] = $page - 3; |
|
85 | - $this->interval['max'] = $page + 3; |
|
86 | - } |
|
87 | - } |
|
88 | - |
|
89 | - return $this->interval; |
|
90 | - } |
|
91 | - |
|
92 | - public function setViewPath($view) |
|
93 | - { |
|
94 | - $this->_viewPath = $view; |
|
95 | - return $this; |
|
96 | - } |
|
97 | - |
|
98 | - public function setURL($url) |
|
99 | - { |
|
100 | - $this->_url = $url; |
|
101 | - return $this; |
|
102 | - } |
|
88 | + |
|
89 | + return $this->interval; |
|
90 | + } |
|
91 | + |
|
92 | + public function setViewPath($view) |
|
93 | + { |
|
94 | + $this->_viewPath = $view; |
|
95 | + return $this; |
|
96 | + } |
|
97 | + |
|
98 | + public function setURL($url) |
|
99 | + { |
|
100 | + $this->_url = $url; |
|
101 | + return $this; |
|
102 | + } |
|
103 | 103 | |
104 | 104 | } |
@@ -58,9 +58,9 @@ discard block |
||
58 | 58 | |
59 | 59 | public function buildTag($path, $condition) |
60 | 60 | { |
61 | - $return = '<link rel="stylesheet" type="text/css" media="screen" href="'.$this->buildURL($path).'" />'; |
|
61 | + $return = '<link rel="stylesheet" type="text/css" media="screen" href="' . $this->buildURL($path) . '" />'; |
|
62 | 62 | if ($condition) { |
63 | - $return = '<!--[if '.$condition.']>'.$return.'<![endif]-->'; |
|
63 | + $return = '<!--[if ' . $condition . ']>' . $return . '<![endif]-->'; |
|
64 | 64 | } |
65 | 65 | $return .= "\r\n"; |
66 | 66 | |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | if (preg_match('/https?:\/\//', $source)) { |
73 | 73 | return $source; |
74 | 74 | } else { |
75 | - return STYLESHEETS_URL.$source.'.css'; |
|
75 | + return STYLESHEETS_URL . $source . '.css'; |
|
76 | 76 | } |
77 | 77 | } |
78 | 78 | |
@@ -81,19 +81,19 @@ discard block |
||
81 | 81 | if ($files) { |
82 | 82 | $lastUpdated = 0; |
83 | 83 | foreach ($files as $file) { |
84 | - $path = STYLESHEETS_PATH.$file.".css"; |
|
84 | + $path = STYLESHEETS_PATH . $file . ".css"; |
|
85 | 85 | if (file_exists($path)) { |
86 | 86 | $lastUpdated = max($lastUpdated, filemtime($path)); |
87 | 87 | } |
88 | 88 | } |
89 | 89 | |
90 | - $hash = md5(implode("", $files)).".".$lastUpdated; |
|
90 | + $hash = md5(implode("", $files)) . "." . $lastUpdated; |
|
91 | 91 | |
92 | - $path = CACHE_PATH."stylesheets/".$hash; |
|
93 | - if (!file_exists($path.".css")) { |
|
92 | + $path = CACHE_PATH . "stylesheets/" . $hash; |
|
93 | + if (!file_exists($path . ".css")) { |
|
94 | 94 | $content = ""; |
95 | 95 | foreach ($files as $file) { |
96 | - $content .= file_get_contents(STYLESHEETS_PATH.$file.".css")."\r\n"; |
|
96 | + $content .= file_get_contents(STYLESHEETS_PATH . $file . ".css") . "\r\n"; |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | $css = new csstidy(); |
@@ -107,11 +107,11 @@ discard block |
||
107 | 107 | // Parse content to remove all but one ../ instance |
108 | 108 | $content = preg_replace("`url\((\.\.\/){1,}`i", "url(../", $content); |
109 | 109 | |
110 | - $file = new Nip_File_Handler(array("path" => $path.".css")); |
|
110 | + $file = new Nip_File_Handler(array("path" => $path . ".css")); |
|
111 | 111 | $file->write($content); |
112 | 112 | |
113 | 113 | if ($file->gzip()) { |
114 | - $file->setPath($path.".gz")->write(); |
|
114 | + $file->setPath($path . ".gz")->write(); |
|
115 | 115 | } |
116 | 116 | } |
117 | 117 |
@@ -36,7 +36,7 @@ |
||
36 | 36 | { |
37 | 37 | $return = ''; |
38 | 38 | |
39 | - $items = (array)$items; |
|
39 | + $items = (array) $items; |
|
40 | 40 | |
41 | 41 | if (count($items)) { |
42 | 42 | if ($wrap) { |
@@ -18,7 +18,7 @@ |
||
18 | 18 | */ |
19 | 19 | public function hash($password) |
20 | 20 | { |
21 | - return md5($this->getSalt().$password); |
|
21 | + return md5($this->getSalt() . $password); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | /** |