Completed
Push — 1.10.x ( f2aaaf...ef00db )
by Yannick
241:15 queued 197:35
created
main/admin/sub_language_add.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
     $sublanguage_available = Database::escape_string($sublanguage_available);
40 40
     $parent_id = intval($parent_id);
41 41
 
42
-    $sql = 'INSERT INTO ' . $tbl_admin_languages . '(original_name,english_name,isocode,dokeos_folder,available,parent_id)
43
-    	  VALUES ("' . $original_name . '","' . $english_name . '","' . $isocode . '","' . $english_name . '","' . $sublanguage_available . '","' . $parent_id . '")';
42
+    $sql = 'INSERT INTO '.$tbl_admin_languages.'(original_name,english_name,isocode,dokeos_folder,available,parent_id)
43
+    	  VALUES ("' . $original_name.'","'.$english_name.'","'.$isocode.'","'.$english_name.'","'.$sublanguage_available.'","'.$parent_id.'")';
44 44
     $res = Database::query($sql);
45 45
     if ($res === false) {
46 46
         return false;
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
65 65
 function check_if_language_exist($original_name, $english_name, $isocode, $sublanguage_available)
66 66
 {
67 67
     $tbl_admin_languages = Database:: get_main_table(TABLE_MAIN_LANGUAGE);
68
-    $sql_original_name = 'SELECT count(*) AS count_original_name FROM ' . $tbl_admin_languages . ' WHERE original_name="' . Database::escape_string($original_name) . '" ';
69
-    $sql_english_name = 'SELECT count(*) AS count_english_name FROM ' . $tbl_admin_languages . ' WHERE english_name="' . Database::escape_string($english_name) . '" ';
68
+    $sql_original_name = 'SELECT count(*) AS count_original_name FROM '.$tbl_admin_languages.' WHERE original_name="'.Database::escape_string($original_name).'" ';
69
+    $sql_english_name = 'SELECT count(*) AS count_english_name FROM '.$tbl_admin_languages.' WHERE english_name="'.Database::escape_string($english_name).'" ';
70 70
     //$sql_isocode='SELECT count(*) AS count_isocode FROM '.$tbl_admin_languages.' WHERE isocode="'.Database::escape_string($isocode).'" ';
71 71
     $rs_original_name = Database::query($sql_original_name);
72 72
     $rs_english_name = Database::query($sql_english_name);
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
  */
123 123
 function ckeck_if_is_parent_of_sub_language($parent_id)
124 124
 {
125
-    $sql = 'SELECT count(*) AS count FROM language WHERE parent_id= ' . intval($parent_id) . '';
125
+    $sql = 'SELECT count(*) AS count FROM language WHERE parent_id= '.intval($parent_id).'';
126 126
     $rs = Database::query($sql);
127 127
     if (Database::num_rows($rs) > 0 && Database::result($rs, 0, 'count') == 1) {
128 128
         return true;
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
     }
184 184
 }
185 185
 
186
-$language_name = get_lang('CreateSubLanguageForLanguage') . ' ( ' . strtolower($language_name) . ' )';
186
+$language_name = get_lang('CreateSubLanguageForLanguage').' ( '.strtolower($language_name).' )';
187 187
 
188 188
 if (ckeck_if_is_parent_of_sub_language($parent_id) === true && isset($_GET['action']) && $_GET['action'] == 'deletesublanguage') {
189 189
     $language_name = get_lang('DeleteSubLanguage');
@@ -204,15 +204,15 @@  discard block
 block discarded – undo
204 204
     foreach ($check_information as $index_information => $value_information) {
205 205
         $allow_insert_info = false;
206 206
         if ($index_information == 'original_name') {
207
-            $msg .= Display::return_message(get_lang('AlreadyExists') . ' "' . get_lang('OriginalName') . '" ' . '(' . $original_name . ')',
207
+            $msg .= Display::return_message(get_lang('AlreadyExists').' "'.get_lang('OriginalName').'" '.'('.$original_name.')',
208 208
                 'error');
209 209
         }
210 210
         if ($index_information == 'english_name') {
211
-            $msg .= Display::return_message(get_lang('AlreadyExists') . ' "' . get_lang('EnglishName') . '" ' . '(' . $english_name . ')',
211
+            $msg .= Display::return_message(get_lang('AlreadyExists').' "'.get_lang('EnglishName').'" '.'('.$english_name.')',
212 212
                 'error');
213 213
         }
214 214
         if ($index_information == 'isocode') {
215
-            $msg .= Display::return_message(get_lang('CodeDoesNotExists') . ': ' . $isocode . '', 'error');
215
+            $msg .= Display::return_message(get_lang('CodeDoesNotExists').': '.$isocode.'', 'error');
216 216
         }
217 217
         if ($index_information == 'execute_add' && $value_information === true) {
218 218
             $allow_insert_info = true;
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
             $english_name = api_strtolower($english_name);
227 227
 
228 228
             $isocode = str_replace(' ', '_', $isocode);
229
-            $str_info = '<br/>' . get_lang('OriginalName') . ' : ' . $original_name . '<br/>' . get_lang('EnglishName') . ' : ' . $english_name . '<br/>' . get_lang('PlatformCharsetTitle') . ' : ' . $isocode;
229
+            $str_info = '<br/>'.get_lang('OriginalName').' : '.$original_name.'<br/>'.get_lang('EnglishName').' : '.$english_name.'<br/>'.get_lang('PlatformCharsetTitle').' : '.$isocode;
230 230
 
231 231
             $mkdir_result = SubLanguageManager::add_language_directory($english_name);
232 232
             if ($mkdir_result) {
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
                     $msg .= Display::return_message(get_lang('LanguageDirectoryNotWriteableContactAdmin'), 'error');
237 237
                 } else {
238 238
                     // Here we build the confirmation message and we send the user to the sub language terms definition page, using a little hack - see #3712
239
-                    $_SESSION['msg'] = Display::return_message(get_lang('TheNewSubLanguageHasBeenAdded') . $str_info . 'confirm',
239
+                    $_SESSION['msg'] = Display::return_message(get_lang('TheNewSubLanguageHasBeenAdded').$str_info.'confirm',
240 240
                         false);
241 241
                     unset($interbreadcrumb);
242 242
                     $_GET['sub_language_id'] = $_REQUEST['sub_language_id'] = $sl_id;
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
 if (isset($_GET['action']) && $_GET['action'] == 'definenewsublanguage') {
274 274
     $text = $language_name;
275 275
     $form = new FormValidator('addsublanguage', 'post',
276
-        'sub_language_add.php?id=' . Security::remove_XSS($_GET['id']) . '&action=definenewsublanguage');
276
+        'sub_language_add.php?id='.Security::remove_XSS($_GET['id']).'&action=definenewsublanguage');
277 277
     $class = 'add';
278 278
     $form->addElement('header', '', $text);
279 279
     $form->addElement('text', 'original_name', get_lang('OriginalName'), 'class="input_titles"');
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
     $form->addElement('checkbox', 'sub_language_is_visible', '', get_lang('Visibility'));
287 287
     $form->addButtonCreate(get_lang('CreateSubLanguage'), 'SubmitAddNewLanguage');
288 288
     //$values['original_name'] = $language_details['original_name'].'...'; -> cannot be used because of quickform filtering (freeze)
289
-    $values['english_name'] = $language_details['english_name'] . '2';
289
+    $values['english_name'] = $language_details['english_name'].'2';
290 290
     $values['isocode'] = $language_details['isocode'];
291 291
     $form->setDefaults($values);
292 292
     $form->display();
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
     if (isset($_GET['action']) && $_GET['action'] == 'deletesublanguage') {
295 295
         $text = $language_name;
296 296
         $form = new FormValidator('deletesublanguage', 'post',
297
-            'sub_language_add.php?id=' . Security::remove_XSS($_GET['id']) . '&sub_language_id=' . Security::remove_XSS($_GET['sub_language_id']));
297
+            'sub_language_add.php?id='.Security::remove_XSS($_GET['id']).'&sub_language_id='.Security::remove_XSS($_GET['sub_language_id']));
298 298
         $class = 'minus';
299 299
         $form->addElement('header', '', $text);
300 300
         $form->addElement('static', '', get_lang('OriginalName'), $original_name);
Please login to merge, or discard this patch.