chamilo / chamilo-lms

main/inc/lib/usermanager.lib.php

Braces +97 added lines, -62 removed lines

@@ -774,10 +774,12 @@ 
     public static function update_openid($user_id, $openid)
     {
         $table_user = Database :: get_main_table(TABLE_MAIN_USER);
-        if ($user_id != strval(intval($user_id)))
-            return false;
-        if ($user_id === false)
-            return false;
+        if ($user_id != strval(intval($user_id))) {
+                    return false;
+        }
+        if ($user_id === false) {
+                    return false;
+        }
         $sql = "UPDATE $table_user SET
                 openid='".Database::escape_string($openid)."'";
         $sql .= " WHERE id= $user_id";
@@ -2069,8 +2071,9 @@ 
         if (empty($user_id)) {
             $user_id = 0;
         } else {
-            if ($user_id != strval(intval($user_id)))
-                return array();
+            if ($user_id != strval(intval($user_id))) {
+                            return array();
+            }
         }
         $extra_data = array();
         $t_uf = Database::get_main_table(TABLE_EXTRA_FIELD);
@@ -2162,8 +2165,9 @@ 
         if (empty($user_id)) {
             $user_id = 0;
         } else {
-            if ($user_id != strval(intval($user_id)))
-                return array();
+            if ($user_id != strval(intval($user_id))) {
+                            return array();
+            }
         }
         $extra_data = array();
         $t_uf = Database::get_main_table(TABLE_EXTRA_FIELD);
@@ -2880,13 +2884,15 @@ 
      */
     public static function get_api_keys($user_id = null, $api_service = 'dokeos')
     {
-        if ($user_id != strval(intval($user_id)))
-            return false;
+        if ($user_id != strval(intval($user_id))) {
+                    return false;
+        }
         if (empty($user_id)) {
             $user_id = api_get_user_id();
         }
-        if ($user_id === false)
-            return false;
+        if ($user_id === false) {
+                    return false;
+        }
         $service_name = Database::escape_string($api_service);
         if (is_string($service_name) === false) {
             return false;
@@ -2894,11 +2900,14 @@ 
         $t_api = Database::get_main_table(TABLE_MAIN_USER_API_KEY);
         $sql = "SELECT * FROM $t_api WHERE user_id = $user_id AND api_service='$api_service';";
         $res = Database::query($sql);
-        if ($res === false)
-            return false; //error during query
+        if ($res === false) {
+                    return false;
+        }
+        //error during query
         $num = Database::num_rows($res);
-        if ($num == 0)
-            return false;
+        if ($num == 0) {
+                    return false;
+        }
         $list = array();
         while ($row = Database::fetch_array($res)) {
             $list[$row['id']] = $row['api_key'];
@@ -2913,13 +2922,15 @@ 
      */
     public static function add_api_key($user_id = null, $api_service = 'dokeos')
     {
-        if ($user_id != strval(intval($user_id)))
-            return false;
+        if ($user_id != strval(intval($user_id))) {
+                    return false;
+        }
         if (empty($user_id)) {
             $user_id = api_get_user_id();
         }
-        if ($user_id === false)
-            return false;
+        if ($user_id === false) {
+                    return false;
+        }
         $service_name = Database::escape_string($api_service);
         if (is_string($service_name) === false) {
             return false;
@@ -2928,8 +2939,10 @@ 
         $md5 = md5((time() + ($user_id * 5)) - rand(10000, 10000)); //generate some kind of random key
         $sql = "INSERT INTO $t_api (user_id, api_key,api_service) VALUES ($user_id,'$md5','$service_name')";
         $res = Database::query($sql);
-        if ($res === false)
-            return false; //error during query
+        if ($res === false) {
+                    return false;
+        }
+        //error during query
         $num = Database::insert_id();
         return ($num == 0) ? false : $num;
     }
@@ -2941,22 +2954,29 @@ 
      */
     public static function delete_api_key($key_id)
     {
-        if ($key_id != strval(intval($key_id)))
-            return false;
-        if ($key_id === false)
-            return false;
+        if ($key_id != strval(intval($key_id))) {
+                    return false;
+        }
+        if ($key_id === false) {
+                    return false;
+        }
         $t_api = Database::get_main_table(TABLE_MAIN_USER_API_KEY);
         $sql = "SELECT * FROM $t_api WHERE id = ".$key_id;
         $res = Database::query($sql);
-        if ($res === false)
-            return false; //error during query
+        if ($res === false) {
+                    return false;
+        }
+        //error during query
         $num = Database::num_rows($res);
-        if ($num !== 1)
-            return false;
+        if ($num !== 1) {
+                    return false;
+        }
         $sql = "DELETE FROM $t_api WHERE id = ".$key_id;
         $res = Database::query($sql);
-        if ($res === false)
-            return false; //error during query
+        if ($res === false) {
+                    return false;
+        }
+        //error during query
         return true;
     }
 
@@ -2968,10 +2988,12 @@ 
      */
     public static function update_api_key($user_id, $api_service)
     {
-        if ($user_id != strval(intval($user_id)))
-            return false;
-        if ($user_id === false)
-            return false;
+        if ($user_id != strval(intval($user_id))) {
+                    return false;
+        }
+        if ($user_id === false) {
+                    return false;
+        }
         $service_name = Database::escape_string($api_service);
         if (is_string($service_name) === false) {
             return false;
@@ -2997,12 +3019,15 @@ 
      */
     public static function get_api_key_id($user_id, $api_service)
     {
-        if ($user_id != strval(intval($user_id)))
-            return false;
-        if ($user_id === false)
-            return false;
-        if (empty($api_service))
-            return false;
+        if ($user_id != strval(intval($user_id))) {
+                    return false;
+        }
+        if ($user_id === false) {
+                    return false;
+        }
+        if (empty($api_service)) {
+                    return false;
+        }
         $t_api = Database::get_main_table(TABLE_MAIN_USER_API_KEY);
         $api_service = Database::escape_string($api_service);
         $sql = "SELECT id FROM $t_api WHERE user_id=".$user_id." AND api_service='".$api_service."'";
@@ -4473,8 +4498,9 @@ 
                     $form->applyFilter('extra_'.$field_details[1], 'stripslashes');
                     $form->applyFilter('extra_'.$field_details[1], 'trim');
                     if (!$admin_permissions) {
-                        if ($field_details[7] == 0)
-                            $form->freeze('extra_'.$field_details[1]);
+                        if ($field_details[7] == 0) {
+                                                    $form->freeze('extra_'.$field_details[1]);
+                        }
                     }
                     break;
                 case ExtraField::FIELD_TYPE_RADIO:
@@ -4491,8 +4517,9 @@ 
                     }
                     $form->addGroup($group, 'extra_'.$field_details[1], $field_details[3], '');
                     if (!$admin_permissions) {
-                        if ($field_details[7] == 0)
-                            $form->freeze('extra_'.$field_details[1]);
+                        if ($field_details[7] == 0) {
+                                                    $form->freeze('extra_'.$field_details[1]);
+                        }
                     }
                     break;
                 case ExtraField::FIELD_TYPE_SELECT:
@@ -4530,8 +4557,9 @@ 
                     );
 
                     if (!$admin_permissions) {
-                        if ($field_details[7] == 0)
-                            $form->freeze('extra_'.$field_details[1]);
+                        if ($field_details[7] == 0) {
+                                                    $form->freeze('extra_'.$field_details[1]);
+                        }
                     }
                     break;
                 case ExtraField::FIELD_TYPE_SELECT_MULTIPLE:
@@ -4547,8 +4575,9 @@ 
                         array('multiple' => 'multiple')
                     );
                     if (!$admin_permissions) {
-                        if ($field_details[7] == 0)
-                            $form->freeze('extra_'.$field_details[1]);
+                        if ($field_details[7] == 0) {
+                                                    $form->freeze('extra_'.$field_details[1]);
+                        }
                     }
                     break;
                 case ExtraField::FIELD_TYPE_DATE:
@@ -4556,8 +4585,9 @@ 
                     $defaults['extra_'.$field_details[1]] = date('Y-m-d 12:00:00');
                     $form->setDefaults($defaults);
                     if (!$admin_permissions) {
-                        if ($field_details[7] == 0)
-                            $form->freeze('extra_'.$field_details[1]);
+                        if ($field_details[7] == 0) {
+                                                    $form->freeze('extra_'.$field_details[1]);
+                        }
                     }
                     $form->applyFilter('theme', 'trim');
                     break;
@@ -4566,8 +4596,9 @@ 
                     $defaults['extra_'.$field_details[1]] = date('Y-m-d 12:00:00');
                     $form->setDefaults($defaults);
                     if (!$admin_permissions) {
-                        if ($field_details[7] == 0)
-                            $form->freeze('extra_'.$field_details[1]);
+                        if ($field_details[7] == 0) {
+                                                    $form->freeze('extra_'.$field_details[1]);
+                        }
                     }
                     $form->applyFilter('theme', 'trim');
                     break;
@@ -4586,8 +4617,9 @@ 
                     $form->addGroup($group, 'extra_'.$field_details[1], $field_details[3], ' ');
 
                     if (!$admin_permissions) {
-                        if ($field_details[7] == 0)
-                            $form->freeze('extra_'.$field_details[1]);
+                        if ($field_details[7] == 0) {
+                                                    $form->freeze('extra_'.$field_details[1]);
+                        }
                     }
 
                     /* Recoding the selected values for double : if the user has
@@ -4647,8 +4679,9 @@ 
                     break;
                 case ExtraField::FIELD_TYPE_TIMEZONE:
                     $form->addElement('select', 'extra_'.$field_details[1], $field_details[3], api_get_timezones(), '');
-                    if ($field_details[7] == 0)
-                        $form->freeze('extra_'.$field_details[1]);
+                    if ($field_details[7] == 0) {
+                                            $form->freeze('extra_'.$field_details[1]);
+                    }
                     break;
                 case ExtraField::FIELD_TYPE_SOCIAL_PROFILE:
                     // get the social network's favicon
@@ -4673,8 +4706,9 @@ 
                     );
                     $form->applyFilter('extra_'.$field_details[1], 'stripslashes');
                     $form->applyFilter('extra_'.$field_details[1], 'trim');
-                    if ($field_details[7] == 0)
-                        $form->freeze('extra_'.$field_details[1]);
+                    if ($field_details[7] == 0) {
+                                            $form->freeze('extra_'.$field_details[1]);
+                    }
                     break;
                 case ExtraField::FIELD_TYPE_FILE:
                     $extra_field = 'extra_'.$field_details[1];
@@ -4991,8 +5025,9 @@ 
         $url .= "?s=$s&d=$d&r=$r";
         if ( $img ) {
             $url = '<img src="' . $url . '"';
-            foreach ( $atts as $key => $val )
-                $url .= ' ' . $key . '="' . $val . '"';
+            foreach ( $atts as $key => $val ) {
+                            $url .= ' ' . $key . '="' . $val . '"';
+            }
             $url .= ' />';
         }
         return $url;

main/inc/lib/sub_language.class.php

Braces +3 added lines, -2 removed lines

@@ -29,8 +29,9 @@
                 while (($file = readdir($dh)) !== false) {
                     if ($file[0] <> '.' && substr($file, -4, strlen($file)) == '.php') {
                         if ($only_main_name) {
-                            if ($file != '' && strpos($file, '.inc.php'))
-                                $content_dir[] = substr($file, 0, strpos($file, '.inc.php'));
+                            if ($file != '' && strpos($file, '.inc.php')) {
+                                                            $content_dir[] = substr($file, 0, strpos($file, '.inc.php'));
+                            }
                         } else {
                             $content_dir[] = $file;
                         }

main/inc/lib/database.lib.php

Braces +1 added lines, -1 removed lines

@@ -594,7 +594,7 @@
                     if (!empty($limit_array)) {
                         if (count($limit_array) > 1) {
                             $return_value .= ' LIMIT '.intval($limit_array[0]).' , '.intval($limit_array[1]);
-                        }  else {
+                        } else {
                             $return_value .= ' LIMIT '.intval($limit_array[0]);
                         }
                     }

main/inc/lib/svg-edit/extensions/imagelib/index.php

Braces +1 added lines, -2 removed lines

@@ -65,8 +65,7 @@
 		if (strpos($filename, "svg")){
 			$new_sizes['width'] = 60;
 			$new_sizes['height'] = 60;
-		}
-		else {
+		} else {
 			$new_sizes = api_resize_image($image, 60, 60);
 		}
 

main/inc/lib/group_portal_manager.lib.php

Braces +6 added lines, -4 removed lines

@@ -563,8 +563,9 @@ 
                 $new_relation_type[] = "'$rel'";
             }
             $relation_type = implode(',', $new_relation_type);
-            if (!empty($relation_type))
-                $where_relation_condition = "AND gu.relation_type IN ($relation_type) ";
+            if (!empty($relation_type)) {
+                            $where_relation_condition = "AND gu.relation_type IN ($relation_type) ";
+            }
         }
 
         $sql = "SELECT
@@ -1086,8 +1087,9 @@ 
                 $thumbwidth = $max_size_for_picture;
             }
             $new_height = round(($thumbwidth / $picture_infos['width']) * $picture_infos['height']);
-            if ($new_height > $max_size_for_picture)
-                $new_height = $thumbwidth;
+            if ($new_height > $max_size_for_picture) {
+                            $new_height = $thumbwidth;
+            }
             $temp->resize($thumbwidth, $new_height, 0);
         }
 

main/inc/lib/diagnoser.lib.php

Braces +13 added lines, -9 removed lines

@@ -158,8 +158,9 @@ 
         $array[] = $this->build_setting($status, '[INI]', 'display_errors', 'http://www.php.net/manual/en/ini.core.php#ini.display_errors', $setting, $req_setting, 'on_off', get_lang('DisplayErrorsInfo'));
 
         $setting = ini_get('default_charset');
-        if ($setting == '')
-            $setting = null;
+        if ($setting == '') {
+                    $setting = null;
+        }
         $req_setting = null;
         $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_ERROR;
         $array[] = $this->build_setting($status, '[INI]', 'default_charset', 'http://www.php.net/manual/en/ini.core.php#ini.default-charset', $setting, $req_setting, null, get_lang('DefaultCharsetInfo'));
@@ -177,22 +178,25 @@ 
         $setting = ini_get('memory_limit');
         $req_setting = '>= '.REQUIRED_MIN_MEMORY_LIMIT.'M';
         $status = self :: STATUS_ERROR;
-        if ((float)$setting >= REQUIRED_MIN_MEMORY_LIMIT)
-            $status = self :: STATUS_OK;
+        if ((float)$setting >= REQUIRED_MIN_MEMORY_LIMIT) {
+                    $status = self :: STATUS_OK;
+        }
         $array[] = $this->build_setting($status, '[INI]', 'memory_limit', 'http://www.php.net/manual/en/ini.core.php#ini.memory-limit', $setting, $req_setting, null, get_lang('MemoryLimitInfo'));
 
         $setting = ini_get('post_max_size');
         $req_setting = '>= '.REQUIRED_MIN_POST_MAX_SIZE.'M';
         $status = self :: STATUS_ERROR;
-        if ((float)$setting >= REQUIRED_MIN_POST_MAX_SIZE)
-            $status = self :: STATUS_OK;
+        if ((float)$setting >= REQUIRED_MIN_POST_MAX_SIZE) {
+                    $status = self :: STATUS_OK;
+        }
         $array[] = $this->build_setting($status, '[INI]', 'post_max_size', 'http://www.php.net/manual/en/ini.core.php#ini.post-max-size', $setting, $req_setting, null, get_lang('PostMaxSizeInfo'));
 
         $setting = ini_get('upload_max_filesize');
         $req_setting = '>= '.REQUIRED_MIN_UPLOAD_MAX_FILESIZE.'M';
         $status = self :: STATUS_ERROR;
-        if ((float)$setting >= REQUIRED_MIN_UPLOAD_MAX_FILESIZE)
-            $status = self :: STATUS_OK;
+        if ((float)$setting >= REQUIRED_MIN_UPLOAD_MAX_FILESIZE) {
+                    $status = self :: STATUS_OK;
+        }
         $array[] = $this->build_setting($status, '[INI]', 'upload_max_filesize', 'http://www.php.net/manual/en/ini.core.php#ini.upload_max_filesize', $setting, $req_setting, null, get_lang('UploadMaxFilesizeInfo'));
 
         $setting = ini_get('variables_order');
@@ -205,7 +209,7 @@ 
         $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING;
         $array[] = $this->build_setting($status, '[SESSION]', 'session.gc_maxlifetime', 'http://www.php.net/manual/en/ini.core.php#session.gc-maxlifetime', $setting, $req_setting, null, get_lang('SessionGCMaxLifetimeInfo'));
 
-        if (api_check_browscap()){$setting = true;}else{$setting=false;}
+        if (api_check_browscap()){$setting = true;} else{$setting=false;}
         $req_setting = true;
         $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING;
         $array[] = $this->build_setting($status, '[INI]', 'browscap', 'http://www.php.net/manual/en/misc.configuration.php#ini.browscap', $setting, $req_setting, 'on_off', get_lang('BrowscapInfo'));

main/inc/lib/browser/Browser.php

Braces +16 added lines, -32 removed lines

@@ -1152,68 +1152,52 @@
         if (stripos($this->_agent, 'windows') !== false) 
         {
             $this->_platform = self::PLATFORM_WINDOWS;
-        } 
-        else if (stripos($this->_agent, 'iPad') !== false) 
+        } else if (stripos($this->_agent, 'iPad') !== false) 
         {
             $this->_platform = self::PLATFORM_IPAD;
-        } 
-        else if (stripos($this->_agent, 'iPod') !== false) 
+        } else if (stripos($this->_agent, 'iPod') !== false) 
         {
             $this->_platform = self::PLATFORM_IPOD;
-        } 
-        else if (stripos($this->_agent, 'iPhone') !== false) 
+        } else if (stripos($this->_agent, 'iPhone') !== false) 
         {
             $this->_platform = self::PLATFORM_IPHONE;
-        } 
-        elseif (stripos($this->_agent, 'mac') !== false) 
+        } elseif (stripos($this->_agent, 'mac') !== false) 
         {
             $this->_platform = self::PLATFORM_APPLE;
-        } 
-        elseif (stripos($this->_agent, 'android') !== false) 
+        } elseif (stripos($this->_agent, 'android') !== false) 
         {
             $this->_platform = self::PLATFORM_ANDROID;
-        } 
-        elseif (stripos($this->_agent, 'linux') !== false) 
+        } elseif (stripos($this->_agent, 'linux') !== false) 
         {
             $this->_platform = self::PLATFORM_LINUX;
-        } 
-        else if (stripos($this->_agent, 'Nokia') !== false) 
+        } else if (stripos($this->_agent, 'Nokia') !== false) 
         {
             $this->_platform = self::PLATFORM_NOKIA;
-        } 
-        else if (stripos($this->_agent, 'BlackBerry') !== false) 
+        } else if (stripos($this->_agent, 'BlackBerry') !== false) 
         {
             $this->_platform = self::PLATFORM_BLACKBERRY;
-        } 
-        elseif (stripos($this->_agent, 'FreeBSD') !== false) 
+        } elseif (stripos($this->_agent, 'FreeBSD') !== false) 
         {
             $this->_platform = self::PLATFORM_FREEBSD;
-        } 
-        elseif (stripos($this->_agent, 'OpenBSD') !== false) 
+        } elseif (stripos($this->_agent, 'OpenBSD') !== false) 
         {
             $this->_platform = self::PLATFORM_OPENBSD;
-        } 
-        elseif (stripos($this->_agent, 'NetBSD') !== false) 
+        } elseif (stripos($this->_agent, 'NetBSD') !== false) 
         {
             $this->_platform = self::PLATFORM_NETBSD;
-        } 
-        elseif (stripos($this->_agent, 'OpenSolaris') !== false) 
+        } elseif (stripos($this->_agent, 'OpenSolaris') !== false) 
         {
             $this->_platform = self::PLATFORM_OPENSOLARIS;
-        } 
-        elseif (stripos($this->_agent, 'SunOS') !== false) 
+        } elseif (stripos($this->_agent, 'SunOS') !== false) 
         {
             $this->_platform = self::PLATFORM_SUNOS;
-        } 
-        elseif (stripos($this->_agent, 'OS\/2') !== false) 
+        } elseif (stripos($this->_agent, 'OS\/2') !== false) 
         {
             $this->_platform = self::PLATFORM_OS2;
-        } 
-        elseif (stripos($this->_agent, 'BeOS') !== false) 
+        } elseif (stripos($this->_agent, 'BeOS') !== false) 
         {
             $this->_platform = self::PLATFORM_BEOS;
-        } 
-        elseif (stripos($this->_agent, 'win') !== false) 
+        } elseif (stripos($this->_agent, 'win') !== false) 
         {
             $this->_platform = self::PLATFORM_WINDOWS;
         }

main/inc/lib/phpmailer/class.smtp.php

Braces +3 added lines, -2 removed lines

@@ -143,8 +143,9 @@
 

     // SMTP server can take longer to respond, give longer timeout for first read

     // Windows does not have support for this timeout function

-    if(substr(PHP_OS, 0, 3) != "WIN")

-     socket_set_timeout($this->smtp_conn, $tval, 0);

+    if(substr(PHP_OS, 0, 3) != "WIN") {
+         socket_set_timeout($this->smtp_conn, $tval, 0);
+    }
 

     // get any announcement

     $announce = $this->get_lines();

main/inc/lib/phpmailer/class.phpmailer.php

Braces +9 added lines, -4 removed lines

@@ -38,7 +38,9 @@ 
  * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
  */
 
-if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
+if (version_compare(PHP_VERSION, '5.0.0', '<') ) {
+    exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
+}
 
 class PHPMailer {
 
@@ -1502,8 +1504,9 @@ 
       case '8bit':
         $encoded = $this->FixEOL($str);
         //Make sure it ends with a line break
-        if (substr($encoded, -(strlen($this->LE))) != $this->LE)
-          $encoded .= $this->LE;
+        if (substr($encoded, -(strlen($this->LE))) != $this->LE) {
+                  $encoded .= $this->LE;
+        }
         break;
       case 'binary':
         $encoded = $str;
@@ -2264,7 +2267,9 @@ 
    * @param string $body Message Body
    */
   public function DKIM_BodyC($body) {
-    if ($body == '') return "\r\n";
+    if ($body == '') {
+        return "\r\n";
+    }
     // stabilize line endings
     $body=str_replace("\r\n","\n",$body);
     $body=str_replace("\n","\r\n",$body);