Completed
Push — 1.11.x ( 7e6069...34fe5d )
by José
101:44 queued 47:09
created
main/inc/lib/access_url_edit_sessions_to_url_functions.lib.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -44,17 +44,17 @@
 block discarded – undo
44 44
                     ORDER BY name, id
45 45
                     LIMIT 11';
46 46
             $rs = Database::query($sql);
47
-            $i=0;
47
+            $i = 0;
48 48
             while ($session = Database :: fetch_array($rs)) {
49 49
                 $i++;
50
-                if ($i<=10) {
50
+                if ($i <= 10) {
51 51
                      $return .= '<a href="#" onclick="add_user_to_url(\''.addslashes($session['id']).'\',\''.addslashes($session['name']).' ('.addslashes($session['id']).')'.'\')">'.$session['name'].' </a><br />';
52 52
                 } else {
53 53
                     $return .= '...<br />';
54 54
                 }
55 55
             }
56 56
         }
57
-        $xajax_response -> addAssign('ajax_list_courses','innerHTML',api_utf8_encode($return));
57
+        $xajax_response -> addAssign('ajax_list_courses', 'innerHTML', api_utf8_encode($return));
58 58
         return $xajax_response;
59 59
     }
60 60
 }
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
             while ($session = Database :: fetch_array($rs)) {
49 49
                 $i++;
50 50
                 if ($i<=10) {
51
-                     $return .= '<a href="#" onclick="add_user_to_url(\''.addslashes($session['id']).'\',\''.addslashes($session['name']).' ('.addslashes($session['id']).')'.'\')">'.$session['name'].' </a><br />';
51
+                        $return .= '<a href="#" onclick="add_user_to_url(\''.addslashes($session['id']).'\',\''.addslashes($session['name']).' ('.addslashes($session['id']).')'.'\')">'.$session['name'].' </a><br />';
52 52
                 } else {
53 53
                     $return .= '...<br />';
54 54
                 }
Please login to merge, or discard this patch.
main/inc/lib/mp3player/is_autostart.as.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -12,13 +12,13 @@
 block discarded – undo
12 12
 switch ($_SESSION['whereami']) {
13 13
 
14 14
 
15
-	case 'lp/build' :
16
-	case 'document/create' :
17
-	case 'document/edit' :
18
-		$autostart = 'false';
19
-	break;
20
-	default :
21
-		$autostart = 'true';
15
+    case 'lp/build' :
16
+    case 'document/create' :
17
+    case 'document/edit' :
18
+        $autostart = 'false';
19
+    break;
20
+    default :
21
+        $autostart = 'true';
22 22
 
23 23
 }
24 24
 echo utf8_encode('autostart='.$autostart);
Please login to merge, or discard this patch.
main/inc/lib/AnnouncementManager.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1510,7 +1510,7 @@
 block discarded – undo
1510 1510
                             ip.to_user_id=$user_id OR (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".implode(", ", $group_memberships)."))
1511 1511
                         ) ";
1512 1512
                     } else {
1513
-                       $cond_user_id = " AND (
1513
+                        $cond_user_id = " AND (
1514 1514
                             ip.to_user_id=$user_id OR (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".api_get_group_id()."))
1515 1515
                         )";
1516 1516
                     }
Please login to merge, or discard this patch.
Doc Comments   +10 added lines, -6 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
     }
19 19
 
20 20
     /**
21
-     * @return array
21
+     * @return string[]
22 22
      */
23 23
     public static function get_tags()
24 24
     {
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
      * @param string    $course_code
41 41
      * @param int       $session_id
42 42
      *
43
-     * @return mixed
43
+     * @return string
44 44
      */
45 45
     public static function parse_content($userId, $content, $course_code, $session_id = 0)
46 46
     {
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
      * @param int $courseId
184 184
      * @param int $userId
185 185
      *
186
-     * @return array
186
+     * @return integer
187 187
      */
188 188
     public static function getAnnouncementInfoById($announcementId, $courseId, $userId)
189 189
     {
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
      * @param array	    uploaded file $_FILES
385 385
      * @param string    Comment describing the attachment
386 386
      * @param bool  $sendToUsersInSession
387
-     * @return int      false on failure, ID of the announcement on success
387
+     * @return false|string      false on failure, ID of the announcement on success
388 388
      */
389 389
     public static function add_announcement(
390 390
         $emailTitle,
@@ -495,7 +495,7 @@  discard block
 block discarded – undo
495 495
      * @param string $file_comment
496 496
      * @param bool $sendToUsersInSession
497 497
      *
498
-     * @return bool|int
498
+     * @return false|string
499 499
      */
500 500
     public static function add_group_announcement(
501 501
         $emailTitle,
@@ -739,7 +739,7 @@  discard block
 block discarded – undo
739 739
 
740 740
     /**
741 741
      * @param int $insert_id
742
-     * @return bool
742
+     * @return false|null
743 743
      */
744 744
     public static function update_mail_sent($insert_id)
745 745
     {
@@ -759,6 +759,7 @@  discard block
 block discarded – undo
759 759
      * Gets all announcements from a user by course
760 760
      * @param	string course db
761 761
      * @param	int user id
762
+     * @param integer $user_id
762 763
      * @return	array html with the content and count of announcements or false otherwise
763 764
      */
764 765
     public static function get_all_annoucement_by_user_course($course_code, $user_id)
@@ -1224,6 +1225,7 @@  discard block
 block discarded – undo
1224 1225
      * has been sent to
1225 1226
      * @param    string  The tool (announcement, agenda, ...)
1226 1227
      * @param    int     ID of the element of the corresponding type
1228
+     * @param string $tool
1227 1229
      * @return   array   Array of users and groups to whom the element has been sent
1228 1230
      */
1229 1231
     public static function sent_to($tool, $id)
@@ -1348,6 +1350,8 @@  discard block
 block discarded – undo
1348 1350
      * @param int attach id
1349 1351
      * @param array uploaded file $_FILES
1350 1352
      * @param string file comment
1353
+     * @param integer $id_attach
1354
+     * @param string $file_comment
1351 1355
      * @return int
1352 1356
      */
1353 1357
     public static function edit_announcement_attachment_file($id_attach, $file, $file_comment)
Please login to merge, or discard this patch.
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
                         IP.tool='announcement' AND
218 218
                         (
219 219
                             IP.toUser = $userId OR
220
-                            IP.group IN ('0', '" . implode("', '", $group_list) . "') OR
220
+                            IP.group IN ('0', '".implode("', '", $group_list)."') OR
221 221
                             IP.group IS NULL
222 222
                         ) AND
223 223
                         IP.visibility = '1' AND
@@ -282,13 +282,13 @@  discard block
 block discarded – undo
282 282
         $content = $announcement->getContent();
283 283
 
284 284
         $html .= "<table height=\"100\" width=\"100%\" cellpadding=\"5\" cellspacing=\"0\" class=\"data_table\">";
285
-        $html .= "<tr><td><h2>" . $title . "</h2></td></tr>";
285
+        $html .= "<tr><td><h2>".$title."</h2></td></tr>";
286 286
 
287 287
         if (api_is_allowed_to_edit(false, true) ||
288 288
             (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())
289 289
         ) {
290
-            $modify_icons = "<a href=\"" . api_get_self() . "?" . api_get_cidreq() . "&action=modify&id=" . $announcement_id . "\">" .
291
-                Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL) . "</a>";
290
+            $modify_icons = "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=modify&id=".$announcement_id."\">".
291
+                Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL)."</a>";
292 292
             if ($itemProperty->getVisibility() === 1) {
293 293
                 $image_visibility = "visible";
294 294
                 $alt_visibility = get_lang('Hide');
@@ -298,12 +298,12 @@  discard block
 block discarded – undo
298 298
             }
299 299
             global $stok;
300 300
 
301
-            $modify_icons .= "<a href=\"" . api_get_self() . "?" . api_get_cidreq() . "&action=showhide&id=" . $announcement_id . "&sec_token=" . $stok . "\">" .
302
-                Display::return_icon($image_visibility . '.png', $alt_visibility, '', ICON_SIZE_SMALL) . "</a>";
301
+            $modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=showhide&id=".$announcement_id."&sec_token=".$stok."\">".
302
+                Display::return_icon($image_visibility.'.png', $alt_visibility, '', ICON_SIZE_SMALL)."</a>";
303 303
 
304 304
             if (api_is_allowed_to_edit(false, true)) {
305
-                $modify_icons .= "<a href=\"" . api_get_self() . "?" . api_get_cidreq() . "&action=delete&id=" . $announcement_id . "&sec_token=" . $stok . "\" onclick=\"javascript:if(!confirm('" . addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)) . "')) return false;\">" .
306
-                    Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL) .
305
+                $modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=delete&id=".$announcement_id."&sec_token=".$stok."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset))."')) return false;\">".
306
+                    Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).
307 307
                     "</a>";
308 308
             }
309 309
             $html .= "<tr><th style='text-align:right'>$modify_icons</th></tr>";
@@ -320,9 +320,9 @@  discard block
 block discarded – undo
320 320
         );
321 321
 
322 322
         $html .= "<tr><td>$content</td></tr>";
323
-        $html .= "<tr><td class=\"announcements_datum\">" . get_lang('LastUpdateDate') . " : " . api_convert_and_format_date(
323
+        $html .= "<tr><td class=\"announcements_datum\">".get_lang('LastUpdateDate')." : ".api_convert_and_format_date(
324 324
             $itemProperty->getInsertDate(), DATE_TIME_FORMAT_LONG
325
-        ) . "</td></tr>";
325
+        )."</td></tr>";
326 326
 
327 327
         if ($itemProperty->getGroup() !== null) {
328 328
             $sent_to_icon = Display::return_icon('group.gif', get_lang('AnnounceSentToUserSelection'));
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
             $sent_to_form = self::sent_to_form($sent_to);
333 333
             $html .= Display::tag(
334 334
                 'td',
335
-                get_lang('SentTo') . ' : ' . $sent_to_form,
335
+                get_lang('SentTo').' : '.$sent_to_form,
336 336
                 array('class' => 'announcements_datum')
337 337
             );
338 338
         }
@@ -342,15 +342,15 @@  discard block
 block discarded – undo
342 342
             $html .= "<tr><td>";
343 343
             $realname = $attachment_list['path'];
344 344
             $user_filename = $attachment_list['filename'];
345
-            $full_file_name = 'download.php?'.api_get_cidreq().'&file=' . $realname;
345
+            $full_file_name = 'download.php?'.api_get_cidreq().'&file='.$realname;
346 346
             $html .= '<br/>';
347 347
             $html .= Display::return_icon('attachment.gif', get_lang('Attachment'));
348
-            $html .= '<a href="' . $full_file_name . ' "> ' . $user_filename . ' </a>';
349
-            $html .= ' - <span class="forum_attach_comment" >' . $attachment_list['comment'] . '</span>';
348
+            $html .= '<a href="'.$full_file_name.' "> '.$user_filename.' </a>';
349
+            $html .= ' - <span class="forum_attach_comment" >'.$attachment_list['comment'].'</span>';
350 350
             if (api_is_allowed_to_edit(false, true)) {
351 351
                 $html .= Display::url(
352 352
                     Display::return_icon('delete.png', get_lang('Delete'), '', 16),
353
-                    api_get_self() . "?" . api_get_cidreq() . "&action=delete_attachment&id_attach=" . $attachment_list['id'] . "&sec_token=" . $stok
353
+                    api_get_self()."?".api_get_cidreq()."&action=delete_attachment&id_attach=".$attachment_list['id']."&sec_token=".$stok
354 354
                 );
355 355
             }
356 356
             $html .= '</td></tr>';
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
         $order = 0;
376 376
         if (Database::num_rows($res_max)) {
377 377
             $row_max = Database::fetch_array($res_max);
378
-            $order = intval($row_max[0])+1;
378
+            $order = intval($row_max[0]) + 1;
379 379
         }
380 380
 
381 381
         return $order;
@@ -798,8 +798,8 @@  discard block
 block discarded – undo
798 798
             $result = array();
799 799
             if ($num_rows > 0) {
800 800
                 while ($myrow = Database::fetch_array($rs)) {
801
-                    $content.= '<strong>' . $myrow['title'] . '</strong><br /><br />';
802
-                    $content.= $myrow['content'];
801
+                    $content .= '<strong>'.$myrow['title'].'</strong><br /><br />';
802
+                    $content .= $myrow['content'];
803 803
                     $i++;
804 804
                 }
805 805
                 $result['content'] = $content;
@@ -917,14 +917,14 @@  discard block
 block discarded – undo
917 917
             switch ($to_group) {
918 918
                 // it was send to one specific user
919 919
                 case null:
920
-                    $to[] = "USER:" . $row['to_user_id'];
920
+                    $to[] = "USER:".$row['to_user_id'];
921 921
                     break;
922 922
                 // it was sent to everyone
923 923
                 case 0:
924 924
                     return "everyone";
925 925
                     break;
926 926
                 default:
927
-                    $to[] = "GROUP:" . $row['to_group_id'];
927
+                    $to[] = "GROUP:".$row['to_group_id'];
928 928
             }
929 929
         }
930 930
         return $to;
@@ -987,10 +987,10 @@  discard block
 block discarded – undo
987 987
                 $sent_to_array['groups'][0] !== 0
988 988
             ) {
989 989
                 $group_id = $sent_to_array['groups'][0];
990
-                $output[] = "&nbsp;" . $group_names[$group_id]['name'];
990
+                $output[] = "&nbsp;".$group_names[$group_id]['name'];
991 991
             }
992 992
             if (empty($sent_to_array['groups']) and empty($sent_to_array['users'])) {
993
-                $output[] = "&nbsp;" . get_lang('Everybody');
993
+                $output[] = "&nbsp;".get_lang('Everybody');
994 994
             }
995 995
         }
996 996
 
@@ -1023,7 +1023,7 @@  discard block
 block discarded – undo
1023 1023
 
1024 1024
         $sql = "SELECT to_group_id, to_user_id
1025 1025
                 FROM $tbl_item_property
1026
-                WHERE c_id = $course_id AND tool = '$tool' AND ref=" . $id;
1026
+                WHERE c_id = $course_id AND tool = '$tool' AND ref=".$id;
1027 1027
         $result = Database::query($sql);
1028 1028
 
1029 1029
         while ($row = Database::fetch_array($result)) {
@@ -1064,8 +1064,8 @@  discard block
 block discarded – undo
1064 1064
         $announcementId = intval($announcementId);
1065 1065
         $course_id = api_get_course_int_id();
1066 1066
         $row = array();
1067
-        $sql = 'SELECT id, path, filename, comment FROM ' . $tbl_announcement_attachment . '
1068
-				WHERE c_id = ' . $course_id . ' AND announcement_id = ' . $announcementId;
1067
+        $sql = 'SELECT id, path, filename, comment FROM '.$tbl_announcement_attachment.'
1068
+				WHERE c_id = ' . $course_id.' AND announcement_id = '.$announcementId;
1069 1069
         $result = Database::query($sql);
1070 1070
         if (Database::num_rows($result) != 0) {
1071 1071
             $row = Database::fetch_array($result, 'ASSOC');
@@ -1090,9 +1090,9 @@  discard block
 block discarded – undo
1090 1090
 
1091 1091
         if (is_array($file) && $file['error'] == 0) {
1092 1092
             // TODO: This path is obsolete. The new document repository scheme should be kept in mind here.
1093
-            $courseDir = $_course['path'] . '/upload/announcements';
1093
+            $courseDir = $_course['path'].'/upload/announcements';
1094 1094
             $sys_course_path = api_get_path(SYS_COURSE_PATH);
1095
-            $updir = $sys_course_path . $courseDir;
1095
+            $updir = $sys_course_path.$courseDir;
1096 1096
 
1097 1097
             // Try to add an extension to the file if it hasn't one
1098 1098
             $new_file_name = add_ext_on_mime(stripslashes($file['name']), $file['type']);
@@ -1104,7 +1104,7 @@  discard block
 block discarded – undo
1104 1104
                 Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
1105 1105
             } else {
1106 1106
                 $new_file_name = uniqid('');
1107
-                $new_path = $updir . '/' . $new_file_name;
1107
+                $new_path = $updir.'/'.$new_file_name;
1108 1108
                 copy($file['tmp_name'], $new_path);
1109 1109
 
1110 1110
                 $params = [
@@ -1145,9 +1145,9 @@  discard block
 block discarded – undo
1145 1145
 
1146 1146
         if (is_array($file) && $file['error'] == 0) {
1147 1147
             // TODO: This path is obsolete. The new document repository scheme should be kept in mind here.
1148
-            $courseDir = $_course['path'] . '/upload/announcements';
1148
+            $courseDir = $_course['path'].'/upload/announcements';
1149 1149
             $sys_course_path = api_get_path(SYS_COURSE_PATH);
1150
-            $updir = $sys_course_path . $courseDir;
1150
+            $updir = $sys_course_path.$courseDir;
1151 1151
 
1152 1152
             // Try to add an extension to the file if it hasn't one
1153 1153
             $new_file_name = add_ext_on_mime(stripslashes($file['name']), $file['type']);
@@ -1159,13 +1159,13 @@  discard block
 block discarded – undo
1159 1159
                 Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
1160 1160
             } else {
1161 1161
                 $new_file_name = uniqid('');
1162
-                $new_path = $updir . '/' . $new_file_name;
1162
+                $new_path = $updir.'/'.$new_file_name;
1163 1163
                 @move_uploaded_file($file['tmp_name'], $new_path);
1164 1164
                 $safe_file_comment = Database::escape_string($file_comment);
1165 1165
                 $safe_file_name = Database::escape_string($file_name);
1166 1166
                 $safe_new_file_name = Database::escape_string($new_file_name);
1167 1167
                 $id_attach = intval($id_attach);
1168
-                $sql = "UPDATE $tbl_announcement_attachment SET filename = '$safe_file_name', comment = '$safe_file_comment', path = '$safe_new_file_name', size ='" . intval($file['size']) . "'
1168
+                $sql = "UPDATE $tbl_announcement_attachment SET filename = '$safe_file_name', comment = '$safe_file_comment', path = '$safe_new_file_name', size ='".intval($file['size'])."'
1169 1169
 					 	WHERE c_id = $course_id AND id = '$id_attach'";
1170 1170
                 $result = Database::query($sql);
1171 1171
                 if ($result === false) {
@@ -1272,7 +1272,7 @@  discard block
 block discarded – undo
1272 1272
 
1273 1273
             //if (!empty($user_id)) {
1274 1274
             if (0) {
1275
-                if (is_array($group_memberships) && count($group_memberships) > 0 ) {
1275
+                if (is_array($group_memberships) && count($group_memberships) > 0) {
1276 1276
                     $sql = "SELECT $select
1277 1277
                             FROM $tbl_announcement announcement, $tbl_item_property ip
1278 1278
                             WHERE
@@ -1472,8 +1472,8 @@  discard block
 block discarded – undo
1472 1472
                 if ($myrow['email_sent'] == '1') {
1473 1473
                     $sent_to_icon = ' '.Display::return_icon('email.gif', get_lang('AnnounceSentByEmail'));
1474 1474
                 }
1475
-                $groupReference = ($myrow['to_group_id'] > 0) ? ' <span class="label label-info">' . get_lang('Group') . '</span> ' : '' ;
1476
-                $title = $myrow['title'] . $groupReference . $sent_to_icon;
1475
+                $groupReference = ($myrow['to_group_id'] > 0) ? ' <span class="label label-info">'.get_lang('Group').'</span> ' : '';
1476
+                $title = $myrow['title'].$groupReference.$sent_to_icon;
1477 1477
                 $item_visibility = api_get_item_visibility($_course, TOOL_ANNOUNCEMENT, $myrow['id'], $session_id);
1478 1478
                 $myrow['visibility'] = $item_visibility;
1479 1479
 
@@ -1481,8 +1481,8 @@  discard block
 block discarded – undo
1481 1481
                 $attachment_list = AnnouncementManager::get_attachment($myrow['id']);
1482 1482
 
1483 1483
                 $attachment_icon = '';
1484
-                if (count($attachment_list)>0) {
1485
-                    $attachment_icon = ' '.Display::return_icon('attachment.gif',get_lang('Attachment'));
1484
+                if (count($attachment_list) > 0) {
1485
+                    $attachment_icon = ' '.Display::return_icon('attachment.gif', get_lang('Attachment'));
1486 1486
                 }
1487 1487
 
1488 1488
                 /* TITLE */
@@ -1501,16 +1501,16 @@  discard block
 block discarded – undo
1501 1501
                     || (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())
1502 1502
                 ) {
1503 1503
                     $modify_icons = "<a href=\"".$actionUrl."&action=modify&id=".$myrow['id']."\">".
1504
-                        Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL)."</a>";
1505
-                    if ($myrow['visibility']==1) {
1506
-                        $image_visibility="visible";
1507
-                        $alt_visibility=get_lang('Hide');
1504
+                        Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL)."</a>";
1505
+                    if ($myrow['visibility'] == 1) {
1506
+                        $image_visibility = "visible";
1507
+                        $alt_visibility = get_lang('Hide');
1508 1508
                     } else {
1509
-                        $image_visibility="invisible";
1510
-                        $alt_visibility=get_lang('Visible');
1509
+                        $image_visibility = "invisible";
1510
+                        $alt_visibility = get_lang('Visible');
1511 1511
                     }
1512
-                    $modify_icons .=  "<a href=\"".$actionUrl."&action=showhide&id=".$myrow['id']."&sec_token=".$stok."\">".
1513
-                        Display::return_icon($image_visibility.'.png', $alt_visibility,'',ICON_SIZE_SMALL)."</a>";
1512
+                    $modify_icons .= "<a href=\"".$actionUrl."&action=showhide&id=".$myrow['id']."&sec_token=".$stok."\">".
1513
+                        Display::return_icon($image_visibility.'.png', $alt_visibility, '', ICON_SIZE_SMALL)."</a>";
1514 1514
 
1515 1515
                     // DISPLAY MOVE UP COMMAND only if it is not the top announcement
1516 1516
                     if ($iterator != 1) {
@@ -1525,12 +1525,12 @@  discard block
 block discarded – undo
1525 1525
                     } else {
1526 1526
                         $modify_icons .= Display::return_icon('down_na.gif', get_lang('Down'));
1527 1527
                     }
1528
-                    if (api_is_allowed_to_edit(false,true)) {
1529
-                        $modify_icons .= "<a href=\"".$actionUrl."&action=delete&id=".$myrow['id']."&sec_token=".$stok."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,api_get_system_encoding()))."')) return false;\">".
1530
-                            Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).
1528
+                    if (api_is_allowed_to_edit(false, true)) {
1529
+                        $modify_icons .= "<a href=\"".$actionUrl."&action=delete&id=".$myrow['id']."&sec_token=".$stok."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, api_get_system_encoding()))."')) return false;\">".
1530
+                            Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).
1531 1531
                             "</a>";
1532 1532
                     }
1533
-                    $iterator ++;
1533
+                    $iterator++;
1534 1534
                 } else {
1535 1535
                     $modify_icons = Display::url(
1536 1536
                         Display::return_icon('default.png'),
@@ -1571,7 +1571,7 @@  discard block
 block discarded – undo
1571 1571
         $userId = api_get_user_id();
1572 1572
         $condition_session = api_get_session_condition($session_id, true, true, 'announcement.session_id');
1573 1573
 
1574
-        if (api_is_allowed_to_edit(false,true))  {
1574
+        if (api_is_allowed_to_edit(false, true)) {
1575 1575
             // check teacher status
1576 1576
             if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') {
1577 1577
 
@@ -1635,7 +1635,7 @@  discard block
 block discarded – undo
1635 1635
 
1636 1636
                 // the user is member of several groups => display personal announcements AND
1637 1637
                 // his group announcements AND the general announcements
1638
-                if (is_array($group_memberships) && count($group_memberships)>0) {
1638
+                if (is_array($group_memberships) && count($group_memberships) > 0) {
1639 1639
                     $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id
1640 1640
                     FROM $tbl_announcement announcement, $tbl_item_property ip
1641 1641
                     WHERE
@@ -1685,7 +1685,7 @@  discard block
 block discarded – undo
1685 1685
                         }
1686 1686
 
1687 1687
                         // the user is not identiefied => show only the general announcements
1688
-                        $sql="SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id
1688
+                        $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id
1689 1689
                                 FROM $tbl_announcement announcement, $tbl_item_property ip
1690 1690
                                 WHERE
1691 1691
                                     announcement.c_id = $course_id AND
Please login to merge, or discard this patch.
main/inc/lib/internationalization_database/name_order_conventions.php 2 patches
Indentation   +77 added lines, -77 removed lines patch added patch discarded remove patch
@@ -19,82 +19,82 @@
 block discarded – undo
19 19
  * last_name                   - sorting names with priority for the last name.
20 20
  */
21 21
 return array(
22
-	'afrikaans' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
23
-	'albanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
24
-	'alemannic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
25
-	'amharic' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
26
-	'armenian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
27
-	'arabic' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
28
-	'asturian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
29
-	'bosnian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
30
-	'brazilian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
31
-	'breton' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
32
-	'bulgarian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
33
-	'catalan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
34
-	'croatian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
35
-	'czech' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
36
-	'danish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
37
-	'dari' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
38
-	'dutch' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
39
-	'english' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
40
-	'esperanto' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
41
-	'estonian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
42
-	'basque'  =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
43
-	'finnish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
44
-	'french' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
45
-	'frisian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
46
-	'friulian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
22
+    'afrikaans' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
23
+    'albanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
24
+    'alemannic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
25
+    'amharic' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
26
+    'armenian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
27
+    'arabic' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
28
+    'asturian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
29
+    'bosnian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
30
+    'brazilian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
31
+    'breton' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
32
+    'bulgarian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
33
+    'catalan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
34
+    'croatian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
35
+    'czech' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
36
+    'danish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
37
+    'dari' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
38
+    'dutch' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
39
+    'english' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
40
+    'esperanto' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
41
+    'estonian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
42
+    'basque'  =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
43
+    'finnish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
44
+    'french' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
45
+    'frisian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
46
+    'friulian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
47 47
     'galician' =>         array('format' => 'title last_name first_name',  'sort_by' => 'last_name'),
48
-	'georgian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
49
-	'german' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
50
-	'greek' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
51
-	'hawaiian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
52
-	'hebrew' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
53
-	'hindi' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
54
-	'hungarian' =>        array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
55
-	'icelandic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
56
-	'indonesian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
57
-	'irish' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
58
-	'italian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
59
-	'japanese' =>         array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
60
-	'korean' =>           array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
61
-	'latin' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
62
-	'latvian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
63
-	'lithuanian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
64
-	'macedonian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
65
-	'malay' =>            array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
66
-	'manx' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
67
-	'marathi' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
68
-	'middle_frisian' =>   array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
69
-	'mingo' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
70
-	'nepali' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
71
-	'norwegian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
72
-	'occitan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
73
-	'pashto' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
74
-	'persian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
75
-	'polish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
76
-	'portuguese' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
77
-	'quechua_cusco' =>    array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
78
-	'romanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
79
-	'rumantsch' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
80
-	'russian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
81
-	'sanskrit' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
82
-	'serbian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
83
-	'serbian_cyrillic' => array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
84
-	'simpl_chinese' =>    array('format' => 'title last_name first_name',  'sort_by' => 'last_name' ), // Eastern order
85
-	'slovak' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
86
-	'slovenian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
87
-	'spanish' =>          array('format' => 'title last_name, first_name',  'sort_by' => 'last_name'), // Library order
88
-	'swahili' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
89
-	'swedish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
90
-	'tagalog' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
91
-	'tamil' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
92
-	'thai' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
93
-	'trad_chinese' =>     array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
94
-	'turkish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
95
-	'ukrainian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
96
-	'vietnamese' =>       array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
97
-	'welsh' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
98
-	'yiddish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
99
-	'yoruba' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name')
48
+    'georgian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
49
+    'german' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
50
+    'greek' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
51
+    'hawaiian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
52
+    'hebrew' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
53
+    'hindi' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
54
+    'hungarian' =>        array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
55
+    'icelandic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
56
+    'indonesian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
57
+    'irish' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
58
+    'italian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
59
+    'japanese' =>         array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
60
+    'korean' =>           array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
61
+    'latin' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
62
+    'latvian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
63
+    'lithuanian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
64
+    'macedonian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
65
+    'malay' =>            array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
66
+    'manx' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
67
+    'marathi' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
68
+    'middle_frisian' =>   array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
69
+    'mingo' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
70
+    'nepali' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
71
+    'norwegian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
72
+    'occitan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
73
+    'pashto' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
74
+    'persian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
75
+    'polish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
76
+    'portuguese' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
77
+    'quechua_cusco' =>    array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
78
+    'romanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
79
+    'rumantsch' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
80
+    'russian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
81
+    'sanskrit' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
82
+    'serbian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
83
+    'serbian_cyrillic' => array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
84
+    'simpl_chinese' =>    array('format' => 'title last_name first_name',  'sort_by' => 'last_name' ), // Eastern order
85
+    'slovak' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
86
+    'slovenian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
87
+    'spanish' =>          array('format' => 'title last_name, first_name',  'sort_by' => 'last_name'), // Library order
88
+    'swahili' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
89
+    'swedish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
90
+    'tagalog' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
91
+    'tamil' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
92
+    'thai' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
93
+    'trad_chinese' =>     array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
94
+    'turkish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
95
+    'ukrainian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
96
+    'vietnamese' =>       array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
97
+    'welsh' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
98
+    'yiddish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
99
+    'yoruba' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name')
100 100
 );
Please login to merge, or discard this patch.
Spacing   +78 added lines, -78 removed lines patch added patch discarded remove patch
@@ -19,82 +19,82 @@
 block discarded – undo
19 19
  * last_name                   - sorting names with priority for the last name.
20 20
  */
21 21
 return array(
22
-	'afrikaans' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
23
-	'albanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
24
-	'alemannic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
25
-	'amharic' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
26
-	'armenian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
27
-	'arabic' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
28
-	'asturian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
29
-	'bosnian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
30
-	'brazilian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
31
-	'breton' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
32
-	'bulgarian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
33
-	'catalan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
34
-	'croatian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
35
-	'czech' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
36
-	'danish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
37
-	'dari' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
38
-	'dutch' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
39
-	'english' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
40
-	'esperanto' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
41
-	'estonian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
42
-	'basque'  =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
43
-	'finnish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
44
-	'french' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
45
-	'frisian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
46
-	'friulian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
47
-    'galician' =>         array('format' => 'title last_name first_name',  'sort_by' => 'last_name'),
48
-	'georgian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
49
-	'german' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
50
-	'greek' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
51
-	'hawaiian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
52
-	'hebrew' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
53
-	'hindi' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
54
-	'hungarian' =>        array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
55
-	'icelandic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
56
-	'indonesian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
57
-	'irish' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
58
-	'italian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
59
-	'japanese' =>         array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
60
-	'korean' =>           array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
61
-	'latin' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
62
-	'latvian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
63
-	'lithuanian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
64
-	'macedonian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
65
-	'malay' =>            array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
66
-	'manx' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
67
-	'marathi' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
68
-	'middle_frisian' =>   array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
69
-	'mingo' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
70
-	'nepali' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
71
-	'norwegian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
72
-	'occitan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
73
-	'pashto' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
74
-	'persian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
75
-	'polish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
76
-	'portuguese' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
77
-	'quechua_cusco' =>    array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
78
-	'romanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
79
-	'rumantsch' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
80
-	'russian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
81
-	'sanskrit' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
82
-	'serbian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
83
-	'serbian_cyrillic' => array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
84
-	'simpl_chinese' =>    array('format' => 'title last_name first_name',  'sort_by' => 'last_name' ), // Eastern order
85
-	'slovak' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
86
-	'slovenian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
87
-	'spanish' =>          array('format' => 'title last_name, first_name',  'sort_by' => 'last_name'), // Library order
88
-	'swahili' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
89
-	'swedish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
90
-	'tagalog' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
91
-	'tamil' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
92
-	'thai' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
93
-	'trad_chinese' =>     array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
94
-	'turkish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
95
-	'ukrainian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
96
-	'vietnamese' =>       array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
97
-	'welsh' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
98
-	'yiddish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
99
-	'yoruba' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name')
22
+	'afrikaans' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
23
+	'albanian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
24
+	'alemannic' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
25
+	'amharic' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
26
+	'armenian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
27
+	'arabic' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
28
+	'asturian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
29
+	'bosnian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
30
+	'brazilian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
31
+	'breton' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
32
+	'bulgarian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
33
+	'catalan' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
34
+	'croatian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
35
+	'czech' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
36
+	'danish' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
37
+	'dari' =>             array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
38
+	'dutch' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
39
+	'english' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
40
+	'esperanto' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
41
+	'estonian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
42
+	'basque'  =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
43
+	'finnish' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
44
+	'french' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
45
+	'frisian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
46
+	'friulian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
47
+    'galician' =>         array('format' => 'title last_name first_name', 'sort_by' => 'last_name'),
48
+	'georgian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
49
+	'german' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
50
+	'greek' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
51
+	'hawaiian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
52
+	'hebrew' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
53
+	'hindi' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
54
+	'hungarian' =>        array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
55
+	'icelandic' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
56
+	'indonesian' =>       array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
57
+	'irish' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
58
+	'italian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
59
+	'japanese' =>         array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
60
+	'korean' =>           array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
61
+	'latin' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
62
+	'latvian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
63
+	'lithuanian' =>       array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
64
+	'macedonian' =>       array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
65
+	'malay' =>            array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
66
+	'manx' =>             array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
67
+	'marathi' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
68
+	'middle_frisian' =>   array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
69
+	'mingo' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
70
+	'nepali' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
71
+	'norwegian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
72
+	'occitan' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
73
+	'pashto' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
74
+	'persian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
75
+	'polish' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
76
+	'portuguese' =>       array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
77
+	'quechua_cusco' =>    array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
78
+	'romanian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
79
+	'rumantsch' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
80
+	'russian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
81
+	'sanskrit' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
82
+	'serbian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
83
+	'serbian_cyrillic' => array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
84
+	'simpl_chinese' =>    array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
85
+	'slovak' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
86
+	'slovenian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
87
+	'spanish' =>          array('format' => 'title last_name, first_name', 'sort_by' => 'last_name'), // Library order
88
+	'swahili' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
89
+	'swedish' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
90
+	'tagalog' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
91
+	'tamil' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
92
+	'thai' =>             array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
93
+	'trad_chinese' =>     array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
94
+	'turkish' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
95
+	'ukrainian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
96
+	'vietnamese' =>       array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
97
+	'welsh' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
98
+	'yiddish' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
99
+	'yoruba' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name')
100 100
 );
Please login to merge, or discard this patch.
main/inc/lib/internationalization_database/transliteration/x70.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 // $Id: x70.php,v 1.1.8.1 2008/06/12 20:34:31 smk Exp $
3 3
 
4 4
 return array(
5
-  'en' => array('You ', 'Yang ', 'Lu ', 'Si ', 'Jie ', 'Ying ', 'Du ', 'Wang ', 'Hui ', 'Xie ', 'Pan ', 'Shen ', 'Biao ', 'Chan ', 'Mo ', 'Liu ',
5
+    'en' => array('You ', 'Yang ', 'Lu ', 'Si ', 'Jie ', 'Ying ', 'Du ', 'Wang ', 'Hui ', 'Xie ', 'Pan ', 'Shen ', 'Biao ', 'Chan ', 'Mo ', 'Liu ',
6 6
     'Jian ', 'Pu ', 'Se ', 'Cheng ', 'Gu ', 'Bin ', 'Huo ', 'Xian ', 'Lu ', 'Qin ', 'Han ', 'Ying ', 'Yong ', 'Li ', 'Jing ', 'Xiao ',
7 7
     'Ying ', 'Sui ', 'Wei ', 'Xie ', 'Huai ', 'Hao ', 'Zhu ', 'Long ', 'Lai ', 'Dui ', 'Fan ', 'Hu ', 'Lai ', NULL, NULL, 'Ying ',
8 8
     'Mi ', 'Ji ', 'Lian ', 'Jian ', 'Ying ', 'Fen ', 'Lin ', 'Yi ', 'Jian ', 'Yue ', 'Chan ', 'Dai ', 'Rang ', 'Jian ', 'Lan ', 'Fan ',
Please login to merge, or discard this patch.
main/inc/lib/internationalization_database/transliteration/xce.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 // $Id: xce.php,v 1.1.8.1 2008/06/12 20:34:32 smk Exp $
3 3
 
4 4
 return array(
5
-  'en' => array('cwik', 'cwit', 'cwip', 'cwih', 'cyu', 'cyug', 'cyugg', 'cyugs', 'cyun', 'cyunj', 'cyunh', 'cyud', 'cyul', 'cyulg', 'cyulm', 'cyulb',
5
+    'en' => array('cwik', 'cwit', 'cwip', 'cwih', 'cyu', 'cyug', 'cyugg', 'cyugs', 'cyun', 'cyunj', 'cyunh', 'cyud', 'cyul', 'cyulg', 'cyulm', 'cyulb',
6 6
     'cyuls', 'cyult', 'cyulp', 'cyulh', 'cyum', 'cyub', 'cyubs', 'cyus', 'cyuss', 'cyung', 'cyuj', 'cyuc', 'cyuk', 'cyut', 'cyup', 'cyuh',
7 7
     'ceu', 'ceug', 'ceugg', 'ceugs', 'ceun', 'ceunj', 'ceunh', 'ceud', 'ceul', 'ceulg', 'ceulm', 'ceulb', 'ceuls', 'ceult', 'ceulp', 'ceulh',
8 8
     'ceum', 'ceub', 'ceubs', 'ceus', 'ceuss', 'ceung', 'ceuj', 'ceuc', 'ceuk', 'ceut', 'ceup', 'ceuh', 'cyi', 'cyig', 'cyigg', 'cyigs',
Please login to merge, or discard this patch.
main/inc/lib/internationalization_database/transliteration/x13.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 // $Id: x13.php,v 1.1.8.1 2008/06/12 20:34:31 smk Exp $
3 3
 
4 4
 return array(
5
-  'en' => array('ja', 'ju', 'ji', 'jaa', 'jee', 'je', 'jo', 'jwa', 'ga', 'gu', 'gi', 'gaa', 'gee', 'ge', 'go', NULL,
5
+    'en' => array('ja', 'ju', 'ji', 'jaa', 'jee', 'je', 'jo', 'jwa', 'ga', 'gu', 'gi', 'gaa', 'gee', 'ge', 'go', NULL,
6 6
     'gwa', NULL, 'gwi', 'gwaa', 'gwee', 'gwe', NULL, NULL, 'gga', 'ggu', 'ggi', 'ggaa', 'ggee', 'gge', 'ggo', NULL,
7 7
     'tha', 'thu', 'thi', 'thaa', 'thee', 'the', 'tho', 'thwa', 'cha', 'chu', 'chi', 'chaa', 'chee', 'che', 'cho', 'chwa',
8 8
     'pha', 'phu', 'phi', 'phaa', 'phee', 'phe', 'pho', 'phwa', 'tsa', 'tsu', 'tsi', 'tsaa', 'tsee', 'tse', 'tso', 'tswa',
Please login to merge, or discard this patch.
main/inc/lib/internationalization_database/transliteration/xb0.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 // $Id: xb0.php,v 1.1.8.1 2008/06/12 20:34:32 smk Exp $
3 3
 
4 4
 return array(
5
-  'en' => array('ggwem', 'ggweb', 'ggwebs', 'ggwes', 'ggwess', 'ggweng', 'ggwej', 'ggwec', 'ggwek', 'ggwet', 'ggwep', 'ggweh', 'ggwi', 'ggwig', 'ggwigg', 'ggwigs',
5
+    'en' => array('ggwem', 'ggweb', 'ggwebs', 'ggwes', 'ggwess', 'ggweng', 'ggwej', 'ggwec', 'ggwek', 'ggwet', 'ggwep', 'ggweh', 'ggwi', 'ggwig', 'ggwigg', 'ggwigs',
6 6
     'ggwin', 'ggwinj', 'ggwinh', 'ggwid', 'ggwil', 'ggwilg', 'ggwilm', 'ggwilb', 'ggwils', 'ggwilt', 'ggwilp', 'ggwilh', 'ggwim', 'ggwib', 'ggwibs', 'ggwis',
7 7
     'ggwiss', 'ggwing', 'ggwij', 'ggwic', 'ggwik', 'ggwit', 'ggwip', 'ggwih', 'ggyu', 'ggyug', 'ggyugg', 'ggyugs', 'ggyun', 'ggyunj', 'ggyunh', 'ggyud',
8 8
     'ggyul', 'ggyulg', 'ggyulm', 'ggyulb', 'ggyuls', 'ggyult', 'ggyulp', 'ggyulh', 'ggyum', 'ggyub', 'ggyubs', 'ggyus', 'ggyuss', 'ggyung', 'ggyuj', 'ggyuc',
Please login to merge, or discard this patch.
main/inc/lib/internationalization_database/transliteration/x93.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 // $Id: x93.php,v 1.1.8.1 2008/06/12 20:34:31 smk Exp $
3 3
 
4 4
 return array(
5
-  'en' => array('Lun ', 'Kua ', 'Ling ', 'Bei ', 'Lu ', 'Li ', 'Qiang ', 'Pou ', 'Juan ', 'Min ', 'Zui ', 'Peng ', 'An ', 'Pi ', 'Xian ', 'Ya ',
5
+    'en' => array('Lun ', 'Kua ', 'Ling ', 'Bei ', 'Lu ', 'Li ', 'Qiang ', 'Pou ', 'Juan ', 'Min ', 'Zui ', 'Peng ', 'An ', 'Pi ', 'Xian ', 'Ya ',
6 6
     'Zhui ', 'Lei ', 'A ', 'Kong ', 'Ta ', 'Kun ', 'Du ', 'Wei ', 'Chui ', 'Zi ', 'Zheng ', 'Ben ', 'Nie ', 'Cong ', 'Qun ', 'Tan ',
7 7
     'Ding ', 'Qi ', 'Qian ', 'Zhuo ', 'Qi ', 'Yu ', 'Jin ', 'Guan ', 'Mao ', 'Chang ', 'Tian ', 'Xi ', 'Lian ', 'Tao ', 'Gu ', 'Cuo ',
8 8
     'Shu ', 'Zhen ', 'Lu ', 'Meng ', 'Lu ', 'Hua ', 'Biao ', 'Ga ', 'Lai ', 'Ken ', 'Kazari ', 'Bu ', 'Nai ', 'Wan ', 'Zan ', NULL,
Please login to merge, or discard this patch.