@@ -1710,8 +1710,7 @@ |
||
1710 | 1710 | } |
1711 | 1711 | } |
1712 | 1712 | return false; |
1713 | - } |
|
1714 | - elseif (is_array($encoding2)) { |
|
1713 | + } elseif (is_array($encoding2)) { |
|
1715 | 1714 | foreach ($encoding2 as $encoding) { |
1716 | 1715 | if (api_equal_encodings($encoding1, $encoding, $strict)) { |
1717 | 1716 | return true; |
@@ -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 | } |
@@ -1819,7 +1819,9 @@ discard block |
||
1819 | 1819 | } |
1820 | 1820 | |
1821 | 1821 | global $_course; |
1822 | - if ($_course == '-1') $_course = array(); |
|
1822 | + if ($_course == '-1') { |
|
1823 | + $_course = array(); |
|
1824 | + } |
|
1823 | 1825 | return $_course; |
1824 | 1826 | } |
1825 | 1827 | |
@@ -4315,17 +4317,20 @@ discard block |
||
4315 | 4317 | switch ($lang_type) { |
4316 | 4318 | case 'platform_lang': |
4317 | 4319 | $temp_lang = api_get_setting('platformLanguage'); |
4318 | - if (!empty($temp_lang)) |
|
4319 | - $return = $temp_lang; |
|
4320 | + if (!empty($temp_lang)) { |
|
4321 | + $return = $temp_lang; |
|
4322 | + } |
|
4320 | 4323 | break; |
4321 | 4324 | case 'user_profil_lang': |
4322 | 4325 | $_user = api_get_user_info(); |
4323 | - if (isset($_user['language']) && !empty($_user['language'])) |
|
4324 | - $return = $_user['language']; |
|
4326 | + if (isset($_user['language']) && !empty($_user['language'])) { |
|
4327 | + $return = $_user['language']; |
|
4328 | + } |
|
4325 | 4329 | break; |
4326 | 4330 | case 'user_selected_lang': |
4327 | - if (isset($_SESSION['user_language_choice']) && !empty($_SESSION['user_language_choice'])) |
|
4328 | - $return = $_SESSION['user_language_choice']; |
|
4331 | + if (isset($_SESSION['user_language_choice']) && !empty($_SESSION['user_language_choice'])) { |
|
4332 | + $return = $_SESSION['user_language_choice']; |
|
4333 | + } |
|
4329 | 4334 | break; |
4330 | 4335 | case 'course_lang': |
4331 | 4336 | global $_course; |
@@ -4343,8 +4348,9 @@ discard block |
||
4343 | 4348 | } |
4344 | 4349 | } |
4345 | 4350 | $_course = api_get_course_info($cidReq); |
4346 | - if (isset($_course['language']) && !empty($_course['language'])) |
|
4347 | - $return = $_course['language']; |
|
4351 | + if (isset($_course['language']) && !empty($_course['language'])) { |
|
4352 | + $return = $_course['language']; |
|
4353 | + } |
|
4348 | 4354 | break; |
4349 | 4355 | default: |
4350 | 4356 | $return = false; |
@@ -5604,8 +5610,7 @@ discard block |
||
5604 | 5610 | $is_courseAdmin = false; |
5605 | 5611 | $is_courseCoach = true; |
5606 | 5612 | $is_sessionAdmin = false; |
5607 | - } |
|
5608 | - elseif ($row[0]['session_admin_id'] == $userid) { |
|
5613 | + } elseif ($row[0]['session_admin_id'] == $userid) { |
|
5609 | 5614 | $is_courseMember = false; |
5610 | 5615 | $is_courseTutor = false; |
5611 | 5616 | $is_courseAdmin = false; |
@@ -5885,7 +5890,9 @@ discard block |
||
5885 | 5890 | |
5886 | 5891 | if (!empty($course_code)) { |
5887 | 5892 | if (isset($_SESSION['_course']['sysCode'])) { |
5888 | - if ($course_code != $_SESSION['_course']['sysCode']) return false; |
|
5893 | + if ($course_code != $_SESSION['_course']['sysCode']) { |
|
5894 | + return false; |
|
5895 | + } |
|
5889 | 5896 | } else { |
5890 | 5897 | return false; |
5891 | 5898 | } |
@@ -5942,8 +5949,7 @@ discard block |
||
5942 | 5949 | elseif (isset($_ENV['OS'])) { |
5943 | 5950 | // Sometimes $_ENV['OS'] may not be present (bugs?) |
5944 | 5951 | $os = $_ENV['OS']; |
5945 | - } |
|
5946 | - elseif (defined('PHP_OS')) { |
|
5952 | + } elseif (defined('PHP_OS')) { |
|
5947 | 5953 | // PHP_OS means on which OS PHP was compiled, this is why |
5948 | 5954 | // using PHP_OS is the last choice for detection. |
5949 | 5955 | $os = PHP_OS; |
@@ -6007,12 +6013,10 @@ discard block |
||
6007 | 6013 | if ($delta_width > $delta_height) { |
6008 | 6014 | $result['width'] = ceil($image_width * $resize_factor_height); |
6009 | 6015 | $result['height'] = ceil($image_height * $resize_factor_height); |
6010 | - } |
|
6011 | - elseif ($delta_width < $delta_height) { |
|
6016 | + } elseif ($delta_width < $delta_height) { |
|
6012 | 6017 | $result['width'] = ceil($image_width * $resize_factor_width); |
6013 | 6018 | $result['height'] = ceil($image_height * $resize_factor_width); |
6014 | - } |
|
6015 | - else { |
|
6019 | + } else { |
|
6016 | 6020 | $result['width'] = ceil($target_width); |
6017 | 6021 | $result['height'] = ceil($target_height); |
6018 | 6022 | } |
@@ -6781,7 +6785,9 @@ discard block |
||
6781 | 6785 | } |
6782 | 6786 | $ip = trim($ip1); |
6783 | 6787 | } |
6784 | - if (!empty($debug)) error_log('Real IP: '.$ip); |
|
6788 | + if (!empty($debug)) { |
|
6789 | + error_log('Real IP: '.$ip); |
|
6790 | + } |
|
6785 | 6791 | return $ip; |
6786 | 6792 | } |
6787 | 6793 |