@@ -61,12 +61,12 @@ discard block |
||
61 | 61 | /** |
62 | 62 | * Error codes |
63 | 63 | */ |
64 | -define('PAGER_OK', 0); |
|
65 | -define('ERROR_PAGER', -1); |
|
66 | -define('ERROR_PAGER_INVALID', -2); |
|
64 | +define('PAGER_OK', 0); |
|
65 | +define('ERROR_PAGER', -1); |
|
66 | +define('ERROR_PAGER_INVALID', -2); |
|
67 | 67 | define('ERROR_PAGER_INVALID_PLACEHOLDER', -3); |
68 | -define('ERROR_PAGER_INVALID_USAGE', -4); |
|
69 | -define('ERROR_PAGER_NOT_IMPLEMENTED', -5); |
|
68 | +define('ERROR_PAGER_INVALID_USAGE', -4); |
|
69 | +define('ERROR_PAGER_NOT_IMPLEMENTED', -5); |
|
70 | 70 | |
71 | 71 | /** |
72 | 72 | * Pager_Common - Common base class for [Sliding|Jumping] Window Pager |
@@ -94,13 +94,13 @@ discard block |
||
94 | 94 | * @var integer number of items per page |
95 | 95 | * @access private |
96 | 96 | */ |
97 | - var $_perPage = 10; |
|
97 | + var $_perPage = 10; |
|
98 | 98 | |
99 | 99 | /** |
100 | 100 | * @var integer number of page links for each window |
101 | 101 | * @access private |
102 | 102 | */ |
103 | - var $_delta = 10; |
|
103 | + var $_delta = 10; |
|
104 | 104 | |
105 | 105 | /** |
106 | 106 | * @var integer current page number |
@@ -112,13 +112,13 @@ discard block |
||
112 | 112 | * @var integer total pages number |
113 | 113 | * @access private |
114 | 114 | */ |
115 | - var $_totalPages = 1; |
|
115 | + var $_totalPages = 1; |
|
116 | 116 | |
117 | 117 | /** |
118 | 118 | * @var string CSS class for links |
119 | 119 | * @access private |
120 | 120 | */ |
121 | - var $_linkClass = ''; |
|
121 | + var $_linkClass = ''; |
|
122 | 122 | |
123 | 123 | /** |
124 | 124 | * @var string wrapper for CSS class name |
@@ -130,13 +130,13 @@ discard block |
||
130 | 130 | * @var string path name |
131 | 131 | * @access private |
132 | 132 | */ |
133 | - var $_path = PAGER_CURRENT_PATHNAME; |
|
133 | + var $_path = PAGER_CURRENT_PATHNAME; |
|
134 | 134 | |
135 | 135 | /** |
136 | 136 | * @var string file name |
137 | 137 | * @access private |
138 | 138 | */ |
139 | - var $_fileName = PAGER_CURRENT_FILENAME; |
|
139 | + var $_fileName = PAGER_CURRENT_FILENAME; |
|
140 | 140 | |
141 | 141 | /** |
142 | 142 | * @var boolean If false, don't override the fileName option. Use at your own risk. |
@@ -148,19 +148,19 @@ discard block |
||
148 | 148 | * @var boolean you have to use FALSE with mod_rewrite |
149 | 149 | * @access private |
150 | 150 | */ |
151 | - var $_append = true; |
|
151 | + var $_append = true; |
|
152 | 152 | |
153 | 153 | /** |
154 | 154 | * @var string specifies which HTTP method to use |
155 | 155 | * @access private |
156 | 156 | */ |
157 | - var $_httpMethod = 'GET'; |
|
157 | + var $_httpMethod = 'GET'; |
|
158 | 158 | |
159 | 159 | /** |
160 | 160 | * @var string specifies which HTML form to use |
161 | 161 | * @access private |
162 | 162 | */ |
163 | - var $_formID = ''; |
|
163 | + var $_formID = ''; |
|
164 | 164 | |
165 | 165 | /** |
166 | 166 | * @var boolean whether or not to import submitted data |
@@ -172,19 +172,19 @@ discard block |
||
172 | 172 | * @var string name of the querystring var for pageID |
173 | 173 | * @access private |
174 | 174 | */ |
175 | - var $_urlVar = 'pageID'; |
|
175 | + var $_urlVar = 'pageID'; |
|
176 | 176 | |
177 | 177 | /** |
178 | 178 | * @var array data to pass through the link |
179 | 179 | * @access private |
180 | 180 | */ |
181 | - var $_linkData = array(); |
|
181 | + var $_linkData = array(); |
|
182 | 182 | |
183 | 183 | /** |
184 | 184 | * @var array additional URL vars |
185 | 185 | * @access private |
186 | 186 | */ |
187 | - var $_extraVars = array(); |
|
187 | + var $_extraVars = array(); |
|
188 | 188 | |
189 | 189 | /** |
190 | 190 | * @var array URL vars to ignore |
@@ -196,19 +196,19 @@ discard block |
||
196 | 196 | * @var boolean TRUE => expanded mode (for Pager_Sliding) |
197 | 197 | * @access private |
198 | 198 | */ |
199 | - var $_expanded = true; |
|
199 | + var $_expanded = true; |
|
200 | 200 | |
201 | 201 | /** |
202 | 202 | * @var boolean TRUE => show accesskey attribute on <a> tags |
203 | 203 | * @access private |
204 | 204 | */ |
205 | - var $_accesskey = false; |
|
205 | + var $_accesskey = false; |
|
206 | 206 | |
207 | 207 | /** |
208 | 208 | * @var string extra attributes for the <a> tag |
209 | 209 | * @access private |
210 | 210 | */ |
211 | - var $_attributes = ''; |
|
211 | + var $_attributes = ''; |
|
212 | 212 | |
213 | 213 | /** |
214 | 214 | * @var string onclick |
@@ -220,37 +220,37 @@ discard block |
||
220 | 220 | * @var string alt text for "first page" (use "%d" placeholder for page number) |
221 | 221 | * @access private |
222 | 222 | */ |
223 | - var $_altFirst = 'first page'; |
|
223 | + var $_altFirst = 'first page'; |
|
224 | 224 | |
225 | 225 | /** |
226 | 226 | * @var string alt text for "previous page" |
227 | 227 | * @access private |
228 | 228 | */ |
229 | - var $_altPrev = 'previous page'; |
|
229 | + var $_altPrev = 'previous page'; |
|
230 | 230 | |
231 | 231 | /** |
232 | 232 | * @var string alt text for "next page" |
233 | 233 | * @access private |
234 | 234 | */ |
235 | - var $_altNext = 'next page'; |
|
235 | + var $_altNext = 'next page'; |
|
236 | 236 | |
237 | 237 | /** |
238 | 238 | * @var string alt text for "last page" (use "%d" placeholder for page number) |
239 | 239 | * @access private |
240 | 240 | */ |
241 | - var $_altLast = 'last page'; |
|
241 | + var $_altLast = 'last page'; |
|
242 | 242 | |
243 | 243 | /** |
244 | 244 | * @var string alt text for "page" (use optional "%d" placeholder for page number) |
245 | 245 | * @access private |
246 | 246 | */ |
247 | - var $_altPage = 'page'; |
|
247 | + var $_altPage = 'page'; |
|
248 | 248 | |
249 | 249 | /** |
250 | 250 | * @var string image/text to use as "prev" link |
251 | 251 | * @access private |
252 | 252 | */ |
253 | - var $_prevImg = '<< Back'; |
|
253 | + var $_prevImg = '<< Back'; |
|
254 | 254 | |
255 | 255 | /** |
256 | 256 | * image/text to use as "prev" link when no prev link is needed (e.g. on the first page) |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | * @var string image/text to use as "next" link |
266 | 266 | * @access private |
267 | 267 | */ |
268 | - var $_nextImg = 'Next >>'; |
|
268 | + var $_nextImg = 'Next >>'; |
|
269 | 269 | |
270 | 270 | /** |
271 | 271 | * image/text to use as "next" link when |
@@ -281,7 +281,7 @@ discard block |
||
281 | 281 | * @var string link separator |
282 | 282 | * @access private |
283 | 283 | */ |
284 | - var $_separator = ''; |
|
284 | + var $_separator = ''; |
|
285 | 285 | |
286 | 286 | /** |
287 | 287 | * @var integer number of spaces before separator |
@@ -293,31 +293,31 @@ discard block |
||
293 | 293 | * @var integer number of spaces after separator |
294 | 294 | * @access private |
295 | 295 | */ |
296 | - var $_spacesAfterSeparator = 1; |
|
296 | + var $_spacesAfterSeparator = 1; |
|
297 | 297 | |
298 | 298 | /** |
299 | 299 | * @var string CSS class name for current page link |
300 | 300 | * @access private |
301 | 301 | */ |
302 | - var $_curPageLinkClassName = ''; |
|
302 | + var $_curPageLinkClassName = ''; |
|
303 | 303 | |
304 | 304 | /** |
305 | 305 | * @var string Text before current page link |
306 | 306 | * @access private |
307 | 307 | */ |
308 | - var $_curPageSpanPre = ''; |
|
308 | + var $_curPageSpanPre = ''; |
|
309 | 309 | |
310 | 310 | /** |
311 | 311 | * @var string Text after current page link |
312 | 312 | * @access private |
313 | 313 | */ |
314 | - var $_curPageSpanPost = ''; |
|
314 | + var $_curPageSpanPost = ''; |
|
315 | 315 | |
316 | 316 | /** |
317 | 317 | * @var string Text before first page link |
318 | 318 | * @access private |
319 | 319 | */ |
320 | - var $_firstPagePre = '['; |
|
320 | + var $_firstPagePre = '['; |
|
321 | 321 | |
322 | 322 | /** |
323 | 323 | * @var string Text to be used for first page link |
@@ -335,31 +335,31 @@ discard block |
||
335 | 335 | * @var string Text before last page link |
336 | 336 | * @access private |
337 | 337 | */ |
338 | - var $_lastPagePre = '['; |
|
338 | + var $_lastPagePre = '['; |
|
339 | 339 | |
340 | 340 | /** |
341 | 341 | * @var string Text to be used for last page link |
342 | 342 | * @access private |
343 | 343 | */ |
344 | - var $_lastPageText = ''; |
|
344 | + var $_lastPageText = ''; |
|
345 | 345 | |
346 | 346 | /** |
347 | 347 | * @var string Text after last page link |
348 | 348 | * @access private |
349 | 349 | */ |
350 | - var $_lastPagePost = ']'; |
|
350 | + var $_lastPagePost = ']'; |
|
351 | 351 | |
352 | 352 | /** |
353 | 353 | * @var string Will contain the HTML code for the spaces |
354 | 354 | * @access private |
355 | 355 | */ |
356 | - var $_spacesBefore = ''; |
|
356 | + var $_spacesBefore = ''; |
|
357 | 357 | |
358 | 358 | /** |
359 | 359 | * @var string Will contain the HTML code for the spaces |
360 | 360 | * @access private |
361 | 361 | */ |
362 | - var $_spacesAfter = ''; |
|
362 | + var $_spacesAfter = ''; |
|
363 | 363 | |
364 | 364 | /** |
365 | 365 | * @var string String used as title in <link rel="first"> tag |
@@ -389,37 +389,37 @@ discard block |
||
389 | 389 | * @var string Text to be used for the 'show all' option in the select box |
390 | 390 | * @access private |
391 | 391 | */ |
392 | - var $_showAllText = ''; |
|
392 | + var $_showAllText = ''; |
|
393 | 393 | |
394 | 394 | /** |
395 | 395 | * @var array data to be paged |
396 | 396 | * @access private |
397 | 397 | */ |
398 | - var $_itemData = null; |
|
398 | + var $_itemData = null; |
|
399 | 399 | |
400 | 400 | /** |
401 | 401 | * @var boolean If TRUE and there's only one page, links aren't shown |
402 | 402 | * @access private |
403 | 403 | */ |
404 | - var $_clearIfVoid = true; |
|
404 | + var $_clearIfVoid = true; |
|
405 | 405 | |
406 | 406 | /** |
407 | 407 | * @var boolean Use session for storing the number of items per page |
408 | 408 | * @access private |
409 | 409 | */ |
410 | - var $_useSessions = false; |
|
410 | + var $_useSessions = false; |
|
411 | 411 | |
412 | 412 | /** |
413 | 413 | * @var boolean Close the session when finished reading/writing data |
414 | 414 | * @access private |
415 | 415 | */ |
416 | - var $_closeSession = false; |
|
416 | + var $_closeSession = false; |
|
417 | 417 | |
418 | 418 | /** |
419 | 419 | * @var string name of the session var for number of items per page |
420 | 420 | * @access private |
421 | 421 | */ |
422 | - var $_sessionVar = 'setPerPage'; |
|
422 | + var $_sessionVar = 'setPerPage'; |
|
423 | 423 | |
424 | 424 | /** |
425 | 425 | * Pear error mode (when raiseError is called) |
@@ -671,7 +671,7 @@ discard block |
||
671 | 671 | * @return array back/next/first/last and page links |
672 | 672 | * @access public |
673 | 673 | */ |
674 | - function getLinks($pageID=null, $next_html='') |
|
674 | + function getLinks($pageID = null, $next_html = '') |
|
675 | 675 | { |
676 | 676 | $msg = 'function "getLinks()" not implemented.'; |
677 | 677 | return $this->raiseError($msg, ERROR_PAGER_NOT_IMPLEMENTED); |
@@ -746,7 +746,7 @@ discard block |
||
746 | 746 | */ |
747 | 747 | function numPages() |
748 | 748 | { |
749 | - return (int)$this->_totalPages; |
|
749 | + return (int) $this->_totalPages; |
|
750 | 750 | } |
751 | 751 | |
752 | 752 | // }}} |
@@ -806,7 +806,7 @@ discard block |
||
806 | 806 | if (!is_null($this->_itemData)) { |
807 | 807 | $this->_totalItems = count($this->_itemData); |
808 | 808 | } |
809 | - $this->_totalPages = ceil((float)$this->_totalItems / (float)$this->_perPage); |
|
809 | + $this->_totalPages = ceil((float) $this->_totalItems / (float) $this->_perPage); |
|
810 | 810 | $i = 1; |
811 | 811 | if (!empty($this->_itemData)) { |
812 | 812 | foreach ($this->_itemData as $key => $value) { |
@@ -839,7 +839,7 @@ discard block |
||
839 | 839 | { |
840 | 840 | if ($this->_httpMethod == 'GET') { |
841 | 841 | if ($this->_append) { |
842 | - $href = '?' . $this->_http_build_query_wrapper($this->_linkData); |
|
842 | + $href = '?'.$this->_http_build_query_wrapper($this->_linkData); |
|
843 | 843 | } else { |
844 | 844 | $href = str_replace('%d', $this->_linkData[$this->_urlVar], $this->_fileName); |
845 | 845 | } |
@@ -850,25 +850,25 @@ discard block |
||
850 | 850 | return sprintf('<a href="%s"%s%s%s%s title="%s">%s</a>', |
851 | 851 | // Modified by Ivan Tcholakov, 17-OCT-2008. |
852 | 852 | //htmlentities($this->_url . $href, ENT_COMPAT, 'UTF-8'), |
853 | - api_htmlentities($this->_url . $href), |
|
853 | + api_htmlentities($this->_url.$href), |
|
854 | 854 | // |
855 | 855 | empty($this->_classString) ? '' : ' '.$this->_classString, |
856 | - empty($this->_attributes) ? '' : ' '.$this->_attributes, |
|
857 | - empty($this->_accesskey) ? '' : ' accesskey="'.$this->_linkData[$this->_urlVar].'"', |
|
858 | - empty($onclick) ? '' : ' onclick="'.$onclick.'"', |
|
856 | + empty($this->_attributes) ? '' : ' '.$this->_attributes, |
|
857 | + empty($this->_accesskey) ? '' : ' accesskey="'.$this->_linkData[$this->_urlVar].'"', |
|
858 | + empty($onclick) ? '' : ' onclick="'.$onclick.'"', |
|
859 | 859 | $altText, |
860 | 860 | $linkText |
861 | 861 | ); |
862 | 862 | } elseif ($this->_httpMethod == 'POST') { |
863 | 863 | $href = $this->_url; |
864 | 864 | if (!empty($_GET)) { |
865 | - $href .= '?' . $this->_http_build_query_wrapper($_GET); |
|
865 | + $href .= '?'.$this->_http_build_query_wrapper($_GET); |
|
866 | 866 | } |
867 | 867 | return sprintf("<a href='javascript:void(0)' onclick='%s'%s%s%s title='%s'>%s</a>", |
868 | 868 | $this->_generateFormOnClick($href, $this->_linkData), |
869 | 869 | empty($this->_classString) ? '' : ' '.$this->_classString, |
870 | - empty($this->_attributes) ? '' : ' '.$this->_attributes, |
|
871 | - empty($this->_accesskey) ? '' : ' accesskey=\''.$this->_linkData[$this->_urlVar].'\'', |
|
870 | + empty($this->_attributes) ? '' : ' '.$this->_attributes, |
|
871 | + empty($this->_accesskey) ? '' : ' accesskey=\''.$this->_linkData[$this->_urlVar].'\'', |
|
872 | 872 | $altText, |
873 | 873 | $linkText |
874 | 874 | ); |
@@ -956,7 +956,7 @@ discard block |
||
956 | 956 | $str = ''; |
957 | 957 | if (is_array($data) || is_object($data)) { |
958 | 958 | // foreach key/visible member |
959 | - foreach ((array)$data as $key => $val) { |
|
959 | + foreach ((array) $data as $key => $val) { |
|
960 | 960 | // append [$key] to prev |
961 | 961 | $tempKey = sprintf('%s[%s]', $prev, $key); |
962 | 962 | $str .= $this->_generateFormOnClickHelper($val, $tempKey); |
@@ -1106,7 +1106,7 @@ discard block |
||
1106 | 1106 | * @return string The link |
1107 | 1107 | * @access private |
1108 | 1108 | */ |
1109 | - function _getBackLink($url='', $link='') |
|
1109 | + function _getBackLink($url = '', $link = '') |
|
1110 | 1110 | { |
1111 | 1111 | //legacy settings... the preferred way to set an option |
1112 | 1112 | //now is passing it to the factory |
@@ -1120,10 +1120,10 @@ discard block |
||
1120 | 1120 | if ($this->_currentPage > 1) { |
1121 | 1121 | $this->_linkData[$this->_urlVar] = $this->getPreviousPageID(); |
1122 | 1122 | $back = $this->_renderLink($this->_altPrev, $this->_prevImg) |
1123 | - . $this->_spacesBefore . $this->_spacesAfter; |
|
1123 | + . $this->_spacesBefore.$this->_spacesAfter; |
|
1124 | 1124 | } else if ($this->_prevImgEmpty !== null && $this->_totalPages > 1) { |
1125 | 1125 | $back = $this->_prevImgEmpty |
1126 | - . $this->_spacesBefore . $this->_spacesAfter; |
|
1126 | + . $this->_spacesBefore.$this->_spacesAfter; |
|
1127 | 1127 | } |
1128 | 1128 | return $back; |
1129 | 1129 | } |
@@ -1139,7 +1139,7 @@ discard block |
||
1139 | 1139 | * @return string Links |
1140 | 1140 | * @access private |
1141 | 1141 | */ |
1142 | - function _getPageLinks($url='') |
|
1142 | + function _getPageLinks($url = '') |
|
1143 | 1143 | { |
1144 | 1144 | $msg = 'function "_getPageLinks()" not implemented.'; |
1145 | 1145 | return $this->raiseError($msg, ERROR_PAGER_NOT_IMPLEMENTED); |
@@ -1157,7 +1157,7 @@ discard block |
||
1157 | 1157 | * @return string The link |
1158 | 1158 | * @access private |
1159 | 1159 | */ |
1160 | - function _getNextLink($url='', $link='') |
|
1160 | + function _getNextLink($url = '', $link = '') |
|
1161 | 1161 | { |
1162 | 1162 | //legacy settings... the preferred way to set an option |
1163 | 1163 | //now is passing it to the factory |
@@ -1172,11 +1172,11 @@ discard block |
||
1172 | 1172 | $this->_linkData[$this->_urlVar] = $this->getNextPageID(); |
1173 | 1173 | $next = $this->_spacesAfter |
1174 | 1174 | . $this->_renderLink($this->_altNext, $this->_nextImg) |
1175 | - . $this->_spacesBefore . $this->_spacesAfter; |
|
1175 | + . $this->_spacesBefore.$this->_spacesAfter; |
|
1176 | 1176 | } else if ($this->_nextImgEmpty !== null && $this->_totalPages > 1) { |
1177 | 1177 | $next = $this->_spacesAfter |
1178 | 1178 | . $this->_nextImgEmpty |
1179 | - . $this->_spacesBefore . $this->_spacesAfter; |
|
1179 | + . $this->_spacesBefore.$this->_spacesAfter; |
|
1180 | 1180 | } |
1181 | 1181 | return $next; |
1182 | 1182 | } |
@@ -1308,13 +1308,13 @@ discard block |
||
1308 | 1308 | { |
1309 | 1309 | $this->_linkData[$this->_urlVar] = $pageID; |
1310 | 1310 | if ($this->_append) { |
1311 | - $href = '?' . $this->_http_build_query_wrapper($this->_linkData); |
|
1311 | + $href = '?'.$this->_http_build_query_wrapper($this->_linkData); |
|
1312 | 1312 | } else { |
1313 | 1313 | $href = str_replace('%d', $this->_linkData[$this->_urlVar], $this->_fileName); |
1314 | 1314 | } |
1315 | 1315 | // Modified by Ivan Tcholakov, 17-OCT-2008. |
1316 | 1316 | //return htmlentities($this->_url . $href, ENT_COMPAT, 'UTF-8'); |
1317 | - return api_htmlentities($this->_url . $href); |
|
1317 | + return api_htmlentities($this->_url.$href); |
|
1318 | 1318 | // |
1319 | 1319 | } |
1320 | 1320 | |
@@ -1342,7 +1342,7 @@ discard block |
||
1342 | 1342 | * @return string xhtml select box |
1343 | 1343 | * @access public |
1344 | 1344 | */ |
1345 | - function getPerPageSelectBox($start=5, $end=30, $step=5, $showAllData=false, $extraParams=array()) |
|
1345 | + function getPerPageSelectBox($start = 5, $end = 30, $step = 5, $showAllData = false, $extraParams = array()) |
|
1346 | 1346 | { |
1347 | 1347 | include_once 'Pager/HtmlWidgets.php'; |
1348 | 1348 | $widget = new Pager_HtmlWidgets($this); |
@@ -1393,8 +1393,8 @@ discard block |
||
1393 | 1393 | $this->_linkData[$this->_urlVar] = 1; |
1394 | 1394 | return $this->_renderLink( |
1395 | 1395 | str_replace('%d', 1, $this->_altFirst), |
1396 | - $this->_firstPagePre . $this->_firstPageText . $this->_firstPagePost |
|
1397 | - ) . $this->_spacesBefore . $this->_spacesAfter; |
|
1396 | + $this->_firstPagePre.$this->_firstPageText.$this->_firstPagePost |
|
1397 | + ).$this->_spacesBefore.$this->_spacesAfter; |
|
1398 | 1398 | } |
1399 | 1399 | |
1400 | 1400 | // }}} |
@@ -1415,7 +1415,7 @@ discard block |
||
1415 | 1415 | $this->_linkData[$this->_urlVar] = $this->_totalPages; |
1416 | 1416 | return $this->_renderLink( |
1417 | 1417 | str_replace('%d', $this->_totalPages, $this->_altLast), |
1418 | - $this->_lastPagePre . $this->_lastPageText . $this->_lastPagePost |
|
1418 | + $this->_lastPagePre.$this->_lastPageText.$this->_lastPagePost |
|
1419 | 1419 | ); |
1420 | 1420 | } |
1421 | 1421 | |
@@ -1455,7 +1455,7 @@ discard block |
||
1455 | 1455 | */ |
1456 | 1456 | function _http_build_query_wrapper($data) |
1457 | 1457 | { |
1458 | - $data = (array)$data; |
|
1458 | + $data = (array) $data; |
|
1459 | 1459 | if (empty($data)) { |
1460 | 1460 | return ''; |
1461 | 1461 | } |
@@ -1463,12 +1463,12 @@ discard block |
||
1463 | 1463 | if ($separator == '&') { |
1464 | 1464 | $separator = '&'; //the string is escaped by htmlentities anyway... |
1465 | 1465 | } |
1466 | - $tmp = array (); |
|
1466 | + $tmp = array(); |
|
1467 | 1467 | foreach ($data as $key => $val) { |
1468 | 1468 | if (is_scalar($val)) { |
1469 | 1469 | //array_push($tmp, $key.'='.$val); |
1470 | 1470 | $val = urlencode($val); |
1471 | - array_push($tmp, $key .'='. str_replace('%2F', '/', $val)); |
|
1471 | + array_push($tmp, $key.'='.str_replace('%2F', '/', $val)); |
|
1472 | 1472 | continue; |
1473 | 1473 | } |
1474 | 1474 | // If the value is an array, recursively parse it |
@@ -1494,7 +1494,7 @@ discard block |
||
1494 | 1494 | */ |
1495 | 1495 | function __http_build_query($array, $name) |
1496 | 1496 | { |
1497 | - $tmp = array (); |
|
1497 | + $tmp = array(); |
|
1498 | 1498 | $separator = ini_get('arg_separator.output'); |
1499 | 1499 | if ($separator == '&') { |
1500 | 1500 | $separator = '&'; //the string is escaped by htmlentities anyway... |
@@ -1569,7 +1569,7 @@ discard block |
||
1569 | 1569 | { |
1570 | 1570 | foreach ($options as $key => $value) { |
1571 | 1571 | if (in_array($key, $this->_allowed_options) && (!is_null($value))) { |
1572 | - $this->{'_' . $key} = $value; |
|
1572 | + $this->{'_'.$key} = $value; |
|
1573 | 1573 | } |
1574 | 1574 | } |
1575 | 1575 | |
@@ -1584,7 +1584,7 @@ discard block |
||
1584 | 1584 | } |
1585 | 1585 | |
1586 | 1586 | if (substr($this->_path, -1, 1) == '/') { |
1587 | - $this->_fileName = ltrim($this->_fileName, '/'); //strip leading slash |
|
1587 | + $this->_fileName = ltrim($this->_fileName, '/'); //strip leading slash |
|
1588 | 1588 | } |
1589 | 1589 | |
1590 | 1590 | if ($this->_append) { |
@@ -1615,8 +1615,8 @@ discard block |
||
1615 | 1615 | } |
1616 | 1616 | |
1617 | 1617 | if (strlen($this->_curPageLinkClassName)) { |
1618 | - $this->_curPageSpanPre .= '<span class="'.$this->_curPageLinkClassName.'">'; |
|
1619 | - $this->_curPageSpanPost = '</span>' . $this->_curPageSpanPost; |
|
1618 | + $this->_curPageSpanPre .= '<span class="'.$this->_curPageLinkClassName.'">'; |
|
1619 | + $this->_curPageSpanPost = '</span>'.$this->_curPageSpanPost; |
|
1620 | 1620 | } |
1621 | 1621 | |
1622 | 1622 | $this->_perPage = max($this->_perPage, 1); //avoid possible user errors |
@@ -1625,7 +1625,7 @@ discard block |
||
1625 | 1625 | session_start(); |
1626 | 1626 | } |
1627 | 1627 | if (!empty($_REQUEST[$this->_sessionVar])) { |
1628 | - $this->_perPage = max(1, (int)$_REQUEST[$this->_sessionVar]); |
|
1628 | + $this->_perPage = max(1, (int) $_REQUEST[$this->_sessionVar]); |
|
1629 | 1629 | if ($this->_useSessions) { |
1630 | 1630 | $_SESSION[$this->_sessionVar] = $this->_perPage; |
1631 | 1631 | } |
@@ -1647,7 +1647,7 @@ discard block |
||
1647 | 1647 | // |
1648 | 1648 | |
1649 | 1649 | if (isset($_REQUEST[$this->_urlVar]) && empty($options['currentPage'])) { |
1650 | - $this->_currentPage = (int)$_REQUEST[$this->_urlVar]; |
|
1650 | + $this->_currentPage = (int) $_REQUEST[$this->_urlVar]; |
|
1651 | 1651 | } |
1652 | 1652 | $this->_currentPage = max($this->_currentPage, 1); |
1653 | 1653 | $this->_linkData = $this->_getLinksData(); |
@@ -1672,7 +1672,7 @@ discard block |
||
1672 | 1672 | $msg = 'invalid option: '.$name; |
1673 | 1673 | return $this->raiseError($msg, ERROR_PAGER_INVALID); |
1674 | 1674 | } |
1675 | - return $this->{'_' . $name}; |
|
1675 | + return $this->{'_'.$name}; |
|
1676 | 1676 | } |
1677 | 1677 | |
1678 | 1678 | // }}} |
@@ -1688,7 +1688,7 @@ discard block |
||
1688 | 1688 | { |
1689 | 1689 | $options = array(); |
1690 | 1690 | foreach ($this->_allowed_options as $option) { |
1691 | - $options[$option] = $this->{'_' . $option}; |
|
1691 | + $options[$option] = $this->{'_'.$option}; |
|
1692 | 1692 | } |
1693 | 1693 | return $options; |
1694 | 1694 | } |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | */ |
113 | 113 | function getPageRangeByPageId($pageid = null) |
114 | 114 | { |
115 | - $pageid = isset($pageid) ? (int)$pageid : $this->_currentPage; |
|
115 | + $pageid = isset($pageid) ? (int) $pageid : $this->_currentPage; |
|
116 | 116 | if (!isset($this->_pageData)) { |
117 | 117 | $this->_generatePageData(); |
118 | 118 | } |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | * @return array back/pages/next/first/last/all links |
147 | 147 | * @access public |
148 | 148 | */ |
149 | - function getLinks($pageID = null, $dummy='') |
|
149 | + function getLinks($pageID = null, $dummy = '') |
|
150 | 150 | { |
151 | 151 | if (!is_null($pageID)) { |
152 | 152 | $_sav = $this->_currentPage; |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | |
252 | 252 | if ($i == $this->_currentPage) { |
253 | 253 | $this->range[$i] = true; |
254 | - $links .= $this->_curPageSpanPre . $i . $this->_curPageSpanPost; |
|
254 | + $links .= $this->_curPageSpanPre.$i.$this->_curPageSpanPost; |
|
255 | 255 | } else { |
256 | 256 | $this->range[$i] = false; |
257 | 257 | $this->_linkData[$this->_urlVar] = $i; |
@@ -262,8 +262,8 @@ discard block |
||
262 | 262 | } |
263 | 263 | |
264 | 264 | if ($this->_expanded && $expansion_after) { |
265 | - $links .= $this->_separator . $this->_spacesAfter; |
|
266 | - for ($i = $this->_currentPage + $this->_delta +1; $expansion_after; $expansion_after--, $i++) { |
|
265 | + $links .= $this->_separator.$this->_spacesAfter; |
|
266 | + for ($i = $this->_currentPage + $this->_delta + 1; $expansion_after; $expansion_after--, $i++) { |
|
267 | 267 | $print_separator_flag = ($expansion_after != 1); |
268 | 268 | $this->range[$i] = false; |
269 | 269 | $this->_linkData[$this->_urlVar] = $i; |
@@ -275,14 +275,14 @@ discard block |
||
275 | 275 | |
276 | 276 | } else { |
277 | 277 | //if $this->_totalPages <= (2*Delta+1) show them all |
278 | - for ($i=1; $i<=$this->_totalPages; $i++) { |
|
278 | + for ($i = 1; $i <= $this->_totalPages; $i++) { |
|
279 | 279 | if ($i != $this->_currentPage) { |
280 | 280 | $this->range[$i] = false; |
281 | 281 | $this->_linkData[$this->_urlVar] = $i; |
282 | 282 | $links .= $this->_renderLink(str_replace('%d', $i, $this->_altPage), $i); |
283 | 283 | } else { |
284 | 284 | $this->range[$i] = true; |
285 | - $links .= $this->_curPageSpanPre . $i . $this->_curPageSpanPost; |
|
285 | + $links .= $this->_curPageSpanPre.$i.$this->_curPageSpanPost; |
|
286 | 286 | } |
287 | 287 | $links .= $this->_spacesBefore |
288 | 288 | . (($i != $this->_totalPages) ? $this->_separator.$this->_spacesAfter : ''); |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | } |
92 | 92 | |
93 | 93 | if (($index % $this->_perPage) > 0) { |
94 | - $pageID = ceil((float)$index / (float)$this->_perPage); |
|
94 | + $pageID = ceil((float) $index / (float) $this->_perPage); |
|
95 | 95 | } else { |
96 | 96 | $pageID = $index / $this->_perPage; |
97 | 97 | } |
@@ -117,14 +117,14 @@ discard block |
||
117 | 117 | */ |
118 | 118 | function getPageRangeByPageId($pageid = null) |
119 | 119 | { |
120 | - $pageid = isset($pageid) ? (int)$pageid : $this->_currentPage; |
|
120 | + $pageid = isset($pageid) ? (int) $pageid : $this->_currentPage; |
|
121 | 121 | if (isset($this->_pageData[$pageid]) || is_null($this->_itemData)) { |
122 | 122 | // I'm sure I'm missing something here, but this formula works |
123 | 123 | // so I'm using it until I find something simpler. |
124 | - $start = ((($pageid + (($this->_delta - ($pageid % $this->_delta))) % $this->_delta) / $this->_delta) - 1) * $this->_delta +1; |
|
124 | + $start = ((($pageid + (($this->_delta - ($pageid % $this->_delta))) % $this->_delta) / $this->_delta) - 1) * $this->_delta + 1; |
|
125 | 125 | return array( |
126 | 126 | max($start, 1), |
127 | - min($start+$this->_delta-1, $this->_totalPages) |
|
127 | + min($start + $this->_delta - 1, $this->_totalPages) |
|
128 | 128 | ); |
129 | 129 | } else { |
130 | 130 | return array(0, 0); |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | * |
154 | 154 | * @return array Back/pages/next links |
155 | 155 | */ |
156 | - function getLinks($pageID=null, $next_html='') |
|
156 | + function getLinks($pageID = null, $next_html = '') |
|
157 | 157 | { |
158 | 158 | //BC hack |
159 | 159 | if (!empty($next_html)) { |
@@ -240,14 +240,14 @@ discard block |
||
240 | 240 | $links = ''; |
241 | 241 | $limits = $this->getPageRangeByPageId($this->_currentPage); |
242 | 242 | |
243 | - for ($i=$limits[0]; $i<=min($limits[1], $this->_totalPages); $i++) { |
|
243 | + for ($i = $limits[0]; $i <= min($limits[1], $this->_totalPages); $i++) { |
|
244 | 244 | if ($i != $this->_currentPage) { |
245 | 245 | $this->range[$i] = false; |
246 | 246 | $this->_linkData[$this->_urlVar] = $i; |
247 | 247 | $links .= $this->_renderLink(str_replace('%d', $i, $this->_altPage), $i); |
248 | 248 | } else { |
249 | 249 | $this->range[$i] = true; |
250 | - $links .= $this->_curPageSpanPre . $i . $this->_curPageSpanPost; |
|
250 | + $links .= $this->_curPageSpanPre.$i.$this->_curPageSpanPost; |
|
251 | 251 | } |
252 | 252 | $links .= $this->_spacesBefore |
253 | 253 | . (($i != $this->_totalPages) ? $this->_separator.$this->_spacesAfter : ''); |
@@ -169,8 +169,8 @@ |
||
169 | 169 | static function &factory($options = array()) |
170 | 170 | { |
171 | 171 | $mode = (isset($options['mode']) ? ucfirst($options['mode']) : 'Jumping'); |
172 | - $classname = 'Pager_' . $mode; |
|
173 | - $classfile = 'Pager' . DIRECTORY_SEPARATOR . $mode . '.php'; |
|
172 | + $classname = 'Pager_'.$mode; |
|
173 | + $classfile = 'Pager'.DIRECTORY_SEPARATOR.$mode.'.php'; |
|
174 | 174 | |
175 | 175 | // Attempt to include a custom version of the named class, but don't treat |
176 | 176 | // a failure as fatal. The caller may have already included their own |
@@ -683,7 +683,7 @@ discard block |
||
683 | 683 | $space = (1 + $this->_options['line_spacing']) |
684 | 684 | * $this->_options['font_size']; |
685 | 685 | |
686 | - $max_lines = (int)$this->_options['max_lines']; |
|
686 | + $max_lines = (int) $this->_options['max_lines']; |
|
687 | 687 | |
688 | 688 | if (($max_lines < 1) && !$force) { |
689 | 689 | return false; |
@@ -732,7 +732,7 @@ discard block |
||
732 | 732 | 'color' => $c |
733 | 733 | ); |
734 | 734 | $text_width = max($text_width, ($bounds[2] - $bounds[0])); |
735 | - $text_height += (int)$space; |
|
735 | + $text_height += (int) $space; |
|
736 | 736 | if (($text_height > $block_height) && !$force) { |
737 | 737 | return false; |
738 | 738 | } |
@@ -749,7 +749,7 @@ discard block |
||
749 | 749 | $text_line_next = $token; |
750 | 750 | $beginning_of_line = false; |
751 | 751 | } else { |
752 | - $text_line_next = $text_line . ' ' . $token; |
|
752 | + $text_line_next = $text_line.' '.$token; |
|
753 | 753 | } |
754 | 754 | $bounds = imagettfbbox($size, 0, $font, $text_line_next); |
755 | 755 | $prev_width = isset($prev_width) ? $width : 0; |
@@ -776,7 +776,7 @@ discard block |
||
776 | 776 | 'color' => $c |
777 | 777 | ); |
778 | 778 | $text_width = max($text_width, ($bounds[2] - $bounds[0])); |
779 | - $text_height += (int)$space; |
|
779 | + $text_height += (int) $space; |
|
780 | 780 | if (($text_height > $block_height) && !$force) { |
781 | 781 | return false; |
782 | 782 | } |
@@ -990,7 +990,7 @@ discard block |
||
990 | 990 | { |
991 | 991 | if (!headers_sent()) { |
992 | 992 | header( |
993 | - "Content-type: " . |
|
993 | + "Content-type: ". |
|
994 | 994 | image_type_to_mime_type($this->_options['image_type']) |
995 | 995 | ); |
996 | 996 | } else { |
@@ -1121,7 +1121,7 @@ discard block |
||
1121 | 1121 | $y += $vC[1]; |
1122 | 1122 | } |
1123 | 1123 | } |
1124 | - return array('x' => (int)round($x, 0), 'y' => (int)round($y, 0)); |
|
1124 | + return array('x' => (int) round($x, 0), 'y' => (int) round($y, 0)); |
|
1125 | 1125 | } |
1126 | 1126 | |
1127 | 1127 | /** |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | |
53 | 53 | echo '<tr>'; |
54 | 54 | self::display_dashboard_plugin_checkboxes($testplugin); |
55 | - for ($i = 0 ; $i < count($table_cols); $i++) { |
|
55 | + for ($i = 0; $i < count($table_cols); $i++) { |
|
56 | 56 | if (isset($plugin_info[strtolower($table_cols[$i])])) { |
57 | 57 | echo '<td>'; |
58 | 58 | echo $plugin_info[$table_cols[$i]]; |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | echo Display::tag( |
68 | 68 | 'tr', |
69 | 69 | Display::tag('td', |
70 | - get_lang('CheckFilePermissions') . ' ' . Security::remove_XSS($plugin_info_file), |
|
70 | + get_lang('CheckFilePermissions').' '.Security::remove_XSS($plugin_info_file), |
|
71 | 71 | array('colspan' => '3')) |
72 | 72 | ); |
73 | 73 | } |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | foreach ($disabled_blocks_data as $disabled_block) { |
80 | 80 | echo '<tr style="background-color:#eee">'; |
81 | 81 | echo '<td><center><input type="checkbox" name="disabled_block" value="true" checked disabled /></center>'; |
82 | - for ($j = 0 ; $j < count($table_cols); $j++) { |
|
82 | + for ($j = 0; $j < count($table_cols); $j++) { |
|
83 | 83 | if (isset($disabled_block[strtolower($table_cols[$j])])) { |
84 | 84 | if ($j == 2) { |
85 | 85 | echo '<td>'; |
@@ -189,10 +189,10 @@ discard block |
||
189 | 189 | } |
190 | 190 | // clean from block data |
191 | 191 | if (!empty($not_selected_blocks_id)) { |
192 | - $sql_check = "SELECT id FROM $tbl_block WHERE id IN(".implode(',',$not_selected_blocks_id).")"; |
|
192 | + $sql_check = "SELECT id FROM $tbl_block WHERE id IN(".implode(',', $not_selected_blocks_id).")"; |
|
193 | 193 | $rs_check = Database::query($sql_check); |
194 | 194 | if (Database::num_rows($rs_check) > 0) { |
195 | - $del = "DELETE FROM $tbl_block WHERE id IN(".implode(',',$not_selected_blocks_id).")"; |
|
195 | + $del = "DELETE FROM $tbl_block WHERE id IN(".implode(',', $not_selected_blocks_id).")"; |
|
196 | 196 | Database::query($del); |
197 | 197 | } |
198 | 198 | } |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | $affected_rows = Database::affected_rows($result); |
213 | 213 | } else { |
214 | 214 | // insert |
215 | - $plugin_info_file = $dashboard_pluginpath . $testplugin . "/$testplugin.info"; |
|
215 | + $plugin_info_file = $dashboard_pluginpath.$testplugin."/$testplugin.info"; |
|
216 | 216 | $plugin_info = array(); |
217 | 217 | if (file_exists($plugin_info_file)) { |
218 | 218 | $plugin_info = parse_info_file($plugin_info_file); |
@@ -282,10 +282,10 @@ discard block |
||
282 | 282 | // We check if plugin exists inside directory for updating active field |
283 | 283 | $sql = "SELECT * FROM $tbl_block"; |
284 | 284 | $rs = Database::query($sql); |
285 | - if (Database::num_rows($rs) > 0){ |
|
285 | + if (Database::num_rows($rs) > 0) { |
|
286 | 286 | while ($row = Database::fetch_array($rs)) { |
287 | 287 | $path = $row['path']; |
288 | - if (!in_array($row['path'],$possibleplugins)) { |
|
288 | + if (!in_array($row['path'], $possibleplugins)) { |
|
289 | 289 | $active = 0; |
290 | 290 | } else { |
291 | 291 | $active = 1; |
@@ -390,13 +390,13 @@ discard block |
||
390 | 390 | echo '<td>'.$block['description'].'</td>'; |
391 | 391 | echo '<td> |
392 | 392 | <select class="selectpicker show-tick form-control" name="columns['.$block['id'].']"> |
393 | - <option value="1" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column']==1?'selected':'').' >1</option> |
|
394 | - <option value="2" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column']==2?'selected':'').' >2</option> |
|
393 | + <option value="1" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column'] == 1 ? 'selected' : '').' >1</option> |
|
394 | + <option value="2" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column'] == 2 ? 'selected' : '').' >2</option> |
|
395 | 395 | </select> |
396 | 396 | </td>'; |
397 | 397 | echo '</tr>'; |
398 | 398 | } else { |
399 | - echo Display::tag('tr', Display::tag('td', get_lang('Error').' '.$controller_class, array('colspan'=>'3'))); |
|
399 | + echo Display::tag('tr', Display::tag('td', get_lang('Error').' '.$controller_class, array('colspan'=>'3'))); |
|
400 | 400 | } |
401 | 401 | } |
402 | 402 | |
@@ -475,10 +475,10 @@ discard block |
||
475 | 475 | $user_id = intval($user_id); |
476 | 476 | $field_variable = 'dashboard'; |
477 | 477 | $extra_user_data = UserManager::get_extra_user_data_by_field($user_id, $field_variable); |
478 | - $extra_user_data = explode(';',$extra_user_data[$field_variable]); |
|
478 | + $extra_user_data = explode(';', $extra_user_data[$field_variable]); |
|
479 | 479 | $data = array(); |
480 | 480 | foreach ($extra_user_data as $extra) { |
481 | - $split_extra = explode(':',$extra); |
|
481 | + $split_extra = explode(':', $extra); |
|
482 | 482 | if (!empty($split_extra)) { |
483 | 483 | $block_id = $split_extra[0]; |
484 | 484 | $column = isset($split_extra[1]) ? $split_extra[1] : null; |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | |
125 | 125 | // If the mail only need to be send once (we know that thanks to the events.conf), we log it in the table |
126 | 126 | if ($event_config[$event_name]["sending_mail_once"]) { |
127 | - $sql = 'INSERT INTO ' . Database::get_main_table(TABLE_EVENT_SENT) . ' (user_from, user_to, event_type_name) |
|
127 | + $sql = 'INSERT INTO '.Database::get_main_table(TABLE_EVENT_SENT).' (user_from, user_to, event_type_name) |
|
128 | 128 | VALUES ('.$event_data["user_id"].', '.$id.' ,"'.Database::escape_string($event_name).'") |
129 | 129 | '; |
130 | 130 | Database::query($sql); |
@@ -135,9 +135,9 @@ discard block |
||
135 | 135 | // Second, we send to people linked to the event |
136 | 136 | // So, we get everyone |
137 | 137 | $sql = 'SELECT u.user_id, u.language, u.email, u.firstname, u.lastname |
138 | - FROM ' . Database::get_main_table(TABLE_EVENT_TYPE_REL_USER) . ' ue |
|
138 | + FROM ' . Database::get_main_table(TABLE_EVENT_TYPE_REL_USER).' ue |
|
139 | 139 | INNER JOIN '.Database::get_main_table(TABLE_MAIN_USER).' u ON u.user_id = ue.user_id |
140 | - WHERE event_type_name = "' . $event_name . '"'; |
|
140 | + WHERE event_type_name = "' . $event_name.'"'; |
|
141 | 141 | $result = Database::store_result(Database::query($sql), 'ASSOC'); |
142 | 142 | // for each of the linked users |
143 | 143 | foreach ($result as $key => $value) { |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | |
178 | 178 | // If the mail only need to be send once (we know that thanks to the events.conf, we log it in the table |
179 | 179 | if ($event_config[$event_name]["sending_mail_once"]) { |
180 | - $sql = 'INSERT INTO ' . Database::get_main_table(TABLE_EVENT_SENT) . ' |
|
180 | + $sql = 'INSERT INTO '.Database::get_main_table(TABLE_EVENT_SENT).' |
|
181 | 181 | (user_from, user_to, event_type_name) |
182 | 182 | VALUES ('.$event_data["user_id"].', '.$value["user_id"].' , "'.Database::escape_string($event_name).'"); |
183 | 183 | '; |
@@ -202,16 +202,16 @@ discard block |
||
202 | 202 | $current_language = api_get_interface_language(); |
203 | 203 | |
204 | 204 | $sql = 'SELECT COUNT(*) as total |
205 | - FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE) . ' em |
|
206 | - INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE) . ' l |
|
205 | + FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE).' em |
|
206 | + INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE).' l |
|
207 | 207 | ON em.language_id = l.id |
208 | 208 | WHERE |
209 | - em.event_type_name = "' . $event_name . '" and |
|
209 | + em.event_type_name = "' . $event_name.'" and |
|
210 | 210 | l.dokeos_folder = "'.$current_language.'" and |
211 | 211 | em.activated = 1'; |
212 | 212 | |
213 | 213 | $exists = Database::store_result(Database::query($sql), 'ASSOC'); |
214 | - if ($exists[0]["total"]) { |
|
214 | + if ($exists[0]["total"]) { |
|
215 | 215 | return true; |
216 | 216 | } else { |
217 | 217 | return false; |
@@ -228,12 +228,12 @@ discard block |
||
228 | 228 | private static function getMessage($event_name, $language) |
229 | 229 | { |
230 | 230 | $sql = 'SELECT message, subject, l.dokeos_folder |
231 | - FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE) . ' em |
|
232 | - INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE) . ' l |
|
231 | + FROM ' . Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE).' em |
|
232 | + INNER JOIN ' . Database::get_main_table(TABLE_MAIN_LANGUAGE).' l |
|
233 | 233 | ON em.language_id = l.id |
234 | 234 | WHERE |
235 | - em.event_type_name = "' . $event_name . '" AND |
|
236 | - (l.dokeos_folder = "' . $language . '" OR l.dokeos_folder = "english") AND |
|
235 | + em.event_type_name = "' . $event_name.'" AND |
|
236 | + (l.dokeos_folder = "' . $language.'" OR l.dokeos_folder = "english") AND |
|
237 | 237 | em.message <> "" |
238 | 238 | '; |
239 | 239 | return Database::store_result(Database::query($sql), 'ASSOC'); |
@@ -274,8 +274,8 @@ discard block |
||
274 | 274 | private static function formatMessage(&$message, &$subject, $event_config, $event_name, &$event_data) |
275 | 275 | { |
276 | 276 | foreach ($event_config[$event_name]["available_keyvars"] as $key => $word) { |
277 | - $message = str_replace('((' . $key . '))', $event_data[$word], $message); |
|
278 | - $subject = str_replace('((' . $key . '))', $event_data[$word], $subject); |
|
277 | + $message = str_replace('(('.$key.'))', $event_data[$word], $message); |
|
278 | + $subject = str_replace('(('.$key.'))', $event_data[$word], $subject); |
|
279 | 279 | } |
280 | 280 | } |
281 | 281 | } |
@@ -7,14 +7,14 @@ discard block |
||
7 | 7 | class EventEmailTemplate extends Model |
8 | 8 | { |
9 | 9 | public $table; |
10 | - public $columns = array('id', 'message','subject','event_type_name','activated'); |
|
10 | + public $columns = array('id', 'message', 'subject', 'event_type_name', 'activated'); |
|
11 | 11 | |
12 | 12 | /** |
13 | 13 | * Constructor |
14 | 14 | */ |
15 | 15 | public function __construct() |
16 | 16 | { |
17 | - $this->table = Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE); |
|
17 | + $this->table = Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE); |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | public function get_all($where_conditions = array()) |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | // action links |
35 | 35 | $content = Display::actions(array( |
36 | 36 | array( |
37 | - 'url' => 'event_type.php' , |
|
37 | + 'url' => 'event_type.php', |
|
38 | 38 | 'content' => Display::return_icon('new_document.png', get_lang('Add'), array(), ICON_SIZE_MEDIUM) |
39 | 39 | ) |
40 | 40 | ) |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | |
115 | 115 | public function get_count() |
116 | 116 | { |
117 | - $row = Database::select('count(*) as count', $this->table, array(),'first'); |
|
117 | + $row = Database::select('count(*) as count', $this->table, array(), 'first'); |
|
118 | 118 | |
119 | 119 | return $row['count']; |
120 | 120 | } |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | array('url' => api_get_path(WEB_CODE_PATH).'mySpace/admin_view.php?display=course', 'content' => get_lang('DisplayCourseOverview')), |
26 | 26 | array('url' => api_get_path(WEB_CODE_PATH).'tracking/question_course_report.php?view=admin', 'content' => get_lang('LPQuestionListResults')), |
27 | 27 | array('url' => api_get_path(WEB_CODE_PATH).'tracking/course_session_report.php?view=admin', 'content' => get_lang('LPExerciseResultsBySession')), |
28 | - ['url' => api_get_path(WEB_CODE_PATH) . 'mySpace/admin_view.php?display=accessoverview', 'content' => get_lang('DisplayAccessOverview') . ' (' . get_lang('Beta') . ')'] |
|
28 | + ['url' => api_get_path(WEB_CODE_PATH).'mySpace/admin_view.php?display=accessoverview', 'content' => get_lang('DisplayAccessOverview').' ('.get_lang('Beta').')'] |
|
29 | 29 | ); |
30 | 30 | |
31 | 31 | return Display :: actions($actions, null); |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | public static function getTopMenu() |
35 | 35 | { |
36 | 36 | $menu_items = array(); |
37 | - $menu_items[] = Display::url(Display::return_icon('stats.png', get_lang('MyStats'),'',ICON_SIZE_MEDIUM),api_get_path(WEB_CODE_PATH)."auth/my_progress.php" ); |
|
37 | + $menu_items[] = Display::url(Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH)."auth/my_progress.php"); |
|
38 | 38 | $menu_items[] = Display::url(Display::return_icon('teacher.png', get_lang('TeacherInterface'), array(), 32), api_get_path(WEB_CODE_PATH).'mySpace/?view=teacher'); |
39 | 39 | $menu_items[] = Display::url(Display::return_icon('star_na.png', get_lang('AdminInterface'), array(), 32), '#'); |
40 | 40 | $menu_items[] = Display::url(Display::return_icon('quiz.png', get_lang('ExamTracking'), array(), 32), api_get_path(WEB_CODE_PATH).'tracking/exams.php'); |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | $session_id = intval($session_id); |
105 | 105 | |
106 | 106 | $sql = 'SELECT login_course_date, logout_course_date |
107 | - FROM ' . $tbl_track_course . ' |
|
107 | + FROM ' . $tbl_track_course.' |
|
108 | 108 | WHERE |
109 | 109 | user_id = '.$user_id.' AND |
110 | 110 | c_id = '.$courseId.' AND |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | foreach ($course_list as $course_item) { |
144 | 144 | $courseInfo = api_get_course_info($course_item['code']); |
145 | 145 | $courseId = $courseInfo['real_id']; |
146 | - $new_course_list[] = '"'.$courseId.'"'; |
|
146 | + $new_course_list[] = '"'.$courseId.'"'; |
|
147 | 147 | } |
148 | 148 | $course_list = implode(', ', $new_course_list); |
149 | 149 | |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | return false; |
152 | 152 | } |
153 | 153 | $sql = 'SELECT login_course_date, logout_course_date, c_id |
154 | - FROM ' . $tbl_track_course . ' |
|
154 | + FROM ' . $tbl_track_course.' |
|
155 | 155 | WHERE |
156 | 156 | user_id = '.$user_id.' AND |
157 | 157 | c_id IN ('.$course_list.') AND |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | // student score |
230 | 230 | $avg_score = Tracking :: get_avg_student_score($user_id, $courseCode); |
231 | 231 | if (is_numeric($avg_score)) { |
232 | - $avg_score = round($avg_score,2); |
|
232 | + $avg_score = round($avg_score, 2); |
|
233 | 233 | } else { |
234 | 234 | $$avg_score = '-'; |
235 | 235 | } |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | |
266 | 266 | $t_head = ' <table style="width: 100%;border:0;padding:0;border-collapse:collapse;table-layout: fixed">'; |
267 | 267 | //$t_head .= ' <caption>'.get_lang('CourseInformation').'</caption>'; |
268 | - $t_head .= '<tr>'; |
|
268 | + $t_head .= '<tr>'; |
|
269 | 269 | $t_head .= ' <th width="155px" style="border-left:0;border-bottom:0"><span>'.get_lang('Course').'</span></th>'; |
270 | 270 | $t_head .= ' <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgTimeSpentInTheCourse'), 6, true).'</span></th>'; |
271 | 271 | $t_head .= ' <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgStudentsProgress'), 6, true).'</span></th>'; |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | |
284 | 284 | $addparams = array('view' => 'admin', 'display' => 'user'); |
285 | 285 | |
286 | - $table = new SortableTable('tracking_user_overview', array('MySpace','get_number_of_users_tracking_overview'), array('MySpace','get_user_data_tracking_overview'), 0); |
|
286 | + $table = new SortableTable('tracking_user_overview', array('MySpace', 'get_number_of_users_tracking_overview'), array('MySpace', 'get_user_data_tracking_overview'), 0); |
|
287 | 287 | $table->additional_parameters = $addparams; |
288 | 288 | |
289 | 289 | $table->set_header(0, get_lang('OfficialCode'), true, array('style' => 'font-size:8pt'), array('style' => 'font-size:8pt')); |
@@ -296,7 +296,7 @@ discard block |
||
296 | 296 | } |
297 | 297 | $table->set_header(3, get_lang('LoginName'), true, array('style' => 'font-size:8pt'), array('style' => 'font-size:8pt')); |
298 | 298 | $table->set_header(4, $t_head, false, array('style' => 'width:90%;border:0;padding:0;font-size:7.5pt;'), array('style' => 'width:90%;padding:0;font-size:7.5pt;')); |
299 | - $table->set_column_filter(4, array('MySpace','course_info_tracking_filter')); |
|
299 | + $table->set_column_filter(4, array('MySpace', 'course_info_tracking_filter')); |
|
300 | 300 | $table->display(); |
301 | 301 | } |
302 | 302 | |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | $table -> set_header(7, get_lang('Sessions'), false); |
342 | 342 | |
343 | 343 | if ($is_western_name_order) { |
344 | - $csv_header[] = array ( |
|
344 | + $csv_header[] = array( |
|
345 | 345 | get_lang('FirstName', ''), |
346 | 346 | get_lang('LastName', ''), |
347 | 347 | get_lang('TimeSpentOnThePlatform', ''), |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | get_lang('NumberOfSessions', '') |
352 | 352 | ); |
353 | 353 | } else { |
354 | - $csv_header[] = array ( |
|
354 | + $csv_header[] = array( |
|
355 | 355 | get_lang('LastName', ''), |
356 | 356 | get_lang('FirstName', ''), |
357 | 357 | get_lang('TimeSpentOnThePlatform', ''), |
@@ -491,9 +491,9 @@ discard block |
||
491 | 491 | |
492 | 492 | if ($tracking_column != 3) { |
493 | 493 | if ($tracking_direction == 'DESC') { |
494 | - usort($all_datas, array('MySpace','rsort_users')); |
|
494 | + usort($all_datas, array('MySpace', 'rsort_users')); |
|
495 | 495 | } else { |
496 | - usort($all_datas, array('MySpace','sort_users')); |
|
496 | + usort($all_datas, array('MySpace', 'sort_users')); |
|
497 | 497 | } |
498 | 498 | } |
499 | 499 | |
@@ -552,7 +552,7 @@ discard block |
||
552 | 552 | /** |
553 | 553 | * Column config |
554 | 554 | */ |
555 | - $column_model = array( |
|
555 | + $column_model = array( |
|
556 | 556 | array( |
557 | 557 | 'name' => 'username', |
558 | 558 | 'index' => 'username', |
@@ -593,7 +593,7 @@ discard block |
||
593 | 593 | |
594 | 594 | $action_links = ''; |
595 | 595 | // jqgrid will use this URL to do the selects |
596 | - $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_session_lp_progress&session_id=' . $sessionId . '&course_id=' . $courseId . '&date_to=' . $date_to . '&date_from=' . $date_from; |
|
596 | + $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_session_lp_progress&session_id='.$sessionId.'&course_id='.$courseId.'&date_to='.$date_to.'&date_from='.$date_from; |
|
597 | 597 | |
598 | 598 | //Table Id |
599 | 599 | $tableId = 'lpProgress'; |
@@ -615,11 +615,11 @@ discard block |
||
615 | 615 | true |
616 | 616 | ); |
617 | 617 | |
618 | - $return = '<script>$(function() {'. $table . |
|
618 | + $return = '<script>$(function() {'.$table. |
|
619 | 619 | 'jQuery("#'.$tableId.'").jqGrid("navGrid","#'.$tableId.'_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true}); |
620 | 620 | jQuery("#'.$tableId.'").jqGrid("navButtonAdd","#'.$tableId.'_pager",{ |
621 | 621 | caption:"", |
622 | - title:"' . get_lang('ExportExcel') . '", |
|
622 | + title:"' . get_lang('ExportExcel').'", |
|
623 | 623 | onClickButton : function () { |
624 | 624 | jQuery("#'.$tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"}); |
625 | 625 | } |
@@ -669,7 +669,7 @@ discard block |
||
669 | 669 | /** |
670 | 670 | * Column config |
671 | 671 | */ |
672 | - $column_model = array( |
|
672 | + $column_model = array( |
|
673 | 673 | array('name'=>'session', 'index'=>'session', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"), |
674 | 674 | array('name'=>'exercise_id', 'index'=>'exercise_id', 'align'=>'left', 'search' => 'true'), |
675 | 675 | array('name'=>'quiz_title', 'index'=>'quiz_title', 'align'=>'left', 'search' => 'true'), |
@@ -686,7 +686,7 @@ discard block |
||
686 | 686 | //get dynamic column names |
687 | 687 | |
688 | 688 | // jqgrid will use this URL to do the selects |
689 | - $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_exercise_progress&session_id=' . $sessionId . '&course_id=' . $courseId . '&exercise_id=' . $exerciseId . '&date_to=' . $date_to . '&date_from=' . $date_from; |
|
689 | + $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_exercise_progress&session_id='.$sessionId.'&course_id='.$courseId.'&exercise_id='.$exerciseId.'&date_to='.$date_to.'&date_from='.$date_from; |
|
690 | 690 | |
691 | 691 | // Autowidth |
692 | 692 | $extra_params['autowidth'] = 'true'; |
@@ -697,11 +697,11 @@ discard block |
||
697 | 697 | $tableId = 'exerciseProgressOverview'; |
698 | 698 | $table = Display::grid_js($tableId, $url, $columns, $column_model, $extra_params, array(), '', true); |
699 | 699 | |
700 | - $return = '<script>$(function() {'. $table . |
|
700 | + $return = '<script>$(function() {'.$table. |
|
701 | 701 | 'jQuery("#'.$tableId.'").jqGrid("navGrid","#'.$tableId.'_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true}); |
702 | 702 | jQuery("#'.$tableId.'").jqGrid("navButtonAdd","#'.$tableId.'_pager",{ |
703 | 703 | caption:"", |
704 | - title:"' . get_lang('ExportExcel') . '", |
|
704 | + title:"' . get_lang('ExportExcel').'", |
|
705 | 705 | onClickButton : function () { |
706 | 706 | jQuery("#'.$tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"}); |
707 | 707 | } |
@@ -787,8 +787,8 @@ discard block |
||
787 | 787 | |
788 | 788 | $column[] = $title; |
789 | 789 | $column_model[] = array( |
790 | - 'name' => 'exer' . $i, |
|
791 | - 'index' => 'exer' . $i, |
|
790 | + 'name' => 'exer'.$i, |
|
791 | + 'index' => 'exer'.$i, |
|
792 | 792 | 'align' => 'center', |
793 | 793 | 'search' => 'true', |
794 | 794 | 'wrap_cell' => "true" |
@@ -800,7 +800,7 @@ discard block |
||
800 | 800 | |
801 | 801 | //end get dynamic column names |
802 | 802 | // jqgrid will use this URL to do the selects |
803 | - $url = api_get_path(WEB_AJAX_PATH) . 'model.ajax.php?a=get_exercise_grade&session_id=' . $sessionId . '&course_id=' . $courseId; |
|
803 | + $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_exercise_grade&session_id='.$sessionId.'&course_id='.$courseId; |
|
804 | 804 | |
805 | 805 | // Autowidth |
806 | 806 | $extra_params['autowidth'] = 'true'; |
@@ -811,13 +811,13 @@ discard block |
||
811 | 811 | $tableId = 'exerciseGradeOverview'; |
812 | 812 | $table = Display::grid_js($tableId, $url, $column, $column_model, $extra_params, array(), '', true); |
813 | 813 | |
814 | - $return = '<script>$(function() {' . $table . |
|
815 | - 'jQuery("#' . $tableId . '").jqGrid("navGrid","#' . $tableId . '_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true}); |
|
816 | - jQuery("#' . $tableId . '").jqGrid("navButtonAdd","#' . $tableId . '_pager",{ |
|
814 | + $return = '<script>$(function() {'.$table. |
|
815 | + 'jQuery("#'.$tableId.'").jqGrid("navGrid","#'.$tableId.'_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true}); |
|
816 | + jQuery("#' . $tableId.'").jqGrid("navButtonAdd","#'.$tableId.'_pager",{ |
|
817 | 817 | caption:"", |
818 | - title:"' . get_lang('ExportExcel') . '", |
|
818 | + title:"' . get_lang('ExportExcel').'", |
|
819 | 819 | onClickButton : function () { |
820 | - jQuery("#' . $tableId . '").jqGrid("excelExport",{"url":"' . $url . '&export_format=xls"}); |
|
820 | + jQuery("#' . $tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"}); |
|
821 | 821 | } |
822 | 822 | }); |
823 | 823 | });</script>'; |
@@ -850,10 +850,10 @@ discard block |
||
850 | 850 | /** |
851 | 851 | * Column config |
852 | 852 | */ |
853 | - $column_model = array( |
|
854 | - array('name'=>'username', 'index'=>'username', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"), |
|
855 | - array('name'=>'firstname', 'index'=>'firstname', 'align'=>'left', 'search' => 'true'), |
|
856 | - array('name'=>'lastname', 'index'=>'lastname', 'align'=>'left', 'search' => 'true'), |
|
853 | + $column_model = array( |
|
854 | + array('name'=>'username', 'index'=>'username', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"), |
|
855 | + array('name'=>'firstname', 'index'=>'firstname', 'align'=>'left', 'search' => 'true'), |
|
856 | + array('name'=>'lastname', 'index'=>'lastname', 'align'=>'left', 'search' => 'true'), |
|
857 | 857 | ); |
858 | 858 | //get dinamic column names |
859 | 859 | foreach ($questions as $question_id => $question) { |
@@ -869,7 +869,7 @@ discard block |
||
869 | 869 | $action_links = ''; |
870 | 870 | |
871 | 871 | // jqgrid will use this URL to do the selects |
872 | - $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_survey_overview&session_id=' . $sessionId . '&course_id=' . $courseId . '&survey_id=' . $surveyId . '&date_to=' . $date_to . '&date_from=' . $date_from; |
|
872 | + $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_survey_overview&session_id='.$sessionId.'&course_id='.$courseId.'&survey_id='.$surveyId.'&date_to='.$date_to.'&date_from='.$date_from; |
|
873 | 873 | |
874 | 874 | // Table Id |
875 | 875 | $tableId = 'lpProgress'; |
@@ -891,11 +891,11 @@ discard block |
||
891 | 891 | true |
892 | 892 | ); |
893 | 893 | |
894 | - $return = '<script>$(function() {'. $table . |
|
894 | + $return = '<script>$(function() {'.$table. |
|
895 | 895 | 'jQuery("#'.$tableId.'").jqGrid("navGrid","#'.$tableId.'_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true}); |
896 | 896 | jQuery("#'.$tableId.'").jqGrid("navButtonAdd","#'.$tableId.'_pager",{ |
897 | 897 | caption:"", |
898 | - title:"' . get_lang('ExportExcel') . '", |
|
898 | + title:"' . get_lang('ExportExcel').'", |
|
899 | 899 | onClickButton : function () { |
900 | 900 | jQuery("#'.$tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"}); |
901 | 901 | } |
@@ -910,7 +910,7 @@ discard block |
||
910 | 910 | * Display a sortable table that contains an overview off all the progress of the user in a session |
911 | 911 | * @author César Perales <[email protected]>, Beeznest Team |
912 | 912 | */ |
913 | - static function display_tracking_progress_overview($sessionId = 0, $courseId = 0, $date_from, $date_to) |
|
913 | + static function display_tracking_progress_overview($sessionId = 0, $courseId = 0, $date_from, $date_to) |
|
914 | 914 | { |
915 | 915 | //The order is important you need to check the the $column variable in the model.ajax.php file |
916 | 916 | $columns = array( |
@@ -960,55 +960,55 @@ discard block |
||
960 | 960 | ); |
961 | 961 | |
962 | 962 | //Column config |
963 | - $column_model = array( |
|
964 | - array('name'=>'lastname', 'index'=>'lastname', 'align'=>'left'), |
|
965 | - array('name'=>'firstname', 'index'=>'firstname', 'align'=>'left'), |
|
966 | - array('name'=>'username', 'index'=>'username', 'align'=>'left'), |
|
963 | + $column_model = array( |
|
964 | + array('name'=>'lastname', 'index'=>'lastname', 'align'=>'left'), |
|
965 | + array('name'=>'firstname', 'index'=>'firstname', 'align'=>'left'), |
|
966 | + array('name'=>'username', 'index'=>'username', 'align'=>'left'), |
|
967 | 967 | #array('name'=>'profile', 'index'=>'username', 'align'=>'left'), |
968 | - array('name'=>'total', 'index'=>'total', 'align'=>'left'), |
|
969 | - array('name'=>'courses', 'index'=>'courses', 'align'=>'left', 'sortable' => 'false'), |
|
970 | - array('name'=>'lessons', 'index'=>'lessons', 'align'=>'left', 'sortable' => 'false'), |
|
971 | - array('name'=>'exercises', 'index'=>'exercises', 'align'=>'left', 'sortable' => 'false'), |
|
972 | - array('name'=>'forums', 'index'=>'forums', 'align'=>'left', 'sortable' => 'false'), |
|
973 | - array('name'=>'homeworks', 'index'=>'homeworks', 'align'=>'left', 'sortable' => 'false'), |
|
974 | - array('name'=>'wikis', 'index'=>'wikis', 'align'=>'left', 'sortable' => 'false'), |
|
975 | - array('name'=>'surveys', 'index'=>'surveys', 'align'=>'left', 'sortable' => 'false'), |
|
968 | + array('name'=>'total', 'index'=>'total', 'align'=>'left'), |
|
969 | + array('name'=>'courses', 'index'=>'courses', 'align'=>'left', 'sortable' => 'false'), |
|
970 | + array('name'=>'lessons', 'index'=>'lessons', 'align'=>'left', 'sortable' => 'false'), |
|
971 | + array('name'=>'exercises', 'index'=>'exercises', 'align'=>'left', 'sortable' => 'false'), |
|
972 | + array('name'=>'forums', 'index'=>'forums', 'align'=>'left', 'sortable' => 'false'), |
|
973 | + array('name'=>'homeworks', 'index'=>'homeworks', 'align'=>'left', 'sortable' => 'false'), |
|
974 | + array('name'=>'wikis', 'index'=>'wikis', 'align'=>'left', 'sortable' => 'false'), |
|
975 | + array('name'=>'surveys', 'index'=>'surveys', 'align'=>'left', 'sortable' => 'false'), |
|
976 | 976 | //Lessons |
977 | - array('name'=>'lessons_total', 'index'=>'lessons_total', 'align'=>'center', 'sortable' => 'false'), |
|
978 | - array('name'=>'lessons_done', 'index'=>'lessons_done', 'align'=>'center', 'sortable' => 'false'), |
|
979 | - array('name'=>'lessons_left', 'index'=>'lessons_left', 'align'=>'center', 'sortable' => 'false'), |
|
980 | - array('name'=>'lessons_progress', 'index'=>'lessons_progress', 'align'=>'center', 'sortable' => 'false'), |
|
977 | + array('name'=>'lessons_total', 'index'=>'lessons_total', 'align'=>'center', 'sortable' => 'false'), |
|
978 | + array('name'=>'lessons_done', 'index'=>'lessons_done', 'align'=>'center', 'sortable' => 'false'), |
|
979 | + array('name'=>'lessons_left', 'index'=>'lessons_left', 'align'=>'center', 'sortable' => 'false'), |
|
980 | + array('name'=>'lessons_progress', 'index'=>'lessons_progress', 'align'=>'center', 'sortable' => 'false'), |
|
981 | 981 | //Exercises |
982 | - array('name'=>'exercises_total', 'index'=>'exercises_total', 'align'=>'center', 'sortable' => 'false'), |
|
983 | - array('name'=>'exercises_done', 'index'=>'exercises_done', 'align'=>'center', 'sortable' => 'false'), |
|
984 | - array('name'=>'exercises_left', 'index'=>'exercises_left', 'align'=>'center', 'sortable' => 'false'), |
|
985 | - array('name'=>'exercises_progress', 'index'=>'exercises_progress', 'align'=>'center', 'sortable' => 'false'), |
|
982 | + array('name'=>'exercises_total', 'index'=>'exercises_total', 'align'=>'center', 'sortable' => 'false'), |
|
983 | + array('name'=>'exercises_done', 'index'=>'exercises_done', 'align'=>'center', 'sortable' => 'false'), |
|
984 | + array('name'=>'exercises_left', 'index'=>'exercises_left', 'align'=>'center', 'sortable' => 'false'), |
|
985 | + array('name'=>'exercises_progress', 'index'=>'exercises_progress', 'align'=>'center', 'sortable' => 'false'), |
|
986 | 986 | //Assignments |
987 | - array('name'=>'forums_total', 'index'=>'forums_total', 'align'=>'center', 'sortable' => 'false'), |
|
988 | - array('name'=>'forums_done', 'index'=>'forums_done', 'align'=>'center', 'sortable' => 'false'), |
|
989 | - array('name'=>'forums_left', 'index'=>'forums_left', 'align'=>'center', 'sortable' => 'false'), |
|
990 | - array('name'=>'forums_progress', 'index'=>'forums_progress', 'align'=>'center', 'sortable' => 'false'), |
|
987 | + array('name'=>'forums_total', 'index'=>'forums_total', 'align'=>'center', 'sortable' => 'false'), |
|
988 | + array('name'=>'forums_done', 'index'=>'forums_done', 'align'=>'center', 'sortable' => 'false'), |
|
989 | + array('name'=>'forums_left', 'index'=>'forums_left', 'align'=>'center', 'sortable' => 'false'), |
|
990 | + array('name'=>'forums_progress', 'index'=>'forums_progress', 'align'=>'center', 'sortable' => 'false'), |
|
991 | 991 | //Assignments |
992 | - array('name'=>'assigments_total', 'index'=>'assigments_total', 'align'=>'center', 'sortable' => 'false'), |
|
993 | - array('name'=>'assigments_done', 'index'=>'assigments_done', 'align'=>'center', 'sortable' => 'false'), |
|
994 | - array('name'=>'assigments_left', 'index'=>'assigments_left', 'align'=>'center', 'sortable' => 'false'), |
|
995 | - array('name'=>'assigments_progress', 'index'=>'assigments_progress', 'align'=>'center', 'sortable' => 'false'), |
|
992 | + array('name'=>'assigments_total', 'index'=>'assigments_total', 'align'=>'center', 'sortable' => 'false'), |
|
993 | + array('name'=>'assigments_done', 'index'=>'assigments_done', 'align'=>'center', 'sortable' => 'false'), |
|
994 | + array('name'=>'assigments_left', 'index'=>'assigments_left', 'align'=>'center', 'sortable' => 'false'), |
|
995 | + array('name'=>'assigments_progress', 'index'=>'assigments_progress', 'align'=>'center', 'sortable' => 'false'), |
|
996 | 996 | //Assignments |
997 | - array('name'=>'wiki_total', 'index'=>'wiki_total', 'align'=>'center', 'sortable' => 'false'), |
|
998 | - array('name'=>'wiki_revisions', 'index'=>'wiki_revisions', 'align'=>'center', 'sortable' => 'false'), |
|
999 | - array('name'=>'wiki_read', 'index'=>'wiki_read', 'align'=>'center', 'sortable' => 'false'), |
|
1000 | - array('name'=>'wiki_unread', 'index'=>'wiki_unread', 'align'=>'center', 'sortable' => 'false'), |
|
1001 | - array('name'=>'wiki_progress', 'index'=>'wiki_progress', 'align'=>'center', 'sortable' => 'false'), |
|
997 | + array('name'=>'wiki_total', 'index'=>'wiki_total', 'align'=>'center', 'sortable' => 'false'), |
|
998 | + array('name'=>'wiki_revisions', 'index'=>'wiki_revisions', 'align'=>'center', 'sortable' => 'false'), |
|
999 | + array('name'=>'wiki_read', 'index'=>'wiki_read', 'align'=>'center', 'sortable' => 'false'), |
|
1000 | + array('name'=>'wiki_unread', 'index'=>'wiki_unread', 'align'=>'center', 'sortable' => 'false'), |
|
1001 | + array('name'=>'wiki_progress', 'index'=>'wiki_progress', 'align'=>'center', 'sortable' => 'false'), |
|
1002 | 1002 | //Surveys |
1003 | - array('name'=>'surveys_total', 'index'=>'surveys_total', 'align'=>'center', 'sortable' => 'false'), |
|
1004 | - array('name'=>'surveys_done', 'index'=>'surveys_done', 'align'=>'center', 'sortable' => 'false'), |
|
1005 | - array('name'=>'surveys_left', 'index'=>'surveys_left', 'align'=>'center', 'sortable' => 'false'), |
|
1006 | - array('name'=>'surveys_progress', 'index'=>'surveys_progress', 'align'=>'center', 'sortable' => 'false'), |
|
1003 | + array('name'=>'surveys_total', 'index'=>'surveys_total', 'align'=>'center', 'sortable' => 'false'), |
|
1004 | + array('name'=>'surveys_done', 'index'=>'surveys_done', 'align'=>'center', 'sortable' => 'false'), |
|
1005 | + array('name'=>'surveys_left', 'index'=>'surveys_left', 'align'=>'center', 'sortable' => 'false'), |
|
1006 | + array('name'=>'surveys_progress', 'index'=>'surveys_progress', 'align'=>'center', 'sortable' => 'false'), |
|
1007 | 1007 | ); |
1008 | 1008 | |
1009 | 1009 | $action_links = ''; |
1010 | 1010 | // jqgrid will use this URL to do the selects |
1011 | - $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_session_progress&session_id=' . $sessionId . '&course_id=' . $courseId . '&date_to=' . $date_to . '&date_from=' . $date_from; |
|
1011 | + $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_session_progress&session_id='.$sessionId.'&course_id='.$courseId.'&date_to='.$date_to.'&date_from='.$date_from; |
|
1012 | 1012 | |
1013 | 1013 | //Table Id |
1014 | 1014 | $tableId = 'progressOverview'; |
@@ -1068,11 +1068,11 @@ discard block |
||
1068 | 1068 | true |
1069 | 1069 | ); |
1070 | 1070 | |
1071 | - $return = '<script>$(function() {'. $table . |
|
1071 | + $return = '<script>$(function() {'.$table. |
|
1072 | 1072 | 'jQuery("#'.$tableId.'").jqGrid("navGrid","#'.$tableId.'_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true}); |
1073 | 1073 | jQuery("#'.$tableId.'").jqGrid("navButtonAdd","#'.$tableId.'_pager",{ |
1074 | 1074 | caption:"", |
1075 | - title:"' . get_lang('ExportExcel') . '", |
|
1075 | + title:"' . get_lang('ExportExcel').'", |
|
1076 | 1076 | onClickButton : function () { |
1077 | 1077 | jQuery("#'.$tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"}); |
1078 | 1078 | } |
@@ -1132,7 +1132,7 @@ discard block |
||
1132 | 1132 | // adding the fields that are checked to the session |
1133 | 1133 | $message = ''; |
1134 | 1134 | foreach ($values as $field_ids => $value) { |
1135 | - if ($value == 1 && strstr($field_ids,'extra_export_field')) { |
|
1135 | + if ($value == 1 && strstr($field_ids, 'extra_export_field')) { |
|
1136 | 1136 | $_SESSION['additional_export_fields'][] = str_replace('extra_export_field', '', $field_ids); |
1137 | 1137 | } |
1138 | 1138 | } |
@@ -1147,7 +1147,7 @@ discard block |
||
1147 | 1147 | // Displaying a feedback message |
1148 | 1148 | if (!empty($_SESSION['additional_export_fields'])) { |
1149 | 1149 | Display::display_confirmation_message(get_lang('FollowingFieldsWillAlsoBeExported').': <br /><ul>'.$message.'</ul>', false); |
1150 | - } else { |
|
1150 | + } else { |
|
1151 | 1151 | Display::display_confirmation_message(get_lang('NoAdditionalFieldsWillBeExported'), false); |
1152 | 1152 | } |
1153 | 1153 | } else { |
@@ -1175,7 +1175,7 @@ discard block |
||
1175 | 1175 | { |
1176 | 1176 | $t_head = ' <table style="width: 100%;border:0;padding:0;border-collapse:collapse;table-layout: fixed">'; |
1177 | 1177 | //$t_head .= ' <caption>'.get_lang('CourseInformation').'</caption>'; |
1178 | - $t_head .= '<tr>'; |
|
1178 | + $t_head .= '<tr>'; |
|
1179 | 1179 | $t_head .= ' <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgTimeSpentInTheCourse'), 6, true).'</span></th>'; |
1180 | 1180 | $t_head .= ' <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgStudentsProgress'), 6, true).'</span></th>'; |
1181 | 1181 | $t_head .= ' <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgCourseScore'), 6, true).'</span></th>'; |
@@ -1192,13 +1192,13 @@ discard block |
||
1192 | 1192 | |
1193 | 1193 | $addparams = array('view' => 'admin', 'display' => 'courseoverview'); |
1194 | 1194 | |
1195 | - $table = new SortableTable('tracking_session_overview', array('MySpace', 'get_total_number_courses'), array('MySpace','get_course_data_tracking_overview'), 1); |
|
1195 | + $table = new SortableTable('tracking_session_overview', array('MySpace', 'get_total_number_courses'), array('MySpace', 'get_course_data_tracking_overview'), 1); |
|
1196 | 1196 | $table->additional_parameters = $addparams; |
1197 | 1197 | |
1198 | 1198 | $table->set_header(0, '', false, null, array('style' => 'display: none')); |
1199 | 1199 | $table->set_header(1, get_lang('Course'), true, array('style' => 'font-size:8pt'), array('style' => 'font-size:8pt')); |
1200 | 1200 | $table->set_header(2, $t_head, false, array('style' => 'width:90%;border:0;padding:0;font-size:7.5pt;'), array('style' => 'width:90%;padding:0;font-size:7.5pt;')); |
1201 | - $table->set_column_filter(2, array('MySpace','course_tracking_filter')); |
|
1201 | + $table->set_column_filter(2, array('MySpace', 'course_tracking_filter')); |
|
1202 | 1202 | $table->display(); |
1203 | 1203 | } |
1204 | 1204 | |
@@ -1234,7 +1234,7 @@ discard block |
||
1234 | 1234 | $sql .= " ORDER BY col$column $direction "; |
1235 | 1235 | $sql .= " LIMIT $from,$number_of_items"; |
1236 | 1236 | $result = Database::query($sql); |
1237 | - $return = array (); |
|
1237 | + $return = array(); |
|
1238 | 1238 | while ($course = Database::fetch_row($result)) { |
1239 | 1239 | $return[] = $course; |
1240 | 1240 | } |
@@ -1287,18 +1287,18 @@ discard block |
||
1287 | 1287 | $progress += $progress_tmp[0]; |
1288 | 1288 | $nb_progress_lp += $progress_tmp[1]; |
1289 | 1289 | $score_tmp = Tracking :: get_avg_student_score($row->user_id, $course_code, array(), null, true); |
1290 | - if(is_array($score_tmp)) { |
|
1290 | + if (is_array($score_tmp)) { |
|
1291 | 1291 | $score += $score_tmp[0]; |
1292 | 1292 | $nb_score_lp += $score_tmp[1]; |
1293 | 1293 | } |
1294 | 1294 | $nb_messages += Tracking::count_student_messages($row->user_id, $course_code); |
1295 | 1295 | $nb_assignments += Tracking::count_student_assignments($row->user_id, $course_code); |
1296 | 1296 | $last_login_date_tmp = Tracking :: get_last_connection_date_on_the_course($row->user_id, $courseInfo, null, false); |
1297 | - if($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned |
|
1297 | + if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned |
|
1298 | 1298 | $last_login_date = $last_login_date_tmp; |
1299 | - } else if($last_login_date_tmp != false && $last_login_date != false) { // TODO: Repeated previous condition. To be cleaned. |
|
1299 | + } else if ($last_login_date_tmp != false && $last_login_date != false) { // TODO: Repeated previous condition. To be cleaned. |
|
1300 | 1300 | // Find the max and assign it to first_login_date |
1301 | - if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) { |
|
1301 | + if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) { |
|
1302 | 1302 | $last_login_date = $last_login_date_tmp; |
1303 | 1303 | } |
1304 | 1304 | } |
@@ -1308,27 +1308,27 @@ discard block |
||
1308 | 1308 | $total_score_possible += $exercise_results_tmp['score_possible']; |
1309 | 1309 | $total_questions_answered += $exercise_results_tmp['questions_answered']; |
1310 | 1310 | } |
1311 | - if($nb_progress_lp > 0) { |
|
1311 | + if ($nb_progress_lp > 0) { |
|
1312 | 1312 | $avg_progress = round($progress / $nb_progress_lp, 2); |
1313 | 1313 | } else { |
1314 | 1314 | $avg_progress = 0; |
1315 | 1315 | } |
1316 | - if($nb_score_lp > 0) { |
|
1316 | + if ($nb_score_lp > 0) { |
|
1317 | 1317 | $avg_score = round($score / $nb_score_lp, 2); |
1318 | 1318 | } else { |
1319 | 1319 | $avg_score = '-'; |
1320 | 1320 | } |
1321 | - if($last_login_date) { |
|
1321 | + if ($last_login_date) { |
|
1322 | 1322 | $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get()); |
1323 | 1323 | } else { |
1324 | 1324 | $last_login_date = '-'; |
1325 | 1325 | } |
1326 | - if($total_score_possible > 0) { |
|
1326 | + if ($total_score_possible > 0) { |
|
1327 | 1327 | $total_score_percentage = round($total_score_obtained / $total_score_possible * 100, 2); |
1328 | 1328 | } else { |
1329 | 1329 | $total_score_percentage = 0; |
1330 | 1330 | } |
1331 | - if($total_score_percentage > 0) { |
|
1331 | + if ($total_score_percentage > 0) { |
|
1332 | 1332 | $total_score = $total_score_obtained.'/'.$total_score_possible.' ('.$total_score_percentage.' %)'; |
1333 | 1333 | } else { |
1334 | 1334 | $total_score = '-'; |
@@ -1436,7 +1436,7 @@ discard block |
||
1436 | 1436 | $progress += $progress_tmp[0]; |
1437 | 1437 | $nb_progress_lp += $progress_tmp[1]; |
1438 | 1438 | $score_tmp = Tracking :: get_avg_student_score($row->user_id, $course_code, array(), null, true); |
1439 | - if(is_array($score_tmp)) { |
|
1439 | + if (is_array($score_tmp)) { |
|
1440 | 1440 | $score += $score_tmp[0]; |
1441 | 1441 | $nb_score_lp += $score_tmp[1]; |
1442 | 1442 | } |
@@ -1444,11 +1444,11 @@ discard block |
||
1444 | 1444 | $nb_assignments += Tracking::count_student_assignments($row->user_id, $course_code); |
1445 | 1445 | |
1446 | 1446 | $last_login_date_tmp = Tracking::get_last_connection_date_on_the_course($row->user_id, $courseInfo, null, false); |
1447 | - if($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned. |
|
1447 | + if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned. |
|
1448 | 1448 | $last_login_date = $last_login_date_tmp; |
1449 | - } else if($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned. |
|
1449 | + } else if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned. |
|
1450 | 1450 | // Find the max and assign it to first_login_date |
1451 | - if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) { |
|
1451 | + if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) { |
|
1452 | 1452 | $last_login_date = $last_login_date_tmp; |
1453 | 1453 | } |
1454 | 1454 | } |
@@ -1458,22 +1458,22 @@ discard block |
||
1458 | 1458 | $total_score_possible += $exercise_results_tmp['score_possible']; |
1459 | 1459 | $total_questions_answered += $exercise_results_tmp['questions_answered']; |
1460 | 1460 | } |
1461 | - if($nb_progress_lp > 0) { |
|
1461 | + if ($nb_progress_lp > 0) { |
|
1462 | 1462 | $avg_progress = round($progress / $nb_progress_lp, 2); |
1463 | 1463 | } else { |
1464 | 1464 | $avg_progress = 0; |
1465 | 1465 | } |
1466 | - if($nb_score_lp > 0) { |
|
1466 | + if ($nb_score_lp > 0) { |
|
1467 | 1467 | $avg_score = round($score / $nb_score_lp, 2); |
1468 | 1468 | } else { |
1469 | 1469 | $avg_score = '-'; |
1470 | 1470 | } |
1471 | - if($last_login_date) { |
|
1471 | + if ($last_login_date) { |
|
1472 | 1472 | $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get()); |
1473 | 1473 | } else { |
1474 | 1474 | $last_login_date = '-'; |
1475 | 1475 | } |
1476 | - if($total_score_possible > 0) { |
|
1476 | + if ($total_score_possible > 0) { |
|
1477 | 1477 | $total_score_percentage = round($total_score_obtained / $total_score_possible * 100, 2); |
1478 | 1478 | } else { |
1479 | 1479 | $total_score_percentage = 0; |
@@ -1509,7 +1509,7 @@ discard block |
||
1509 | 1509 | { |
1510 | 1510 | $t_head = ' <table style="width: 100%;border:0;padding:0;border-collapse:collapse;table-layout: fixed">'; |
1511 | 1511 | //$t_head .= ' <caption>'.get_lang('CourseInformation').'</caption>'; |
1512 | - $t_head .= '<tr>'; |
|
1512 | + $t_head .= '<tr>'; |
|
1513 | 1513 | $t_head .= ' <th width="155px" style="border-left:0;border-bottom:0"><span>'.get_lang('Course').'</span></th>'; |
1514 | 1514 | $t_head .= ' <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgTimeSpentInTheCourse'), 6, true).'</span></th>'; |
1515 | 1515 | $t_head .= ' <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgStudentsProgress'), 6, true).'</span></th>'; |
@@ -1527,7 +1527,7 @@ discard block |
||
1527 | 1527 | |
1528 | 1528 | $addparams = array('view' => 'admin', 'display' => 'sessionoverview'); |
1529 | 1529 | |
1530 | - $table = new SortableTable('tracking_session_overview', array('MySpace','get_total_number_sessions'), array('MySpace','get_session_data_tracking_overview'), 1); |
|
1530 | + $table = new SortableTable('tracking_session_overview', array('MySpace', 'get_total_number_sessions'), array('MySpace', 'get_session_data_tracking_overview'), 1); |
|
1531 | 1531 | $table->additional_parameters = $addparams; |
1532 | 1532 | |
1533 | 1533 | $table->set_header(0, '', false, null, array('style' => 'display: none')); |
@@ -1566,7 +1566,7 @@ discard block |
||
1566 | 1566 | $sql .= " ORDER BY col$column $direction "; |
1567 | 1567 | $sql .= " LIMIT $from,$number_of_items"; |
1568 | 1568 | $result = Database::query($sql); |
1569 | - $return = array (); |
|
1569 | + $return = array(); |
|
1570 | 1570 | while ($session = Database::fetch_row($result)) { |
1571 | 1571 | $return[] = $session; |
1572 | 1572 | } |
@@ -1655,10 +1655,10 @@ discard block |
||
1655 | 1655 | if ($last_login_date_tmp != false && $last_login_date == false) { |
1656 | 1656 | // TODO: To be cleaned. |
1657 | 1657 | $last_login_date = $last_login_date_tmp; |
1658 | - } else if($last_login_date_tmp != false && $last_login_date != false) { |
|
1658 | + } else if ($last_login_date_tmp != false && $last_login_date != false) { |
|
1659 | 1659 | // TODO: Repeated previous condition! To be cleaned. |
1660 | 1660 | // Find the max and assign it to first_login_date |
1661 | - if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) { |
|
1661 | + if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) { |
|
1662 | 1662 | $last_login_date = $last_login_date_tmp; |
1663 | 1663 | } |
1664 | 1664 | } |
@@ -1668,27 +1668,27 @@ discard block |
||
1668 | 1668 | $total_score_possible += $exercise_results_tmp['score_possible']; |
1669 | 1669 | $total_questions_answered += $exercise_results_tmp['questions_answered']; |
1670 | 1670 | } |
1671 | - if($nb_progress_lp > 0) { |
|
1671 | + if ($nb_progress_lp > 0) { |
|
1672 | 1672 | $avg_progress = round($progress / $nb_progress_lp, 2); |
1673 | 1673 | } else { |
1674 | 1674 | $avg_progress = 0; |
1675 | 1675 | } |
1676 | - if($nb_score_lp > 0) { |
|
1676 | + if ($nb_score_lp > 0) { |
|
1677 | 1677 | $avg_score = round($score / $nb_score_lp, 2); |
1678 | 1678 | } else { |
1679 | 1679 | $avg_score = '-'; |
1680 | 1680 | } |
1681 | - if($last_login_date) { |
|
1681 | + if ($last_login_date) { |
|
1682 | 1682 | $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get()); |
1683 | 1683 | } else { |
1684 | 1684 | $last_login_date = '-'; |
1685 | 1685 | } |
1686 | - if($total_score_possible > 0) { |
|
1686 | + if ($total_score_possible > 0) { |
|
1687 | 1687 | $total_score_percentage = round($total_score_obtained / $total_score_possible * 100, 2); |
1688 | 1688 | } else { |
1689 | 1689 | $total_score_percentage = 0; |
1690 | 1690 | } |
1691 | - if($total_score_percentage > 0) { |
|
1691 | + if ($total_score_percentage > 0) { |
|
1692 | 1692 | $total_score = $total_score_obtained.'/'.$total_score_possible.' ('.$total_score_percentage.' %)'; |
1693 | 1693 | } else { |
1694 | 1694 | $total_score = '-'; |
@@ -1799,7 +1799,7 @@ discard block |
||
1799 | 1799 | $total_score_obtained = 0; |
1800 | 1800 | $total_score_possible = 0; |
1801 | 1801 | $total_questions_answered = 0; |
1802 | - while($row_user = Database::fetch_object($result_users)) { |
|
1802 | + while ($row_user = Database::fetch_object($result_users)) { |
|
1803 | 1803 | // get time spent in the course and session |
1804 | 1804 | $time_spent += Tracking::get_time_spent_on_the_course($row_user->user_id, $courseId, $session_id); |
1805 | 1805 | $progress_tmp = Tracking::get_avg_student_progress($row_user->user_id, $row->code, array(), $session_id, true); |
@@ -1828,11 +1828,11 @@ discard block |
||
1828 | 1828 | $session_id, |
1829 | 1829 | false |
1830 | 1830 | ); |
1831 | - if($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned. |
|
1831 | + if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned. |
|
1832 | 1832 | $last_login_date = $last_login_date_tmp; |
1833 | - } else if($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned. |
|
1833 | + } else if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned. |
|
1834 | 1834 | // Find the max and assign it to first_login_date |
1835 | - if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) { |
|
1835 | + if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) { |
|
1836 | 1836 | $last_login_date = $last_login_date_tmp; |
1837 | 1837 | } |
1838 | 1838 | } |
@@ -1842,27 +1842,27 @@ discard block |
||
1842 | 1842 | $total_score_possible += $exercise_results_tmp['score_possible']; |
1843 | 1843 | $total_questions_answered += $exercise_results_tmp['questions_answered']; |
1844 | 1844 | } |
1845 | - if($nb_progress_lp > 0) { |
|
1845 | + if ($nb_progress_lp > 0) { |
|
1846 | 1846 | $avg_progress = round($progress / $nb_progress_lp, 2); |
1847 | 1847 | } else { |
1848 | 1848 | $avg_progress = 0; |
1849 | 1849 | } |
1850 | - if($nb_score_lp > 0) { |
|
1850 | + if ($nb_score_lp > 0) { |
|
1851 | 1851 | $avg_score = round($score / $nb_score_lp, 2); |
1852 | 1852 | } else { |
1853 | 1853 | $avg_score = '-'; |
1854 | 1854 | } |
1855 | - if($last_login_date) { |
|
1855 | + if ($last_login_date) { |
|
1856 | 1856 | $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get()); |
1857 | 1857 | } else { |
1858 | 1858 | $last_login_date = '-'; |
1859 | 1859 | } |
1860 | - if($total_score_possible > 0) { |
|
1860 | + if ($total_score_possible > 0) { |
|
1861 | 1861 | $total_score_percentage = round($total_score_obtained / $total_score_possible * 100, 2); |
1862 | 1862 | } else { |
1863 | 1863 | $total_score_percentage = 0; |
1864 | 1864 | } |
1865 | - if($total_score_percentage > 0) { |
|
1865 | + if ($total_score_percentage > 0) { |
|
1866 | 1866 | $total_score = $total_score_obtained.'/'.$total_score_possible.' ('.$total_score_percentage.' %)'; |
1867 | 1867 | } else { |
1868 | 1868 | $total_score = '-'; |
@@ -1912,7 +1912,7 @@ discard block |
||
1912 | 1912 | FROM '.Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES)." |
1913 | 1913 | WHERE c_id = ' . $courseId . ' |
1914 | 1914 | AND exe_user_id = '".intval($user_id)."'"; |
1915 | - if($session_id !== false) { |
|
1915 | + if ($session_id !== false) { |
|
1916 | 1916 | $sql .= " AND session_id = '".$session_id."' "; |
1917 | 1917 | } |
1918 | 1918 | $result = Database::query($sql); |
@@ -1922,7 +1922,7 @@ discard block |
||
1922 | 1922 | while ($row = Database::fetch_array($result)) { |
1923 | 1923 | $score_obtained += $row['exe_result']; |
1924 | 1924 | $score_possible += $row['exe_weighting']; |
1925 | - $questions_answered ++; |
|
1925 | + $questions_answered++; |
|
1926 | 1926 | } |
1927 | 1927 | |
1928 | 1928 | if ($score_possible != 0) { |
@@ -2043,9 +2043,9 @@ discard block |
||
2043 | 2043 | } |
2044 | 2044 | } |
2045 | 2045 | // time spent in the course |
2046 | - $csv_row[] = api_time_to_hms(Tracking::get_time_spent_on_the_course ($user[4], $courseId)); |
|
2046 | + $csv_row[] = api_time_to_hms(Tracking::get_time_spent_on_the_course($user[4], $courseId)); |
|
2047 | 2047 | // student progress in course |
2048 | - $csv_row[] = round(Tracking::get_avg_student_progress ($user[4], $row[0]), 2); |
|
2048 | + $csv_row[] = round(Tracking::get_avg_student_progress($user[4], $row[0]), 2); |
|
2049 | 2049 | // student score |
2050 | 2050 | $csv_row[] = round(Tracking::get_avg_student_score($user[4], $row[0]), 2); |
2051 | 2051 | // student tes score |
@@ -2053,7 +2053,7 @@ discard block |
||
2053 | 2053 | // student messages |
2054 | 2054 | $csv_row[] = Tracking::count_student_messages($user[4], $row[0]); |
2055 | 2055 | // student assignments |
2056 | - $csv_row[] = Tracking::count_student_assignments ($user[4], $row[0]); |
|
2056 | + $csv_row[] = Tracking::count_student_assignments($user[4], $row[0]); |
|
2057 | 2057 | // student exercises results |
2058 | 2058 | $exercises_results = MySpace::exercises_results($user[4], $row[0]); |
2059 | 2059 | $csv_row[] = $exercises_results['score_obtained']; |
@@ -2061,7 +2061,7 @@ discard block |
||
2061 | 2061 | $csv_row[] = $exercises_results['questions_answered']; |
2062 | 2062 | $csv_row[] = $exercises_results['percentage']; |
2063 | 2063 | // first connection |
2064 | - $csv_row[] = Tracking::get_first_connection_date_on_the_course ($user[4], $courseId); |
|
2064 | + $csv_row[] = Tracking::get_first_connection_date_on_the_course($user[4], $courseId); |
|
2065 | 2065 | // last connection |
2066 | 2066 | $csv_row[] = strip_tags(Tracking::get_last_connection_date_on_the_course($user[4], $courseInfo)); |
2067 | 2067 | |
@@ -2095,9 +2095,9 @@ discard block |
||
2095 | 2095 | // get all courses with limit |
2096 | 2096 | $sql = "SELECT course.code as col1, course.title as col2 |
2097 | 2097 | FROM $tbl_course course |
2098 | - WHERE course.code IN (".implode(',',$courses_code).")"; |
|
2098 | + WHERE course.code IN (".implode(',', $courses_code).")"; |
|
2099 | 2099 | |
2100 | - if (!in_array($direction, array('ASC','DESC'))) $direction = 'ASC'; |
|
2100 | + if (!in_array($direction, array('ASC', 'DESC'))) $direction = 'ASC'; |
|
2101 | 2101 | |
2102 | 2102 | $column = intval($column); |
2103 | 2103 | $from = intval($from); |
@@ -2166,7 +2166,7 @@ discard block |
||
2166 | 2166 | $table_row[] = $avg_assignments_in_course; |
2167 | 2167 | |
2168 | 2168 | //set the "from" value to know if I access the Reporting by the chamilo tab or the course link |
2169 | - $table_row[] = '<center><a href="../../tracking/courseLog.php?cidReq=' .$course_code.'&from=myspace&id_session='.$session_id.'"> |
|
2169 | + $table_row[] = '<center><a href="../../tracking/courseLog.php?cidReq='.$course_code.'&from=myspace&id_session='.$session_id.'"> |
|
2170 | 2170 | <img src="'.api_get_path(WEB_IMG_PATH).'icons/22/2rightarrow.png" border="0" /></a> |
2171 | 2171 | </center>'; |
2172 | 2172 | $csv_content[] = array( |
@@ -2174,7 +2174,7 @@ discard block |
||
2174 | 2174 | $nb_students_in_course, |
2175 | 2175 | $avg_time_spent_in_course, |
2176 | 2176 | is_null($avg_progress_in_course) ? null : $avg_progress_in_course.'%', |
2177 | - is_null($avg_score_in_course) ? null : is_numeric($avg_score_in_course) ? $avg_score_in_course.'%' : $avg_score_in_course , |
|
2177 | + is_null($avg_score_in_course) ? null : is_numeric($avg_score_in_course) ? $avg_score_in_course.'%' : $avg_score_in_course, |
|
2178 | 2178 | is_null($avg_score_in_exercise) ? null : $avg_score_in_exercise.'%', |
2179 | 2179 | $avg_messages_in_course, |
2180 | 2180 | $avg_assignments_in_course, |
@@ -2242,7 +2242,7 @@ discard block |
||
2242 | 2242 | $sql .= " ORDER BY col$column $direction "; |
2243 | 2243 | $sql .= " LIMIT $from,$number_of_items"; |
2244 | 2244 | $result = Database::query($sql); |
2245 | - $return = array (); |
|
2245 | + $return = array(); |
|
2246 | 2246 | while ($user = Database::fetch_row($result)) { |
2247 | 2247 | $return[] = $user; |
2248 | 2248 | } |
@@ -2297,7 +2297,7 @@ discard block |
||
2297 | 2297 | $i++; |
2298 | 2298 | } |
2299 | 2299 | } |
2300 | - $username_array = array('username' => $desired_username , 'sufix' => $sufix); |
|
2300 | + $username_array = array('username' => $desired_username, 'sufix' => $sufix); |
|
2301 | 2301 | return $username_array; |
2302 | 2302 | } else { |
2303 | 2303 | $username_array = array('username' => $username, 'sufix' => ''); |
@@ -2571,7 +2571,7 @@ discard block |
||
2571 | 2571 | foreach ($users as $index => $user) { |
2572 | 2572 | $userid = $user['id']; |
2573 | 2573 | $sql_insert = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) |
2574 | - VALUES ('$id_session','$userid', '" . api_get_utc_datetime() . "')"; |
|
2574 | + VALUES ('$id_session','$userid', '".api_get_utc_datetime()."')"; |
|
2575 | 2575 | Database::query($sql_insert); |
2576 | 2576 | $user['added_at_session'] = 1; |
2577 | 2577 | $new_users[] = $user; |
@@ -2605,10 +2605,10 @@ discard block |
||
2605 | 2605 | ); |
2606 | 2606 | $userInfo = api_get_user_info($user['id']); |
2607 | 2607 | |
2608 | - if (($user['added_at_platform'] == 1 && $user['added_at_session'] == 1) || $user['added_at_session'] == 1) { |
|
2608 | + if (($user['added_at_platform'] == 1 && $user['added_at_session'] == 1) || $user['added_at_session'] == 1) { |
|
2609 | 2609 | if ($user['added_at_platform'] == 1) { |
2610 | 2610 | $addedto = get_lang('UserCreatedPlatform'); |
2611 | - } else { |
|
2611 | + } else { |
|
2612 | 2612 | $addedto = ' '; |
2613 | 2613 | } |
2614 | 2614 | |
@@ -2671,7 +2671,7 @@ discard block |
||
2671 | 2671 | global $current_tag; |
2672 | 2672 | switch ($data) { |
2673 | 2673 | case 'Contact' : |
2674 | - $user = array (); |
|
2674 | + $user = array(); |
|
2675 | 2675 | break; |
2676 | 2676 | default : |
2677 | 2677 | $current_tag = $data; |
@@ -2718,9 +2718,9 @@ discard block |
||
2718 | 2718 | global $current_value; |
2719 | 2719 | global $user; |
2720 | 2720 | global $users; |
2721 | - $users = array (); |
|
2721 | + $users = array(); |
|
2722 | 2722 | $parser = xml_parser_create('UTF-8'); |
2723 | - xml_set_element_handler($parser, array('MySpace','element_start'), array('MySpace','element_end')); |
|
2723 | + xml_set_element_handler($parser, array('MySpace', 'element_start'), array('MySpace', 'element_end')); |
|
2724 | 2724 | xml_set_character_data_handler($parser, "character_data"); |
2725 | 2725 | xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, false); |
2726 | 2726 | xml_parse($parser, api_utf8_encode_xml(file_get_contents($file))); |
@@ -2766,7 +2766,7 @@ discard block |
||
2766 | 2766 | get_lang('SearchCourse'), |
2767 | 2767 | $courseList, |
2768 | 2768 | [ |
2769 | - 'url' => api_get_path(WEB_AJAX_PATH) . 'course.ajax.php?' . http_build_query([ |
|
2769 | + 'url' => api_get_path(WEB_AJAX_PATH).'course.ajax.php?'.http_build_query([ |
|
2770 | 2770 | 'a' => 'search_course_by_session_all', |
2771 | 2771 | 'session_id' => $sessionId |
2772 | 2772 | ]) |
@@ -2785,7 +2785,7 @@ discard block |
||
2785 | 2785 | course_id: $('#course_id').val() || 0 |
2786 | 2786 | }); |
2787 | 2787 | |
2788 | - return '" . api_get_path(WEB_AJAX_PATH) . "session.ajax.php?' + params; |
|
2788 | + return '" . api_get_path(WEB_AJAX_PATH)."session.ajax.php?' + params; |
|
2789 | 2789 | } |
2790 | 2790 | " |
2791 | 2791 | ] |
@@ -2816,7 +2816,7 @@ discard block |
||
2816 | 2816 | course_id: $('#course_id').val() |
2817 | 2817 | }); |
2818 | 2818 | |
2819 | - return '" . api_get_path(WEB_AJAX_PATH) . "course.ajax.php?' + params; |
|
2819 | + return '" . api_get_path(WEB_AJAX_PATH)."course.ajax.php?' + params; |
|
2820 | 2820 | } |
2821 | 2821 | " |
2822 | 2822 | ] |
@@ -2842,8 +2842,8 @@ discard block |
||
2842 | 2842 | if ($form->validate()) { |
2843 | 2843 | $table = new SortableTable( |
2844 | 2844 | 'tracking_access_overview', |
2845 | - ['MySpace','getNumberOfRrackingAccessOverview'], |
|
2846 | - ['MySpace','getUserDataAccessTrackingOverview'], |
|
2845 | + ['MySpace', 'getNumberOfRrackingAccessOverview'], |
|
2846 | + ['MySpace', 'getUserDataAccessTrackingOverview'], |
|
2847 | 2847 | 0 |
2848 | 2848 | ); |
2849 | 2849 | $table->additional_parameters = $form->exportValues(); |
@@ -2904,7 +2904,7 @@ discard block |
||
2904 | 2904 | " : " |
2905 | 2905 | u.lastname AS col2, |
2906 | 2906 | u.firstname AS col3, |
2907 | - " ) . " |
|
2907 | + " )." |
|
2908 | 2908 | a.logout_course_date, |
2909 | 2909 | c.title, |
2910 | 2910 | c.code, |
@@ -2915,7 +2915,7 @@ discard block |
||
2915 | 2915 | |
2916 | 2916 | if (isset($_GET['session_id']) && !empty($_GET['session_id'])) { |
2917 | 2917 | $sessionId = intval($_GET['session_id']); |
2918 | - $sql .= " WHERE a.session_id = " . $sessionId; |
|
2918 | + $sql .= " WHERE a.session_id = ".$sessionId; |
|
2919 | 2919 | } |
2920 | 2920 | |
2921 | 2921 | $sql .= " ORDER BY col$column $orderDirection "; |
@@ -2976,14 +2976,14 @@ discard block |
||
2976 | 2976 | function get_stats($user_id, $courseId, $start_date = null, $end_date = null) |
2977 | 2977 | { |
2978 | 2978 | // Database table definitions |
2979 | - $tbl_track_course = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); |
|
2979 | + $tbl_track_course = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); |
|
2980 | 2980 | |
2981 | 2981 | $course_info = api_get_course_info_by_id($courseId); |
2982 | 2982 | if (!empty($course_info)) { |
2983 | 2983 | $strg_sd = ""; |
2984 | 2984 | $strg_ed = ""; |
2985 | - if ($start_date != null && $end_date != null){ |
|
2986 | - $end_date = add_day_to( $end_date ); |
|
2985 | + if ($start_date != null && $end_date != null) { |
|
2986 | + $end_date = add_day_to($end_date); |
|
2987 | 2987 | $strg_sd = "AND login_course_date BETWEEN '$start_date' AND '$end_date'"; |
2988 | 2988 | $strg_ed = "AND logout_course_date BETWEEN '$start_date' AND '$end_date'"; |
2989 | 2989 | } |
@@ -2991,10 +2991,10 @@ discard block |
||
2991 | 2991 | SEC_TO_TIME(avg(time_to_sec(timediff(logout_course_date,login_course_date)))) as avrg, |
2992 | 2992 | SEC_TO_TIME(sum(time_to_sec(timediff(logout_course_date,login_course_date)))) as total, |
2993 | 2993 | count(user_id) as times |
2994 | - FROM ' . $tbl_track_course . ' |
|
2994 | + FROM ' . $tbl_track_course.' |
|
2995 | 2995 | WHERE |
2996 | - user_id = ' . intval($user_id) . ' AND |
|
2997 | - c_id = ' . intval($courseId) . ' '.$strg_sd.' '.$strg_ed.' '.' |
|
2996 | + user_id = ' . intval($user_id).' AND |
|
2997 | + c_id = ' . intval($courseId).' '.$strg_sd.' '.$strg_ed.' '.' |
|
2998 | 2998 | ORDER BY login_course_date ASC'; |
2999 | 2999 | |
3000 | 3000 | $rs = Database::query($sql); |
@@ -3012,7 +3012,7 @@ discard block |
||
3012 | 3012 | } |
3013 | 3013 | |
3014 | 3014 | function add_day_to($end_date) { |
3015 | - $foo_date = strtotime( $end_date ); |
|
3015 | + $foo_date = strtotime($end_date); |
|
3016 | 3016 | $foo_date = strtotime(" +1 day", $foo_date); |
3017 | 3017 | $foo_date = date("Y-m-d", $foo_date); |
3018 | 3018 | return $foo_date; |
@@ -3072,7 +3072,7 @@ discard block |
||
3072 | 3072 | * @version OCT-22- 2010 |
3073 | 3073 | * @return array |
3074 | 3074 | */ |
3075 | -function convert_to_array($sql_result){ |
|
3075 | +function convert_to_array($sql_result) { |
|
3076 | 3076 | $result_to_print = '<table>'; |
3077 | 3077 | foreach ($sql_result as $key => $data) { |
3078 | 3078 | $result_to_print .= '<tr><td>'.date('d-m-Y (H:i:s)', $data['login']).'</td><td>'.api_time_to_hms($data['logout'] - $data['login']).'</tr></td>'."\n"; |
@@ -3091,7 +3091,7 @@ discard block |
||
3091 | 3091 | * @version OCT-22- 2010 |
3092 | 3092 | * @return string |
3093 | 3093 | */ |
3094 | -function convert_to_string($sql_result){ |
|
3094 | +function convert_to_string($sql_result) { |
|
3095 | 3095 | $result_to_print = '<table>'; |
3096 | 3096 | if (!empty($sql_result)) { |
3097 | 3097 | foreach ($sql_result as $key => $data) { |
@@ -3116,18 +3116,18 @@ discard block |
||
3116 | 3116 | */ |
3117 | 3117 | function grapher($sql_result, $start_date, $end_date, $type = "") |
3118 | 3118 | { |
3119 | - if (empty($start_date)) { $start_date =""; } |
|
3120 | - if (empty($end_date)) { $end_date =""; } |
|
3121 | - if ($type == ""){ $type = 'day'; } |
|
3122 | - $main_year = $main_month_year = $main_day = array(); |
|
3119 | + if (empty($start_date)) { $start_date = ""; } |
|
3120 | + if (empty($end_date)) { $end_date = ""; } |
|
3121 | + if ($type == "") { $type = 'day'; } |
|
3122 | + $main_year = $main_month_year = $main_day = array(); |
|
3123 | 3123 | // get last 8 days/months |
3124 | 3124 | $last_days = 5; |
3125 | 3125 | $last_months = 3; |
3126 | 3126 | for ($i = $last_days; $i >= 0; $i--) { |
3127 | - $main_day[date ('d-m-Y', mktime () - $i * 3600 * 24)] = 0; |
|
3127 | + $main_day[date('d-m-Y', mktime() - $i * 3600 * 24)] = 0; |
|
3128 | 3128 | } |
3129 | 3129 | for ($i = $last_months; $i >= 0; $i--) { |
3130 | - $main_month_year[date ('m-Y', mktime () - $i * 30 * 3600 * 24)] = 0; |
|
3130 | + $main_month_year[date('m-Y', mktime() - $i * 30 * 3600 * 24)] = 0; |
|
3131 | 3131 | } |
3132 | 3132 | |
3133 | 3133 | $i = 0; |
@@ -3163,7 +3163,7 @@ discard block |
||
3163 | 3163 | /* Create and populate the pData object */ |
3164 | 3164 | $myData = new pData(); |
3165 | 3165 | $myData->addPoints($main_date, 'Serie1'); |
3166 | - if (count($main_date)!= 1) { |
|
3166 | + if (count($main_date) != 1) { |
|
3167 | 3167 | $myData->addPoints($labels, 'Labels'); |
3168 | 3168 | $myData->setSerieDescription('Labels', 'Months'); |
3169 | 3169 | $myData->setAbscissa('Labels'); |
@@ -3171,7 +3171,7 @@ discard block |
||
3171 | 3171 | $myData->setSerieWeight('Serie1', 1); |
3172 | 3172 | $myData->setSerieDescription('Serie1', get_lang('MyResults')); |
3173 | 3173 | $myData->setAxisName(0, get_lang('Minutes')); |
3174 | - $myData->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true); |
|
3174 | + $myData->loadPalette(api_get_path(SYS_CODE_PATH).'palettes/pchart/default.color', true); |
|
3175 | 3175 | |
3176 | 3176 | // Cache definition |
3177 | 3177 | $cachePath = api_get_path(SYS_ARCHIVE_PATH); |
@@ -3180,9 +3180,9 @@ discard block |
||
3180 | 3180 | |
3181 | 3181 | if ($myCache->isInCache($chartHash)) { |
3182 | 3182 | //if we already created the img |
3183 | - $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash; |
|
3183 | + $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash; |
|
3184 | 3184 | $myCache->saveFromCache($chartHash, $imgPath); |
3185 | - $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash; |
|
3185 | + $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash; |
|
3186 | 3186 | } else { |
3187 | 3187 | /* Define width, height and angle */ |
3188 | 3188 | $mainWidth = 760; |
@@ -3211,7 +3211,7 @@ discard block |
||
3211 | 3211 | /* Set the default font */ |
3212 | 3212 | $myPicture->setFontProperties( |
3213 | 3213 | array( |
3214 | - "FontName" => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', |
|
3214 | + "FontName" => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf', |
|
3215 | 3215 | "FontSize" => 10) |
3216 | 3216 | ); |
3217 | 3217 | /* Write the chart title */ |
@@ -3228,7 +3228,7 @@ discard block |
||
3228 | 3228 | /* Set the default font */ |
3229 | 3229 | $myPicture->setFontProperties( |
3230 | 3230 | array( |
3231 | - "FontName" => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', |
|
3231 | + "FontName" => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf', |
|
3232 | 3232 | "FontSize" => 8 |
3233 | 3233 | ) |
3234 | 3234 | ); |
@@ -3270,7 +3270,7 @@ discard block |
||
3270 | 3270 | /* Draw the line chart */ |
3271 | 3271 | $myPicture->setFontProperties( |
3272 | 3272 | array( |
3273 | - "FontName" => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', |
|
3273 | + "FontName" => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf', |
|
3274 | 3274 | "FontSize" => 10 |
3275 | 3275 | ) |
3276 | 3276 | ); |
@@ -3289,15 +3289,15 @@ discard block |
||
3289 | 3289 | |
3290 | 3290 | /* Write and save into cache */ |
3291 | 3291 | $myCache->writeToCache($chartHash, $myPicture); |
3292 | - $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash; |
|
3292 | + $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash; |
|
3293 | 3293 | $myCache->saveFromCache($chartHash, $imgPath); |
3294 | - $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash; |
|
3294 | + $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash; |
|
3295 | 3295 | } |
3296 | - $html = '<img src="' . $imgPath . '">'; |
|
3296 | + $html = '<img src="'.$imgPath.'">'; |
|
3297 | 3297 | |
3298 | 3298 | return $html; |
3299 | 3299 | } else { |
3300 | - $foo_img = api_convert_encoding('<div id="messages" class="warning-message">'.get_lang('GraphicNotAvailable').'</div>','UTF-8'); |
|
3300 | + $foo_img = api_convert_encoding('<div id="messages" class="warning-message">'.get_lang('GraphicNotAvailable').'</div>', 'UTF-8'); |
|
3301 | 3301 | |
3302 | 3302 | return $foo_img; |
3303 | 3303 | } |