chamilo / chamilo-lms

main/inc/lib/events_dispatcher.class.php

Braces +3 added lines, -1 removed lines

@@ -18,9 +18,11 @@
 
         foreach ($event_config[$event_name]["actions"] as $func) {
             $execute = true;
-            if (!function_exists($func)) // if the function doesn't exist, we log
+            if (!function_exists($func)) {
+                // if the function doesn't exist, we log
             {
                 error_log("EventsDispatcher warning : ".$func." does not exist.");
+            }
                 $execute = false;
             }
 

Doc Comments +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
     }
 
     /**
-     * @return bool
+     * @return false|null
      */
     public function create_user_folder()
     {

main/inc/lib/internationalization.lib.php

Braces +1 added lines, -2 removed lines

@@ -1710,8 +1710,7 @@
             }
         }
         return false;
-    }
-    elseif (is_array($encoding2)) {
+    } elseif (is_array($encoding2)) {
         foreach ($encoding2 as $encoding) {
             if (api_equal_encodings($encoding1, $encoding, $strict)) {
                 return true;

Indentation +6 added lines, -7 removed lines

@@ -99,7 +99,7 @@ 
     }
 
     if (!isset($used_lang_vars)) {
-    	$used_lang_vars = array();
+        $used_lang_vars = array();
     }
 
     // Caching results from some API functions, for speed.
@@ -288,7 +288,7 @@ 
     static $text_direction = array();
 
     if (empty($language)) {
-    	$language = api_get_interface_language();
+        $language = api_get_interface_language();
     }
     if (!isset($text_direction[$language])) {
         $text_direction[$language] = in_array(api_purify_language_id($language),
@@ -1703,7 +1703,6 @@ 
 
 /**
  * Return true a date is valid
-
  * @param string $date example: 2014-06-30 13:05:05
  * @param string $format example: "Y-m-d H:i:s"
  *
@@ -1973,15 +1972,15 @@ 
 {
     if ($showTime) {
         if ($humanForm) {
-           return $date->format('j M Y H:i:s');
+            return $date->format('j M Y H:i:s');
         } else {
-           return $date->format('Y-m-d H:i:s');
+            return $date->format('Y-m-d H:i:s');
         }
     } else {
         if ($humanForm) {
-           return $date->format('j M Y');
+            return $date->format('j M Y');
         } else {
-           return $date->format('Y-m-d');
+            return $date->format('Y-m-d');
         }
     }
 }

Spacing +5 added lines, -5 removed lines

@@ -633,10 +633,10 @@ 
         $date_format = str_replace(
             array('%A', '%a', '%B', '%b'),
             array(
-                $translated['days_long'][(int)strftime('%w', $time)],
-                $translated['days_short'][(int)strftime('%w', $time)],
-                $translated['months_long'][(int)strftime('%m', $time) - 1],
-                $translated['months_short'][(int)strftime('%m', $time) - 1],
+                $translated['days_long'][(int) strftime('%w', $time)],
+                $translated['days_short'][(int) strftime('%w', $time)],
+                $translated['months_long'][(int) strftime('%m', $time) - 1],
+                $translated['months_short'][(int) strftime('%m', $time) - 1],
             ),
             $date_format
         );
@@ -1583,7 +1583,7 @@ 
  * @return string					Returns the encoding identificator modified in suitable for comparison way.
  */
 function api_refine_encoding_id($encoding) {
-    if (is_array($encoding)){
+    if (is_array($encoding)) {
         return array_map('api_refine_encoding_id', $encoding);
     }
     return strtoupper(str_replace('_', '-', $encoding));

Doc Comments +19 added lines, -12 removed lines

@@ -419,6 +419,7 @@ 
  * If null, the timezone will be determined based on user preference,
  * or timezone chosen by the admin for the platform.
  * @param string The timezone to be converted from. If null, UTC will be assumed.
+ * @param string $to_timezone
  * @return string The converted time formatted as Y-m-d H:i:s
  *
  * @author Guillaume Viguier <guillaume.viguier@beeznest.com>
@@ -683,6 +684,8 @@ 
  * @param mixed The time to be converted
  * @param mixed Format to be used (TIME_NO_SEC_FORMAT, DATE_FORMAT_SHORT, DATE_FORMAT_LONG, DATE_TIME_FORMAT_LONG)
  * @param string Timezone to be converted from. If null, UTC will be assumed.
+ * @param integer $format
+ * @param string $from_timezone
  * @return string Converted and localized date
  *
  * @author Guillaume Viguier <guillaume.viguier@beeznest.com>
@@ -752,7 +755,7 @@ 
  * @param int|string $format (optional)	The person name format. It may be a pattern-string (for example '%t %l, %f' or '%T %F %L', ...) or some of the constants PERSON_NAME_COMMON_CONVENTION (default), PERSON_NAME_WESTERN_ORDER, PERSON_NAME_EASTERN_ORDER, PERSON_NAME_LIBRARY_ORDER.
  * @param string $language (optional)	The language id. If it is omitted, the current interface language is assumed. This parameter has meaning with the format PERSON_NAME_COMMON_CONVENTION only.
  * @param string $encoding (optional)	The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
- * @return bool							The result is sort of full name of the person.
+ * @return string							The result is sort of full name of the person.
  * Sample results:
  * Peter Ustinoff or Dr. Peter Ustinoff     - the Western order
  * Ustinoff Peter or Dr. Ustinoff Peter     - the Eastern order
@@ -1071,8 +1074,8 @@ 
 
 /**
  * This function returns a string or an array with all occurrences of search in subject (ignoring case) replaced with the given replace value.
- * @param mixed $search					String or array of strings to be found.
- * @param mixed $replace				String or array of strings used for replacement.
+ * @param string $search					String or array of strings to be found.
+ * @param string $replace				String or array of strings used for replacement.
  * @param mixed $subject				String or array of strings being searched.
  * @param int $count (optional)			The number of matched and replaced needles will be returned in count, which is passed by reference.
  * @param string $encoding (optional)	The used internally by this function character encoding.
@@ -1135,10 +1138,10 @@ 
 /**
  * Finds first occurrence of a string within another, case insensitive.
  * @param string $haystack					The string from which to get the first occurrence.
- * @param mixed $needle						The string to be found.
+ * @param string $needle						The string to be found.
  * @param bool $before_needle (optional)	Determines which portion of $haystack this function returns. The default value is FALSE.
  * @param string $encoding (optional)		The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
- * @return mixed							Returns the portion of $haystack, or FALSE if $needle is not found.
+ * @return false|string							Returns the portion of $haystack, or FALSE if $needle is not found.
  * Notes:
  * If $needle is not a string, it is converted to an integer and applied as the ordinal value (codepoint if the encoding is UTF-8) of a character.
  * If $before_needle is set to TRUE, the function returns all of $haystack from the beginning to the first occurrence of $needle.
@@ -1194,7 +1197,7 @@ 
  * @param mixed $needle						The string which first character is to be found.
  * @param bool $before_needle (optional)	Determines which portion of $haystack this function returns. The default value is FALSE.
  * @param string $encoding (optional)		The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
- * @return mixed							Returns the portion of $haystack, or FALSE if the first character from $needle is not found.
+ * @return false|string							Returns the portion of $haystack, or FALSE if the first character from $needle is not found.
  * Notes:
  * If $needle is not a string, it is converted to an integer and applied as the ordinal value (codepoint if the encoding is UTF-8) of a character.
  * If $before_needle is set to TRUE, the function returns all of $haystack from the beginning to the first occurrence.
@@ -1261,7 +1264,7 @@ 
  * @param mixed $needle						The string to be found.
  * @param bool $before_needle (optional)	Determines which portion of $haystack this function returns. The default value is FALSE.
  * @param string $encoding (optional)		The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
- * @return mixed							Returns the portion of $haystack, or FALSE if $needle is not found.
+ * @return false|string							Returns the portion of $haystack, or FALSE if $needle is not found.
  * Notes:
  * If $needle is not a string, it is converted to an integer and applied as the ordinal value (codepoint if the encoding is UTF-8) of a character.
  * If $before_needle is set to TRUE, the function returns all of $haystack from the beginning to the first occurrence of $needle.
@@ -1442,8 +1445,8 @@ 
 
 /**
  * Performs a regular expression search and replace, UTF-8 aware when it is applicable.
- * @param string|array $pattern			The pattern to search for. It can be either a string or an array with strings.
- * @param string|array $replacement		The string or an array with strings to replace.
+ * @param string $pattern			The pattern to search for. It can be either a string or an array with strings.
+ * @param string $replacement		The string or an array with strings to replace.
  * @param string|array $subject			The string or an array with strings to search and replace.
  * @param int $limit					The maximum possible replacements for each pattern in each subject string. Defaults to -1 (no limit).
  * @param int &$count					If specified, this variable will be filled with the number of replacements done.
@@ -1591,7 +1594,7 @@ 
 
 /**
  * This function checks whether two $encoding are equal (same, equvalent).
- * @param string|array $encoding1		The first encoding
+ * @param string $encoding1		The first encoding
  * @param string|array $encoding2		The second encoding
  * @param bool $strict					When this parameter is TRUE the comparison ignores aliases of encodings.
  * When the parameter is FALSE, aliases are taken into account.
@@ -1695,6 +1698,7 @@ 
 /**
  * Checks a string for UTF-8 validity.
  *
+ * @param string $string
  */
 function api_is_valid_utf8(&$string)
 {
@@ -1837,7 +1841,7 @@ 
 /**
  * Replaces non-valid formats for person names with the default (English) format.
  * @param string $format	The input format to be verified.
- * @return bool				Returns the same format if is is valid, otherwise returns a valid English format.
+ * @return string				Returns the same format if is is valid, otherwise returns a valid English format.
  */
 function _api_validate_person_name_format($format) {
     if (empty($format) || stripos($format, '%f') === false || stripos($format, '%l') === false) {
@@ -1964,6 +1968,9 @@ 
 
 // This function checks whether the function _api_convert_encoding() (the php-
 // implementation) is able to convert from/to a given encoding.
+/**
+ * @param string $encoding
+ */
 function _api_convert_encoding_supports($encoding) {
     static $supports = array();
     if (!isset($supports[$encoding])) {
@@ -1974,7 +1981,7 @@ 
 
 /**
  * Given a date object, return a human or ISO format, with or without h:m:s
- * @param object $date The Date object
+ * @param DateTime $date The Date object
  * @param bool $showTime Whether to show the time and date (true) or only the date (false)
  * @param bool $humanForm Whether to show day-month-year (true) or year-month-day (false)
  * @return string Formatted date

main/inc/lib/course_request.lib.php

Spacing +14 added lines, -14 removed lines

@@ -65,8 +65,8 @@ 
         $exemplary_content
     ) {
         $wanted_code = trim($wanted_code);
-        $user_id = (int)$user_id;
-        $exemplary_content = (bool)$exemplary_content ? 1 : 0;
+        $user_id = (int) $user_id;
+        $exemplary_content = (bool) $exemplary_content ? 1 : 0;
 
         if ($wanted_code == '') {
             return false;
@@ -254,10 +254,10 @@ 
         $user_id,
         $exemplary_content
     ) {
-        $id = (int)$id;
+        $id = (int) $id;
         $wanted_code = trim($wanted_code);
-        $user_id = (int)$user_id;
-        $exemplary_content = (bool)$exemplary_content ? 1 : 0;
+        $user_id = (int) $user_id;
+        $exemplary_content = (bool) $exemplary_content ? 1 : 0;
 
         if ($wanted_code == '') {
             return false;
@@ -360,7 +360,7 @@ 
      */
     public static function delete_course_request($id)
     {
-        $id = (int)$id;
+        $id = (int) $id;
         $sql = "DELETE FROM ".Database :: get_main_table(TABLE_MAIN_COURSE_REQUEST)."
                 WHERE id = ".$id;
         $result = Database::query($sql);
@@ -377,7 +377,7 @@ 
         if (is_null($status)) {
             $sql = "SELECT COUNT(id) AS number FROM ".$course_table;
         } else {
-            $status = (int)$status;
+            $status = (int) $status;
             $sql = "SELECT COUNT(id) AS number FROM ".$course_table."
                     WHERE status = ".$status;
         }
@@ -395,7 +395,7 @@ 
      */
     public static function get_course_request_info($id)
     {
-        $id = (int)$id;
+        $id = (int) $id;
         $sql = "SELECT *
                 FROM ".Database :: get_main_table(TABLE_MAIN_COURSE_REQUEST)."
                 WHERE id = ".$id;
@@ -413,7 +413,7 @@ 
      */
     public static function get_course_request_code($id)
     {
-        $id = (int)$id;
+        $id = (int) $id;
         $sql = "SELECT code
                 FROM ".Database :: get_main_table(TABLE_MAIN_COURSE_REQUEST)."
                 WHERE id = ".$id;
@@ -434,7 +434,7 @@ 
      */
     public static function accept_course_request($id)
     {
-        $id = (int)$id;
+        $id = (int) $id;
 
         // Retrieve request's data
         $course_request_info = self::get_course_request_info($id);
@@ -447,7 +447,7 @@ 
             return false;
         }*/
 
-        $user_id = (int)$course_request_info['user_id'];
+        $user_id = (int) $course_request_info['user_id'];
         if ($user_id <= 0) {
             return false;
         }
@@ -531,7 +531,7 @@ 
      */
     public static function reject_course_request($id)
     {
-        $id = (int)$id;
+        $id = (int) $id;
         // Retrieve request's data
         $course_request_info = self::get_course_request_info($id);
         if (!is_array($course_request_info)) {
@@ -609,7 +609,7 @@ 
      */
     public static function ask_for_additional_info($id)
     {
-        $id = (int)$id;
+        $id = (int) $id;
 
         // Retrieve request's data
         $course_request_info = self::get_course_request_info($id);
@@ -700,7 +700,7 @@ 
      */
     public static function additional_info_asked($id)
     {
-        $id = (int)$id;
+        $id = (int) $id;
         $sql = "SELECT id FROM ".Database :: get_main_table(TABLE_MAIN_COURSE_REQUEST)."
                 WHERE (id = ".$id." AND info > 0)";
         $result = Database::num_rows(Database::query($sql));

Doc Comments +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
      * @param string $objetives
      * @param string $target_audience
      * @param int $user_id
-     * @return mixed The database id of the newly created course request or FALSE on failure.
+     * @return false|string The database id of the newly created course request or FALSE on failure.
      */
     public static function create_course_request(
         $wanted_code,

main/inc/lib/access_url_edit_sessions_to_url_functions.lib.php

Spacing +3 added lines, -3 removed lines

@@ -44,17 +44,17 @@
                     ORDER BY name, id
                     LIMIT 11';
             $rs = Database::query($sql);
-            $i=0;
+            $i = 0;
             while ($session = Database :: fetch_array($rs)) {
                 $i++;
-                if ($i<=10) {
+                if ($i <= 10) {
                      $return .= '<a href="#" onclick="add_user_to_url(\''.addslashes($session['id']).'\',\''.addslashes($session['name']).' ('.addslashes($session['id']).')'.'\')">'.$session['name'].' </a><br />';
                 } else {
                     $return .= '...<br />';
                 }
             }
         }
-        $xajax_response -> addAssign('ajax_list_courses','innerHTML',api_utf8_encode($return));
+        $xajax_response -> addAssign('ajax_list_courses', 'innerHTML', api_utf8_encode($return));
         return $xajax_response;
     }
 }

Indentation +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
             while ($session = Database :: fetch_array($rs)) {
                 $i++;
                 if ($i<=10) {
-                     $return .= '<a href="#" onclick="add_user_to_url(\''.addslashes($session['id']).'\',\''.addslashes($session['name']).' ('.addslashes($session['id']).')'.'\')">'.$session['name'].' </a><br />';
+                        $return .= '<a href="#" onclick="add_user_to_url(\''.addslashes($session['id']).'\',\''.addslashes($session['name']).' ('.addslashes($session['id']).')'.'\')">'.$session['name'].' </a><br />';
                 } else {
                     $return .= '...<br />';
                 }

main/inc/lib/mp3player/is_autostart.as.php

Indentation +7 added lines, -7 removed lines

@@ -12,13 +12,13 @@
 switch ($_SESSION['whereami']) {
 
 
-	case 'lp/build' :
-	case 'document/create' :
-	case 'document/edit' :
-		$autostart = 'false';
-	break;
-	default :
-		$autostart = 'true';
+    case 'lp/build' :
+    case 'document/create' :
+    case 'document/edit' :
+        $autostart = 'false';
+    break;
+    default :
+        $autostart = 'true';
 
 }
 echo utf8_encode('autostart='.$autostart);

main/inc/lib/AnnouncementManager.php

Indentation +1 added lines, -1 removed lines

@@ -1510,7 +1510,7 @@
                             ip.to_user_id=$user_id OR (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".implode(", ", $group_memberships)."))
                         ) ";
                     } else {
-                       $cond_user_id = " AND (
+                        $cond_user_id = " AND (
                             ip.to_user_id=$user_id OR (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".api_get_group_id()."))
                         )";
                     }

Doc Comments +10 added lines, -6 removed lines

@@ -18,7 +18,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function get_tags()
     {
@@ -40,7 +40,7 @@ 
      * @param string    $course_code
      * @param int       $session_id
      *
-     * @return mixed
+     * @return string
      */
     public static function parse_content($userId, $content, $course_code, $session_id = 0)
     {
@@ -183,7 +183,7 @@ 
      * @param int $courseId
      * @param int $userId
      *
-     * @return array
+     * @return integer
      */
     public static function getAnnouncementInfoById($announcementId, $courseId, $userId)
     {
@@ -384,7 +384,7 @@ 
      * @param array	    uploaded file $_FILES
      * @param string    Comment describing the attachment
      * @param bool  $sendToUsersInSession
-     * @return int      false on failure, ID of the announcement on success
+     * @return false|string      false on failure, ID of the announcement on success
      */
     public static function add_announcement(
         $emailTitle,
@@ -495,7 +495,7 @@ 
      * @param string $file_comment
      * @param bool $sendToUsersInSession
      *
-     * @return bool|int
+     * @return false|string
      */
     public static function add_group_announcement(
         $emailTitle,
@@ -739,7 +739,7 @@ 
 
     /**
      * @param int $insert_id
-     * @return bool
+     * @return false|null
      */
     public static function update_mail_sent($insert_id)
     {
@@ -759,6 +759,7 @@ 
      * Gets all announcements from a user by course
      * @param	string course db
      * @param	int user id
+     * @param integer $user_id
      * @return	array html with the content and count of announcements or false otherwise
      */
     public static function get_all_annoucement_by_user_course($course_code, $user_id)
@@ -1224,6 +1225,7 @@ 
      * has been sent to
      * @param    string  The tool (announcement, agenda, ...)
      * @param    int     ID of the element of the corresponding type
+     * @param string $tool
      * @return   array   Array of users and groups to whom the element has been sent
      */
     public static function sent_to($tool, $id)
@@ -1348,6 +1350,8 @@ 
      * @param int attach id
      * @param array uploaded file $_FILES
      * @param string file comment
+     * @param integer $id_attach
+     * @param string $file_comment
      * @return int
      */
     public static function edit_announcement_attachment_file($id_attach, $file, $file_comment)

Spacing +52 added lines, -52 removed lines

@@ -217,7 +217,7 @@ 
                         IP.tool='announcement' AND
                         (
                             IP.toUser = $userId OR
-                            IP.group IN ('0', '" . implode("', '", $group_list) . "') OR
+                            IP.group IN ('0', '".implode("', '", $group_list)."') OR
                             IP.group IS NULL
                         ) AND
                         IP.visibility = '1' AND
@@ -282,13 +282,13 @@ 
         $content = $announcement->getContent();
 
         $html .= "<table height=\"100\" width=\"100%\" cellpadding=\"5\" cellspacing=\"0\" class=\"data_table\">";
-        $html .= "<tr><td><h2>" . $title . "</h2></td></tr>";
+        $html .= "<tr><td><h2>".$title."</h2></td></tr>";
 
         if (api_is_allowed_to_edit(false, true) ||
             (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())
         ) {
-            $modify_icons = "<a href=\"" . api_get_self() . "?" . api_get_cidreq() . "&action=modify&id=" . $announcement_id . "\">" .
-                Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL) . "</a>";
+            $modify_icons = "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=modify&id=".$announcement_id."\">".
+                Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL)."</a>";
             if ($itemProperty->getVisibility() === 1) {
                 $image_visibility = "visible";
                 $alt_visibility = get_lang('Hide');
@@ -298,12 +298,12 @@ 
             }
             global $stok;
 
-            $modify_icons .= "<a href=\"" . api_get_self() . "?" . api_get_cidreq() . "&action=showhide&id=" . $announcement_id . "&sec_token=" . $stok . "\">" .
-                Display::return_icon($image_visibility . '.png', $alt_visibility, '', ICON_SIZE_SMALL) . "</a>";
+            $modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=showhide&id=".$announcement_id."&sec_token=".$stok."\">".
+                Display::return_icon($image_visibility.'.png', $alt_visibility, '', ICON_SIZE_SMALL)."</a>";
 
             if (api_is_allowed_to_edit(false, true)) {
-                $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;\">" .
-                    Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL) .
+                $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;\">".
+                    Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).
                     "</a>";
             }
             $html .= "<tr><th style='text-align:right'>$modify_icons</th></tr>";
@@ -320,9 +320,9 @@ 
         );
 
         $html .= "<tr><td>$content</td></tr>";
-        $html .= "<tr><td class=\"announcements_datum\">" . get_lang('LastUpdateDate') . " : " . api_convert_and_format_date(
+        $html .= "<tr><td class=\"announcements_datum\">".get_lang('LastUpdateDate')." : ".api_convert_and_format_date(
             $itemProperty->getInsertDate(), DATE_TIME_FORMAT_LONG
-        ) . "</td></tr>";
+        )."</td></tr>";
 
         if ($itemProperty->getGroup() !== null) {
             $sent_to_icon = Display::return_icon('group.gif', get_lang('AnnounceSentToUserSelection'));
@@ -332,7 +332,7 @@ 
             $sent_to_form = self::sent_to_form($sent_to);
             $html .= Display::tag(
                 'td',
-                get_lang('SentTo') . ' : ' . $sent_to_form,
+                get_lang('SentTo').' : '.$sent_to_form,
                 array('class' => 'announcements_datum')
             );
         }
@@ -342,15 +342,15 @@ 
             $html .= "<tr><td>";
             $realname = $attachment_list['path'];
             $user_filename = $attachment_list['filename'];
-            $full_file_name = 'download.php?'.api_get_cidreq().'&file=' . $realname;
+            $full_file_name = 'download.php?'.api_get_cidreq().'&file='.$realname;
             $html .= '<br/>';
             $html .= Display::return_icon('attachment.gif', get_lang('Attachment'));
-            $html .= '<a href="' . $full_file_name . ' "> ' . $user_filename . ' </a>';
-            $html .= ' - <span class="forum_attach_comment" >' . $attachment_list['comment'] . '</span>';
+            $html .= '<a href="'.$full_file_name.' "> '.$user_filename.' </a>';
+            $html .= ' - <span class="forum_attach_comment" >'.$attachment_list['comment'].'</span>';
             if (api_is_allowed_to_edit(false, true)) {
                 $html .= Display::url(
                     Display::return_icon('delete.png', get_lang('Delete'), '', 16),
-                    api_get_self() . "?" . api_get_cidreq() . "&action=delete_attachment&id_attach=" . $attachment_list['id'] . "&sec_token=" . $stok
+                    api_get_self()."?".api_get_cidreq()."&action=delete_attachment&id_attach=".$attachment_list['id']."&sec_token=".$stok
                 );
             }
             $html .= '</td></tr>';
@@ -375,7 +375,7 @@ 
         $order = 0;
         if (Database::num_rows($res_max)) {
             $row_max = Database::fetch_array($res_max);
-            $order = intval($row_max[0])+1;
+            $order = intval($row_max[0]) + 1;
         }
 
         return $order;
@@ -798,8 +798,8 @@ 
             $result = array();
             if ($num_rows > 0) {
                 while ($myrow = Database::fetch_array($rs)) {
-                    $content.= '<strong>' . $myrow['title'] . '</strong><br /><br />';
-                    $content.= $myrow['content'];
+                    $content .= '<strong>'.$myrow['title'].'</strong><br /><br />';
+                    $content .= $myrow['content'];
                     $i++;
                 }
                 $result['content'] = $content;
@@ -917,14 +917,14 @@ 
             switch ($to_group) {
                 // it was send to one specific user
                 case null:
-                    $to[] = "USER:" . $row['to_user_id'];
+                    $to[] = "USER:".$row['to_user_id'];
                     break;
                 // it was sent to everyone
                 case 0:
                     return "everyone";
                     break;
                 default:
-                    $to[] = "GROUP:" . $row['to_group_id'];
+                    $to[] = "GROUP:".$row['to_group_id'];
             }
         }
         return $to;
@@ -987,10 +987,10 @@ 
                 $sent_to_array['groups'][0] !== 0
             ) {
                 $group_id = $sent_to_array['groups'][0];
-                $output[] = "&nbsp;" . $group_names[$group_id]['name'];
+                $output[] = "&nbsp;".$group_names[$group_id]['name'];
             }
             if (empty($sent_to_array['groups']) and empty($sent_to_array['users'])) {
-                $output[] = "&nbsp;" . get_lang('Everybody');
+                $output[] = "&nbsp;".get_lang('Everybody');
             }
         }
 
@@ -1023,7 +1023,7 @@ 
 
         $sql = "SELECT to_group_id, to_user_id
                 FROM $tbl_item_property
-                WHERE c_id = $course_id AND tool = '$tool' AND ref=" . $id;
+                WHERE c_id = $course_id AND tool = '$tool' AND ref=".$id;
         $result = Database::query($sql);
 
         while ($row = Database::fetch_array($result)) {
@@ -1064,8 +1064,8 @@ 
         $announcementId = intval($announcementId);
         $course_id = api_get_course_int_id();
         $row = array();
-        $sql = 'SELECT id, path, filename, comment FROM ' . $tbl_announcement_attachment . '
-				WHERE c_id = ' . $course_id . ' AND announcement_id = ' . $announcementId;
+        $sql = 'SELECT id, path, filename, comment FROM '.$tbl_announcement_attachment.'
+				WHERE c_id = ' . $course_id.' AND announcement_id = '.$announcementId;
         $result = Database::query($sql);
         if (Database::num_rows($result) != 0) {
             $row = Database::fetch_array($result, 'ASSOC');
@@ -1090,9 +1090,9 @@ 
 
         if (is_array($file) && $file['error'] == 0) {
             // TODO: This path is obsolete. The new document repository scheme should be kept in mind here.
-            $courseDir = $_course['path'] . '/upload/announcements';
+            $courseDir = $_course['path'].'/upload/announcements';
             $sys_course_path = api_get_path(SYS_COURSE_PATH);
-            $updir = $sys_course_path . $courseDir;
+            $updir = $sys_course_path.$courseDir;
 
             // Try to add an extension to the file if it hasn't one
             $new_file_name = add_ext_on_mime(stripslashes($file['name']), $file['type']);
@@ -1104,7 +1104,7 @@ 
                 Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
             } else {
                 $new_file_name = uniqid('');
-                $new_path = $updir . '/' . $new_file_name;
+                $new_path = $updir.'/'.$new_file_name;
                 copy($file['tmp_name'], $new_path);
 
                 $params = [
@@ -1145,9 +1145,9 @@ 
 
         if (is_array($file) && $file['error'] == 0) {
             // TODO: This path is obsolete. The new document repository scheme should be kept in mind here.
-            $courseDir = $_course['path'] . '/upload/announcements';
+            $courseDir = $_course['path'].'/upload/announcements';
             $sys_course_path = api_get_path(SYS_COURSE_PATH);
-            $updir = $sys_course_path . $courseDir;
+            $updir = $sys_course_path.$courseDir;
 
             // Try to add an extension to the file if it hasn't one
             $new_file_name = add_ext_on_mime(stripslashes($file['name']), $file['type']);
@@ -1159,13 +1159,13 @@ 
                 Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
             } else {
                 $new_file_name = uniqid('');
-                $new_path = $updir . '/' . $new_file_name;
+                $new_path = $updir.'/'.$new_file_name;
                 @move_uploaded_file($file['tmp_name'], $new_path);
                 $safe_file_comment = Database::escape_string($file_comment);
                 $safe_file_name = Database::escape_string($file_name);
                 $safe_new_file_name = Database::escape_string($new_file_name);
                 $id_attach = intval($id_attach);
-                $sql = "UPDATE $tbl_announcement_attachment SET filename = '$safe_file_name', comment = '$safe_file_comment', path = '$safe_new_file_name', size ='" . intval($file['size']) . "'
+                $sql = "UPDATE $tbl_announcement_attachment SET filename = '$safe_file_name', comment = '$safe_file_comment', path = '$safe_new_file_name', size ='".intval($file['size'])."'
 					 	WHERE c_id = $course_id AND id = '$id_attach'";
                 $result = Database::query($sql);
                 if ($result === false) {
@@ -1272,7 +1272,7 @@ 
 
             //if (!empty($user_id)) {
             if (0) {
-                if (is_array($group_memberships) && count($group_memberships) > 0 ) {
+                if (is_array($group_memberships) && count($group_memberships) > 0) {
                     $sql = "SELECT $select
                             FROM $tbl_announcement announcement, $tbl_item_property ip
                             WHERE
@@ -1472,8 +1472,8 @@ 
                 if ($myrow['email_sent'] == '1') {
                     $sent_to_icon = ' '.Display::return_icon('email.gif', get_lang('AnnounceSentByEmail'));
                 }
-                $groupReference = ($myrow['to_group_id'] > 0) ? ' <span class="label label-info">' . get_lang('Group') . '</span> ' : '' ;
-                $title = $myrow['title'] . $groupReference . $sent_to_icon;
+                $groupReference = ($myrow['to_group_id'] > 0) ? ' <span class="label label-info">'.get_lang('Group').'</span> ' : '';
+                $title = $myrow['title'].$groupReference.$sent_to_icon;
                 $item_visibility = api_get_item_visibility($_course, TOOL_ANNOUNCEMENT, $myrow['id'], $session_id);
                 $myrow['visibility'] = $item_visibility;
 
@@ -1481,8 +1481,8 @@ 
                 $attachment_list = AnnouncementManager::get_attachment($myrow['id']);
 
                 $attachment_icon = '';
-                if (count($attachment_list)>0) {
-                    $attachment_icon = ' '.Display::return_icon('attachment.gif',get_lang('Attachment'));
+                if (count($attachment_list) > 0) {
+                    $attachment_icon = ' '.Display::return_icon('attachment.gif', get_lang('Attachment'));
                 }
 
                 /* TITLE */
@@ -1501,16 +1501,16 @@ 
                     || (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())
                 ) {
                     $modify_icons = "<a href=\"".$actionUrl."&action=modify&id=".$myrow['id']."\">".
-                        Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL)."</a>";
-                    if ($myrow['visibility']==1) {
-                        $image_visibility="visible";
-                        $alt_visibility=get_lang('Hide');
+                        Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL)."</a>";
+                    if ($myrow['visibility'] == 1) {
+                        $image_visibility = "visible";
+                        $alt_visibility = get_lang('Hide');
                     } else {
-                        $image_visibility="invisible";
-                        $alt_visibility=get_lang('Visible');
+                        $image_visibility = "invisible";
+                        $alt_visibility = get_lang('Visible');
                     }
-                    $modify_icons .=  "<a href=\"".$actionUrl."&action=showhide&id=".$myrow['id']."&sec_token=".$stok."\">".
-                        Display::return_icon($image_visibility.'.png', $alt_visibility,'',ICON_SIZE_SMALL)."</a>";
+                    $modify_icons .= "<a href=\"".$actionUrl."&action=showhide&id=".$myrow['id']."&sec_token=".$stok."\">".
+                        Display::return_icon($image_visibility.'.png', $alt_visibility, '', ICON_SIZE_SMALL)."</a>";
 
                     // DISPLAY MOVE UP COMMAND only if it is not the top announcement
                     if ($iterator != 1) {
@@ -1525,12 +1525,12 @@ 
                     } else {
                         $modify_icons .= Display::return_icon('down_na.gif', get_lang('Down'));
                     }
-                    if (api_is_allowed_to_edit(false,true)) {
-                        $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;\">".
-                            Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).
+                    if (api_is_allowed_to_edit(false, true)) {
+                        $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;\">".
+                            Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).
                             "</a>";
                     }
-                    $iterator ++;
+                    $iterator++;
                 } else {
                     $modify_icons = Display::url(
                         Display::return_icon('default.png'),
@@ -1571,7 +1571,7 @@ 
         $userId = api_get_user_id();
         $condition_session = api_get_session_condition($session_id, true, true, 'announcement.session_id');
 
-        if (api_is_allowed_to_edit(false,true))  {
+        if (api_is_allowed_to_edit(false, true)) {
             // check teacher status
             if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') {
 
@@ -1635,7 +1635,7 @@ 
 
                 // the user is member of several groups => display personal announcements AND
                 // his group announcements AND the general announcements
-                if (is_array($group_memberships) && count($group_memberships)>0) {
+                if (is_array($group_memberships) && count($group_memberships) > 0) {
                     $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id
                     FROM $tbl_announcement announcement, $tbl_item_property ip
                     WHERE
@@ -1685,7 +1685,7 @@ 
                         }
 
                         // the user is not identiefied => show only the general announcements
-                        $sql="SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id
+                        $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id
                                 FROM $tbl_announcement announcement, $tbl_item_property ip
                                 WHERE
                                     announcement.c_id = $course_id AND

main/inc/lib/internationalization_database/name_order_conventions.php

Indentation +77 added lines, -77 removed lines

@@ -19,82 +19,82 @@
  * last_name                   - sorting names with priority for the last name.
  */
 return array(
-	'afrikaans' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'albanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'alemannic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'amharic' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'armenian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'arabic' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'asturian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'bosnian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'brazilian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'breton' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'bulgarian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'catalan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'croatian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'czech' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'danish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'dari' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'dutch' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'english' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'esperanto' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'estonian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'basque'  =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'finnish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'french' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'frisian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'friulian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'afrikaans' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'albanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'alemannic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'amharic' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'armenian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'arabic' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'asturian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'bosnian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'brazilian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'breton' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'bulgarian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'catalan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'croatian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'czech' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'danish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'dari' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'dutch' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'english' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'esperanto' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'estonian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'basque'  =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'finnish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'french' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'frisian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'friulian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
     'galician' =>         array('format' => 'title last_name first_name',  'sort_by' => 'last_name'),
-	'georgian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'german' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'greek' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'hawaiian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'hebrew' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'hindi' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'hungarian' =>        array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
-	'icelandic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'indonesian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'irish' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'italian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'japanese' =>         array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
-	'korean' =>           array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
-	'latin' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'latvian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'lithuanian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'macedonian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'malay' =>            array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
-	'manx' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'marathi' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'middle_frisian' =>   array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'mingo' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'nepali' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'norwegian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'occitan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'pashto' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'persian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'polish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'portuguese' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'quechua_cusco' =>    array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'romanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'rumantsch' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'russian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'sanskrit' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'serbian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'serbian_cyrillic' => array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'simpl_chinese' =>    array('format' => 'title last_name first_name',  'sort_by' => 'last_name' ), // Eastern order
-	'slovak' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'slovenian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'spanish' =>          array('format' => 'title last_name, first_name',  'sort_by' => 'last_name'), // Library order
-	'swahili' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'swedish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'tagalog' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'tamil' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'thai' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'trad_chinese' =>     array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
-	'turkish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'ukrainian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'vietnamese' =>       array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
-	'welsh' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'yiddish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'yoruba' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name')
+    'georgian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'german' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'greek' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'hawaiian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'hebrew' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'hindi' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'hungarian' =>        array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
+    'icelandic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'indonesian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'irish' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'italian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'japanese' =>         array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
+    'korean' =>           array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
+    'latin' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'latvian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'lithuanian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'macedonian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'malay' =>            array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
+    'manx' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'marathi' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'middle_frisian' =>   array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'mingo' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'nepali' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'norwegian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'occitan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'pashto' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'persian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'polish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'portuguese' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'quechua_cusco' =>    array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'romanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'rumantsch' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'russian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'sanskrit' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'serbian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'serbian_cyrillic' => array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'simpl_chinese' =>    array('format' => 'title last_name first_name',  'sort_by' => 'last_name' ), // Eastern order
+    'slovak' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'slovenian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'spanish' =>          array('format' => 'title last_name, first_name',  'sort_by' => 'last_name'), // Library order
+    'swahili' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'swedish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'tagalog' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'tamil' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'thai' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'trad_chinese' =>     array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
+    'turkish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'ukrainian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'vietnamese' =>       array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
+    'welsh' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'yiddish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
+    'yoruba' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name')
 );

Spacing +78 added lines, -78 removed lines

@@ -19,82 +19,82 @@
  * last_name                   - sorting names with priority for the last name.
  */
 return array(
-	'afrikaans' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'albanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'alemannic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'amharic' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'armenian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'arabic' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'asturian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'bosnian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'brazilian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'breton' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'bulgarian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'catalan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'croatian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'czech' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'danish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'dari' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'dutch' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'english' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'esperanto' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'estonian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'basque'  =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'finnish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'french' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'frisian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'friulian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-    'galician' =>         array('format' => 'title last_name first_name',  'sort_by' => 'last_name'),
-	'georgian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'german' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'greek' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'hawaiian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'hebrew' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'hindi' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'hungarian' =>        array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
-	'icelandic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'indonesian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'irish' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'italian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'japanese' =>         array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
-	'korean' =>           array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
-	'latin' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'latvian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'lithuanian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'macedonian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'malay' =>            array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
-	'manx' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'marathi' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'middle_frisian' =>   array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'mingo' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'nepali' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'norwegian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'occitan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'pashto' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'persian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'polish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'portuguese' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'quechua_cusco' =>    array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'romanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'rumantsch' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'russian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'sanskrit' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'serbian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'serbian_cyrillic' => array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'simpl_chinese' =>    array('format' => 'title last_name first_name',  'sort_by' => 'last_name' ), // Eastern order
-	'slovak' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'slovenian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'spanish' =>          array('format' => 'title last_name, first_name',  'sort_by' => 'last_name'), // Library order
-	'swahili' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'swedish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'tagalog' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'tamil' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'thai' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'trad_chinese' =>     array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
-	'turkish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'ukrainian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'vietnamese' =>       array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
-	'welsh' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'yiddish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'yoruba' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name')
+	'afrikaans' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'albanian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'alemannic' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'amharic' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'armenian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'arabic' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'asturian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'bosnian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'brazilian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'breton' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'bulgarian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'catalan' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'croatian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'czech' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'danish' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'dari' =>             array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'dutch' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'english' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'esperanto' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'estonian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'basque'  =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'finnish' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'french' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'frisian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'friulian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+    'galician' =>         array('format' => 'title last_name first_name', 'sort_by' => 'last_name'),
+	'georgian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'german' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'greek' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'hawaiian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'hebrew' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'hindi' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'hungarian' =>        array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
+	'icelandic' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'indonesian' =>       array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'irish' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'italian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'japanese' =>         array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
+	'korean' =>           array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
+	'latin' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'latvian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'lithuanian' =>       array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'macedonian' =>       array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'malay' =>            array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
+	'manx' =>             array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'marathi' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'middle_frisian' =>   array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'mingo' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'nepali' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'norwegian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'occitan' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'pashto' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'persian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'polish' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'portuguese' =>       array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'quechua_cusco' =>    array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'romanian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'rumantsch' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'russian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'sanskrit' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'serbian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'serbian_cyrillic' => array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'simpl_chinese' =>    array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
+	'slovak' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'slovenian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'spanish' =>          array('format' => 'title last_name, first_name', 'sort_by' => 'last_name'), // Library order
+	'swahili' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'swedish' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'tagalog' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'tamil' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'thai' =>             array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'trad_chinese' =>     array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
+	'turkish' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'ukrainian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'vietnamese' =>       array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
+	'welsh' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'yiddish' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'yoruba' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name')
 );

main/inc/lib/internationalization_database/transliteration/x70.php

Indentation +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 // $Id: x70.php,v 1.1.8.1 2008/06/12 20:34:31 smk Exp $
 
 return array(
-  'en' => array('You ', 'Yang ', 'Lu ', 'Si ', 'Jie ', 'Ying ', 'Du ', 'Wang ', 'Hui ', 'Xie ', 'Pan ', 'Shen ', 'Biao ', 'Chan ', 'Mo ', 'Liu ',
+    'en' => array('You ', 'Yang ', 'Lu ', 'Si ', 'Jie ', 'Ying ', 'Du ', 'Wang ', 'Hui ', 'Xie ', 'Pan ', 'Shen ', 'Biao ', 'Chan ', 'Mo ', 'Liu ',
     'Jian ', 'Pu ', 'Se ', 'Cheng ', 'Gu ', 'Bin ', 'Huo ', 'Xian ', 'Lu ', 'Qin ', 'Han ', 'Ying ', 'Yong ', 'Li ', 'Jing ', 'Xiao ',
     'Ying ', 'Sui ', 'Wei ', 'Xie ', 'Huai ', 'Hao ', 'Zhu ', 'Long ', 'Lai ', 'Dui ', 'Fan ', 'Hu ', 'Lai ', NULL, NULL, 'Ying ',
     'Mi ', 'Ji ', 'Lian ', 'Jian ', 'Ying ', 'Fen ', 'Lin ', 'Yi ', 'Jian ', 'Yue ', 'Chan ', 'Dai ', 'Rang ', 'Jian ', 'Lan ', 'Fan ',

main/inc/lib/internationalization_database/transliteration/xce.php

Indentation +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 // $Id: xce.php,v 1.1.8.1 2008/06/12 20:34:32 smk Exp $
 
 return array(
-  'en' => array('cwik', 'cwit', 'cwip', 'cwih', 'cyu', 'cyug', 'cyugg', 'cyugs', 'cyun', 'cyunj', 'cyunh', 'cyud', 'cyul', 'cyulg', 'cyulm', 'cyulb',
+    'en' => array('cwik', 'cwit', 'cwip', 'cwih', 'cyu', 'cyug', 'cyugg', 'cyugs', 'cyun', 'cyunj', 'cyunh', 'cyud', 'cyul', 'cyulg', 'cyulm', 'cyulb',
     'cyuls', 'cyult', 'cyulp', 'cyulh', 'cyum', 'cyub', 'cyubs', 'cyus', 'cyuss', 'cyung', 'cyuj', 'cyuc', 'cyuk', 'cyut', 'cyup', 'cyuh',
     'ceu', 'ceug', 'ceugg', 'ceugs', 'ceun', 'ceunj', 'ceunh', 'ceud', 'ceul', 'ceulg', 'ceulm', 'ceulb', 'ceuls', 'ceult', 'ceulp', 'ceulh',
     'ceum', 'ceub', 'ceubs', 'ceus', 'ceuss', 'ceung', 'ceuj', 'ceuc', 'ceuk', 'ceut', 'ceup', 'ceuh', 'cyi', 'cyig', 'cyigg', 'cyigs',