Completed
Push — 1.11.x ( c69862...ecc799 )
by José
207:40 queued 172:00
created
main/admin/configure_extensions.php 1 patch
Braces   +5 added lines, -3 removed lines patch added patch discarded remove patch
@@ -135,8 +135,8 @@  discard block
 block discarded – undo
135 135
 ?>
136 136
 <div id="message" style="display: none">
137 137
 	<?php
138
-	if(!empty($message))
139
-		Display::display_normal_message($message)
138
+	if(!empty($message)) {
139
+			Display::display_normal_message($message)
140 140
 	?>
141 141
 </div>
142 142
 
@@ -150,7 +150,9 @@  discard block
 block discarded – undo
150 150
     </div>
151 151
         <div class="row">
152 152
             <div class="col-md-5">
153
-                <?php Display::display_icon('screenshot_ppt2lp.jpg', get_lang('Ppt2lp'), array('class'=>'img-responsive')); ?>
153
+                <?php Display::display_icon('screenshot_ppt2lp.jpg', get_lang('Ppt2lp'), array('class'=>'img-responsive'));
154
+	}
155
+	?>
154 156
             </div>
155 157
             <div class="col-md-7">
156 158
                 <form method="POST" class="form-horizontal" action="<?php echo api_get_self(); ?>">
Please login to merge, or discard this patch.
main/inc/lib/usermanager.lib.php 1 patch
Braces   +94 added lines, -60 removed lines patch added patch discarded remove patch
@@ -817,10 +817,12 @@  discard block
 block discarded – undo
817 817
     public static function update_openid($user_id, $openid)
818 818
     {
819 819
         $table_user = Database :: get_main_table(TABLE_MAIN_USER);
820
-        if ($user_id != strval(intval($user_id)))
821
-            return false;
822
-        if ($user_id === false)
823
-            return false;
820
+        if ($user_id != strval(intval($user_id))) {
821
+                    return false;
822
+        }
823
+        if ($user_id === false) {
824
+                    return false;
825
+        }
824 826
         $sql = "UPDATE $table_user SET
825 827
                 openid='".Database::escape_string($openid)."'";
826 828
         $sql .= " WHERE id= $user_id";
@@ -2137,8 +2139,9 @@  discard block
 block discarded – undo
2137 2139
         if (empty($user_id)) {
2138 2140
             $user_id = 0;
2139 2141
         } else {
2140
-            if ($user_id != strval(intval($user_id)))
2141
-                return array();
2142
+            if ($user_id != strval(intval($user_id))) {
2143
+                            return array();
2144
+            }
2142 2145
         }
2143 2146
         $extra_data = array();
2144 2147
         $t_uf = Database::get_main_table(TABLE_EXTRA_FIELD);
@@ -2230,8 +2233,9 @@  discard block
 block discarded – undo
2230 2233
         if (empty($user_id)) {
2231 2234
             $user_id = 0;
2232 2235
         } else {
2233
-            if ($user_id != strval(intval($user_id)))
2234
-                return array();
2236
+            if ($user_id != strval(intval($user_id))) {
2237
+                            return array();
2238
+            }
2235 2239
         }
2236 2240
         $extra_data = array();
2237 2241
         $t_uf = Database::get_main_table(TABLE_EXTRA_FIELD);
@@ -3014,13 +3018,15 @@  discard block
 block discarded – undo
3014 3018
      */
3015 3019
     public static function get_api_keys($user_id = null, $api_service = 'dokeos')
3016 3020
     {
3017
-        if ($user_id != strval(intval($user_id)))
3018
-            return false;
3021
+        if ($user_id != strval(intval($user_id))) {
3022
+                    return false;
3023
+        }
3019 3024
         if (empty($user_id)) {
3020 3025
             $user_id = api_get_user_id();
3021 3026
         }
3022
-        if ($user_id === false)
3023
-            return false;
3027
+        if ($user_id === false) {
3028
+                    return false;
3029
+        }
3024 3030
         $service_name = Database::escape_string($api_service);
3025 3031
         if (is_string($service_name) === false) {
3026 3032
             return false;
@@ -3028,11 +3034,14 @@  discard block
 block discarded – undo
3028 3034
         $t_api = Database::get_main_table(TABLE_MAIN_USER_API_KEY);
3029 3035
         $sql = "SELECT * FROM $t_api WHERE user_id = $user_id AND api_service='$api_service';";
3030 3036
         $res = Database::query($sql);
3031
-        if ($res === false)
3032
-            return false; //error during query
3037
+        if ($res === false) {
3038
+                    return false;
3039
+        }
3040
+        //error during query
3033 3041
         $num = Database::num_rows($res);
3034
-        if ($num == 0)
3035
-            return false;
3042
+        if ($num == 0) {
3043
+                    return false;
3044
+        }
3036 3045
         $list = array();
3037 3046
         while ($row = Database::fetch_array($res)) {
3038 3047
             $list[$row['id']] = $row['api_key'];
@@ -3047,13 +3056,15 @@  discard block
 block discarded – undo
3047 3056
      */
3048 3057
     public static function add_api_key($user_id = null, $api_service = 'dokeos')
3049 3058
     {
3050
-        if ($user_id != strval(intval($user_id)))
3051
-            return false;
3059
+        if ($user_id != strval(intval($user_id))) {
3060
+                    return false;
3061
+        }
3052 3062
         if (empty($user_id)) {
3053 3063
             $user_id = api_get_user_id();
3054 3064
         }
3055
-        if ($user_id === false)
3056
-            return false;
3065
+        if ($user_id === false) {
3066
+                    return false;
3067
+        }
3057 3068
         $service_name = Database::escape_string($api_service);
3058 3069
         if (is_string($service_name) === false) {
3059 3070
             return false;
@@ -3062,8 +3073,10 @@  discard block
 block discarded – undo
3062 3073
         $md5 = md5((time() + ($user_id * 5)) - rand(10000, 10000)); //generate some kind of random key
3063 3074
         $sql = "INSERT INTO $t_api (user_id, api_key,api_service) VALUES ($user_id,'$md5','$service_name')";
3064 3075
         $res = Database::query($sql);
3065
-        if ($res === false)
3066
-            return false; //error during query
3076
+        if ($res === false) {
3077
+                    return false;
3078
+        }
3079
+        //error during query
3067 3080
         $num = Database::insert_id();
3068 3081
         return ($num == 0) ? false : $num;
3069 3082
     }
@@ -3075,22 +3088,29 @@  discard block
 block discarded – undo
3075 3088
      */
3076 3089
     public static function delete_api_key($key_id)
3077 3090
     {
3078
-        if ($key_id != strval(intval($key_id)))
3079
-            return false;
3080
-        if ($key_id === false)
3081
-            return false;
3091
+        if ($key_id != strval(intval($key_id))) {
3092
+                    return false;
3093
+        }
3094
+        if ($key_id === false) {
3095
+                    return false;
3096
+        }
3082 3097
         $t_api = Database::get_main_table(TABLE_MAIN_USER_API_KEY);
3083 3098
         $sql = "SELECT * FROM $t_api WHERE id = ".$key_id;
3084 3099
         $res = Database::query($sql);
3085
-        if ($res === false)
3086
-            return false; //error during query
3100
+        if ($res === false) {
3101
+                    return false;
3102
+        }
3103
+        //error during query
3087 3104
         $num = Database::num_rows($res);
3088
-        if ($num !== 1)
3089
-            return false;
3105
+        if ($num !== 1) {
3106
+                    return false;
3107
+        }
3090 3108
         $sql = "DELETE FROM $t_api WHERE id = ".$key_id;
3091 3109
         $res = Database::query($sql);
3092
-        if ($res === false)
3093
-            return false; //error during query
3110
+        if ($res === false) {
3111
+                    return false;
3112
+        }
3113
+        //error during query
3094 3114
         return true;
3095 3115
     }
3096 3116
 
@@ -3102,10 +3122,12 @@  discard block
 block discarded – undo
3102 3122
      */
3103 3123
     public static function update_api_key($user_id, $api_service)
3104 3124
     {
3105
-        if ($user_id != strval(intval($user_id)))
3106
-            return false;
3107
-        if ($user_id === false)
3108
-            return false;
3125
+        if ($user_id != strval(intval($user_id))) {
3126
+                    return false;
3127
+        }
3128
+        if ($user_id === false) {
3129
+                    return false;
3130
+        }
3109 3131
         $service_name = Database::escape_string($api_service);
3110 3132
         if (is_string($service_name) === false) {
3111 3133
             return false;
@@ -3131,12 +3153,15 @@  discard block
 block discarded – undo
3131 3153
      */
3132 3154
     public static function get_api_key_id($user_id, $api_service)
3133 3155
     {
3134
-        if ($user_id != strval(intval($user_id)))
3135
-            return false;
3136
-        if ($user_id === false)
3137
-            return false;
3138
-        if (empty($api_service))
3139
-            return false;
3156
+        if ($user_id != strval(intval($user_id))) {
3157
+                    return false;
3158
+        }
3159
+        if ($user_id === false) {
3160
+                    return false;
3161
+        }
3162
+        if (empty($api_service)) {
3163
+                    return false;
3164
+        }
3140 3165
         $t_api = Database::get_main_table(TABLE_MAIN_USER_API_KEY);
3141 3166
         $api_service = Database::escape_string($api_service);
3142 3167
         $sql = "SELECT id FROM $t_api WHERE user_id=".$user_id." AND api_service='".$api_service."'";
@@ -4638,8 +4663,9 @@  discard block
 block discarded – undo
4638 4663
                     $form->applyFilter('extra_'.$field_details[1], 'stripslashes');
4639 4664
                     $form->applyFilter('extra_'.$field_details[1], 'trim');
4640 4665
                     if (!$admin_permissions) {
4641
-                        if ($field_details[7] == 0)
4642
-                            $form->freeze('extra_'.$field_details[1]);
4666
+                        if ($field_details[7] == 0) {
4667
+                                                    $form->freeze('extra_'.$field_details[1]);
4668
+                        }
4643 4669
                     }
4644 4670
                     break;
4645 4671
                 case ExtraField::FIELD_TYPE_RADIO:
@@ -4696,8 +4722,9 @@  discard block
 block discarded – undo
4696 4722
                     );
4697 4723
 
4698 4724
                     if (!$admin_permissions) {
4699
-                        if ($field_details[7] == 0)
4700
-                            $form->freeze('extra_'.$field_details[1]);
4725
+                        if ($field_details[7] == 0) {
4726
+                                                    $form->freeze('extra_'.$field_details[1]);
4727
+                        }
4701 4728
                     }
4702 4729
                     break;
4703 4730
                 case ExtraField::FIELD_TYPE_SELECT_MULTIPLE:
@@ -4713,8 +4740,9 @@  discard block
 block discarded – undo
4713 4740
                         array('multiple' => 'multiple')
4714 4741
                     );
4715 4742
                     if (!$admin_permissions) {
4716
-                        if ($field_details[7] == 0)
4717
-                            $form->freeze('extra_'.$field_details[1]);
4743
+                        if ($field_details[7] == 0) {
4744
+                                                    $form->freeze('extra_'.$field_details[1]);
4745
+                        }
4718 4746
                     }
4719 4747
                     break;
4720 4748
                 case ExtraField::FIELD_TYPE_DATE:
@@ -4722,8 +4750,9 @@  discard block
 block discarded – undo
4722 4750
                     $defaults['extra_'.$field_details[1]] = date('Y-m-d 12:00:00');
4723 4751
                     $form->setDefaults($defaults);
4724 4752
                     if (!$admin_permissions) {
4725
-                        if ($field_details[7] == 0)
4726
-                            $form->freeze('extra_'.$field_details[1]);
4753
+                        if ($field_details[7] == 0) {
4754
+                                                    $form->freeze('extra_'.$field_details[1]);
4755
+                        }
4727 4756
                     }
4728 4757
                     $form->applyFilter('theme', 'trim');
4729 4758
                     break;
@@ -4732,8 +4761,9 @@  discard block
 block discarded – undo
4732 4761
                     $defaults['extra_'.$field_details[1]] = date('Y-m-d 12:00:00');
4733 4762
                     $form->setDefaults($defaults);
4734 4763
                     if (!$admin_permissions) {
4735
-                        if ($field_details[7] == 0)
4736
-                            $form->freeze('extra_'.$field_details[1]);
4764
+                        if ($field_details[7] == 0) {
4765
+                                                    $form->freeze('extra_'.$field_details[1]);
4766
+                        }
4737 4767
                     }
4738 4768
                     $form->applyFilter('theme', 'trim');
4739 4769
                     break;
@@ -4752,8 +4782,9 @@  discard block
 block discarded – undo
4752 4782
                     $form->addGroup($group, 'extra_'.$field_details[1], $field_details[3]);
4753 4783
 
4754 4784
                     if (!$admin_permissions) {
4755
-                        if ($field_details[7] == 0)
4756
-                            $form->freeze('extra_'.$field_details[1]);
4785
+                        if ($field_details[7] == 0) {
4786
+                                                    $form->freeze('extra_'.$field_details[1]);
4787
+                        }
4757 4788
                     }
4758 4789
 
4759 4790
                     /* Recoding the selected values for double : if the user has
@@ -4813,8 +4844,9 @@  discard block
 block discarded – undo
4813 4844
                     break;
4814 4845
                 case ExtraField::FIELD_TYPE_TIMEZONE:
4815 4846
                     $form->addElement('select', 'extra_'.$field_details[1], $field_details[3], api_get_timezones(), '');
4816
-                    if ($field_details[7] == 0)
4817
-                        $form->freeze('extra_'.$field_details[1]);
4847
+                    if ($field_details[7] == 0) {
4848
+                                            $form->freeze('extra_'.$field_details[1]);
4849
+                    }
4818 4850
                     break;
4819 4851
                 case ExtraField::FIELD_TYPE_SOCIAL_PROFILE:
4820 4852
                     // get the social network's favicon
@@ -4839,8 +4871,9 @@  discard block
 block discarded – undo
4839 4871
                     );
4840 4872
                     $form->applyFilter('extra_'.$field_details[1], 'stripslashes');
4841 4873
                     $form->applyFilter('extra_'.$field_details[1], 'trim');
4842
-                    if ($field_details[7] == 0)
4843
-                        $form->freeze('extra_'.$field_details[1]);
4874
+                    if ($field_details[7] == 0) {
4875
+                                            $form->freeze('extra_'.$field_details[1]);
4876
+                    }
4844 4877
                     break;
4845 4878
                 case ExtraField::FIELD_TYPE_FILE:
4846 4879
                     $extra_field = 'extra_'.$field_details[1];
@@ -5249,8 +5282,9 @@  discard block
 block discarded – undo
5249 5282
         $url .= "?s=$s&d=$d&r=$r";
5250 5283
         if ( $img ) {
5251 5284
             $url = '<img src="' . $url . '"';
5252
-            foreach ( $atts as $key => $val )
5253
-                $url .= ' ' . $key . '="' . $val . '"';
5285
+            foreach ( $atts as $key => $val ) {
5286
+                            $url .= ' ' . $key . '="' . $val . '"';
5287
+            }
5254 5288
             $url .= ' />';
5255 5289
         }
5256 5290
         return $url;
Please login to merge, or discard this patch.