@@ -16,31 +16,39 @@ |
||
16 | 16 | // warning the goal of this function is to enforce rights managment in Chamilo |
17 | 17 | // thus default return value is always true |
18 | 18 | public static function hasRight($handler) { |
19 | - if (array_key_exists($handler, self::$rights_cache)) |
|
20 | - return self::$rights_cache[$handler]; |
|
19 | + if (array_key_exists($handler, self::$rights_cache)) { |
|
20 | + return self::$rights_cache[$handler]; |
|
21 | + } |
|
21 | 22 | |
22 | - if (!array_key_exists($handler, self::$rights)) |
|
23 | - return true; // handler does not exists |
|
23 | + if (!array_key_exists($handler, self::$rights)) { |
|
24 | + return true; |
|
25 | + } |
|
26 | + // handler does not exists |
|
24 | 27 | |
25 | 28 | if (self::$rights[$handler]['type'] == 'sql') { |
26 | 29 | $result = Database::query(self::$rights[$handler]['sql']); |
27 | - if (Database::num_rows($result) > 0) |
|
28 | - $result = true; |
|
29 | - else |
|
30 | - $result = false; |
|
31 | - } else if (self::$rights[$handler]['type'] == 'const') |
|
32 | - $result = self::$rights[$handler]['const']; |
|
33 | - else if (self::$rights[$handler]['type'] == 'func') |
|
34 | - $result = self::$rights[$handler]['func'](); |
|
35 | - else // handler type not implemented |
|
30 | + if (Database::num_rows($result) > 0) { |
|
31 | + $result = true; |
|
32 | + } else { |
|
33 | + $result = false; |
|
34 | + } |
|
35 | + } else if (self::$rights[$handler]['type'] == 'const') { |
|
36 | + $result = self::$rights[$handler]['const']; |
|
37 | + } else if (self::$rights[$handler]['type'] == 'func') { |
|
38 | + $result = self::$rights[$handler]['func'](); |
|
39 | + } else { |
|
40 | + // handler type not implemented |
|
36 | 41 | return true; |
42 | + } |
|
37 | 43 | self::$rights_cache[$handler] = $result; |
38 | 44 | return $result; |
39 | 45 | } |
40 | 46 | |
41 | 47 | public static function hasRightClosePageWithError($handler) { |
42 | - if (hasRight($handler) == false) |
|
43 | - die("You are not allowed here"); //FIXME |
|
48 | + if (hasRight($handler) == false) { |
|
49 | + die("You are not allowed here"); |
|
50 | + } |
|
51 | + //FIXME |
|
44 | 52 | } |
45 | 53 | |
46 | 54 | } |
@@ -545,8 +545,7 @@ |
||
545 | 545 | |
546 | 546 | if (!$keylength) { |
547 | 547 | $key = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; |
548 | - } |
|
549 | - elseif ($keylength > 56) { |
|
548 | + } elseif ($keylength > 56) { |
|
550 | 549 | $key = substr($key, 0, 56); |
551 | 550 | } |
552 | 551 |
@@ -1197,7 +1197,9 @@ |
||
1197 | 1197 | $u^= 0x7fffffff & ($t >> 1); |
1198 | 1198 | |
1199 | 1199 | // Add the modular polynomial on underflow. |
1200 | - if ($t & 0x01) $u^= 0xa6 ; |
|
1200 | + if ($t & 0x01) { |
|
1201 | + $u^= 0xa6 ; |
|
1202 | + } |
|
1201 | 1203 | |
1202 | 1204 | // Remove t * (a + 1/a) * (x^3 + x). |
1203 | 1205 | $B^= ($u << 24) | ($u << 8); |
@@ -1711,8 +1711,7 @@ discard block |
||
1711 | 1711 | if ($map === false) { |
1712 | 1712 | user_error($id . ' is not a currently supported attribute', E_USER_NOTICE); |
1713 | 1713 | unset($attributes[$i]); |
1714 | - } |
|
1715 | - elseif (is_array($attributes[$i]['value'])) { |
|
1714 | + } elseif (is_array($attributes[$i]['value'])) { |
|
1716 | 1715 | $values = &$attributes[$i]['value']; |
1717 | 1716 | for ($j = 0; $j < count($values); $j++) { |
1718 | 1717 | switch ($id) { |
@@ -3345,8 +3344,7 @@ discard block |
||
3345 | 3344 | |
3346 | 3345 | if (!empty($this->serialNumber)) { |
3347 | 3346 | $crlNumber = $this->serialNumber; |
3348 | - } |
|
3349 | - else { |
|
3347 | + } else { |
|
3350 | 3348 | $crlNumber = $this->getExtension('id-ce-cRLNumber'); |
3351 | 3349 | $crlNumber = $crlNumber !== false ? $crlNumber->add(new Math_BigInteger(1)) : NULL; |
3352 | 3350 | } |
@@ -3359,8 +3357,7 @@ discard block |
||
3359 | 3357 | if (!$version) { |
3360 | 3358 | if (!empty($tbsCertList['crlExtensions'])) { |
3361 | 3359 | $version = 1; // v2. |
3362 | - } |
|
3363 | - elseif (!empty($tbsCertList['revokedCertificates'])) { |
|
3360 | + } elseif (!empty($tbsCertList['revokedCertificates'])) { |
|
3364 | 3361 | foreach ($tbsCertList['revokedCertificates'] as $cert) { |
3365 | 3362 | if (!empty($cert['crlEntryExtensions'])) { |
3366 | 3363 | $version = 1; // v2. |
@@ -350,10 +350,18 @@ |
||
350 | 350 | case 0: // Turn off character attributes |
351 | 351 | $this->attrs[$this->y][$this->x] = ''; |
352 | 352 | |
353 | - if ($this->bold) $this->attrs[$this->y][$this->x].= '</b>'; |
|
354 | - if ($this->underline) $this->attrs[$this->y][$this->x].= '</underline>'; |
|
355 | - if ($this->blink) $this->attrs[$this->y][$this->x].= '</blink>'; |
|
356 | - if ($this->color) $this->attrs[$this->y][$this->x].= '</span>'; |
|
353 | + if ($this->bold) { |
|
354 | + $this->attrs[$this->y][$this->x].= '</b>'; |
|
355 | + } |
|
356 | + if ($this->underline) { |
|
357 | + $this->attrs[$this->y][$this->x].= '</underline>'; |
|
358 | + } |
|
359 | + if ($this->blink) { |
|
360 | + $this->attrs[$this->y][$this->x].= '</blink>'; |
|
361 | + } |
|
362 | + if ($this->color) { |
|
363 | + $this->attrs[$this->y][$this->x].= '</span>'; |
|
364 | + } |
|
357 | 365 | |
358 | 366 | if ($this->reverse) { |
359 | 367 | $temp = $this->background; |
@@ -586,8 +586,7 @@ discard block |
||
586 | 586 | if (isset($child['class'])) { |
587 | 587 | $childClass = $child['class']; |
588 | 588 | $constant = $child['cast']; |
589 | - } |
|
590 | - elseif (isset($child['constant'])) { |
|
589 | + } elseif (isset($child['constant'])) { |
|
591 | 590 | $childClass = FILE_ASN1_CLASS_CONTEXT_SPECIFIC; |
592 | 591 | $constant = $child['constant']; |
593 | 592 | } |
@@ -656,8 +655,7 @@ discard block |
||
656 | 655 | if (isset($child['class'])) { |
657 | 656 | $childClass = $child['class']; |
658 | 657 | $constant = $child['cast']; |
659 | - } |
|
660 | - elseif (isset($child['constant'])) { |
|
658 | + } elseif (isset($child['constant'])) { |
|
661 | 659 | $childClass = FILE_ASN1_CLASS_CONTEXT_SPECIFIC; |
662 | 660 | $constant = $child['constant']; |
663 | 661 | } |
@@ -808,8 +808,9 @@ |
||
808 | 808 | foreach ($param as $key => & $value) { |
809 | 809 | $param_string_parts[] = urlencode($key).'='.urlencode($value); |
810 | 810 | } |
811 | - if (count($param_string_parts) > 0) |
|
812 | - $result .= '&'.implode('&', $param_string_parts); |
|
811 | + if (count($param_string_parts) > 0) { |
|
812 | + $result .= '&'.implode('&', $param_string_parts); |
|
813 | + } |
|
813 | 814 | } |
814 | 815 | return $result; |
815 | 816 | } |
@@ -389,7 +389,9 @@ |
||
389 | 389 | */ |
390 | 390 | function who_is_online_in_this_course($from, $number_of_items, $uid, $time_limit, $course_code) |
391 | 391 | { |
392 | - if (empty($course_code)) return false; |
|
392 | + if (empty($course_code)) { |
|
393 | + return false; |
|
394 | + } |
|
393 | 395 | |
394 | 396 | if (empty($time_limit)) { |
395 | 397 | $time_limit = api_get_setting('time_limit_whosonline'); |
@@ -33,7 +33,9 @@ discard block |
||
33 | 33 | Database::query($query); |
34 | 34 | break; |
35 | 35 | case 'update': |
36 | - if ($new_path[0] == '.') $new_path = substr($new_path, 1); |
|
36 | + if ($new_path[0] == '.') { |
|
37 | + $new_path = substr($new_path, 1); |
|
38 | + } |
|
37 | 39 | $new_path = str_replace('//', '/', $new_path); |
38 | 40 | |
39 | 41 | // Attempt to update - tested & working for root dir |
@@ -379,7 +381,9 @@ discard block |
||
379 | 381 | chdir($path); |
380 | 382 | $handle = opendir($path); |
381 | 383 | while ($element = readdir($handle)) { |
382 | - if ($element == '.' || $element == '..') continue; |
|
384 | + if ($element == '.' || $element == '..') { |
|
385 | + continue; |
|
386 | + } |
|
383 | 387 | // Skip the current and parent directories |
384 | 388 | if (is_dir($element)) { |
385 | 389 | $dir_array[] = $path.'/'.$element; |
@@ -419,7 +423,9 @@ discard block |
||
419 | 423 | chdir($directory); |
420 | 424 | $handle = opendir($directory); |
421 | 425 | while ($element = readdir($handle)) { |
422 | - if ($element == '.' || $element == '..' || $element == '.htaccess') continue; |
|
426 | + if ($element == '.' || $element == '..' || $element == '.htaccess') { |
|
427 | + continue; |
|
428 | + } |
|
423 | 429 | // Skip the current and parent directories |
424 | 430 | if (!is_dir($element)) { |
425 | 431 | $element_array[] = $directory.'/'.$element; |
@@ -469,7 +475,9 @@ discard block |
||
469 | 475 | */ |
470 | 476 | function set_default_settings($upload_path, $filename, $filetype = 'file', $glued_table, $default_visibility = 'v') |
471 | 477 | { |
472 | - if (!$default_visibility) $default_visibility = 'v'; |
|
478 | + if (!$default_visibility) { |
|
479 | + $default_visibility = 'v'; |
|
480 | + } |
|
473 | 481 | |
474 | 482 | // Make sure path is not wrongly formed |
475 | 483 | $upload_path = !empty($upload_path) ? "/$upload_path" : ''; |