chamilo / chamilo-lms

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;
     }
 }

main/inc/lib/portfolio.class.php

Spacing +6 added lines, -6 removed lines

@@ -482,14 +482,14 @@ 
         $attributes['z-index'] = 100000;
         $s = ' ';
         foreach ($attributes as $key => $value) {
-            $s .= $key . '="' . $value . '" ';
+            $s .= $key.'="'.$value.'" ';
         }
 
         $result = array();
-        $result[] = '<span ' . $s . ' >';
+        $result[] = '<span '.$s.' >';
         $result[] = '<span class="dropdown" >';
         $result[] = '<a href="#" data-toggle="dropdown" class="dropdown-toggle">';
-        $result[] = Display::return_icon('document_send.png', get_lang('Send'), array(), ICON_SIZE_SMALL) . '<b class="caret"></b>';
+        $result[] = Display::return_icon('document_send.png', get_lang('Send'), array(), ICON_SIZE_SMALL).'<b class="caret"></b>';
         $result[] = '</a>';
         $result[] = '<ul class="dropdown-menu">';
 
@@ -505,7 +505,7 @@ 
             $parameters[PortfolioController::PARAM_TOOL] = $tool;
             $url = api_get_path(WEB_CODE_PATH).'portfolio/share.php?';
             $result[] = '<li>';
-            $result[] = '<a href="' . $url . '">' . $portfolio->get_title() . '</a>';
+            $result[] = '<a href="'.$url.'">'.$portfolio->get_title().'</a>';
             $result[] = '</li>';
         }
         $result[] = '</ul>';
@@ -564,8 +564,8 @@ 
      */
     public function __construct($portfolio)
     {
-        $this->name = md5(__CLASS__) . '_' . $portfolio->get_name();
-        $this->title = $portfolio->get_title() ? $portfolio->get_title() : get_lang('SendTo') . ' ' . $portfolio->get_name();
+        $this->name = md5(__CLASS__).'_'.$portfolio->get_name();
+        $this->title = $portfolio->get_title() ? $portfolio->get_title() : get_lang('SendTo').' '.$portfolio->get_name();
         $this->portfolio = $portfolio;
     }
 

main/inc/lib/nanogong/receiver.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 $title = trim(str_replace('_chnano_.', '.', $filename)); //hide nanogong wav tag at title
 $title = str_replace('_', ' ', $title);
 
-$documentPath = $filepath . $filename;
+$documentPath = $filepath.$filename;
 
 if ($nano_user_id != api_get_user_id() || api_get_user_id() == 0 || $nano_user_id == 0) {
     echo 'Not allowed';
@@ -66,7 +66,7 @@ 
     $groupId = $nano_group_id;
     $file_size = filesize($documentPath);
     $relativeUrlPath = $dir;
-    $doc_id = add_document($_course, $relativeUrlPath . $filename, 'file', filesize($documentPath), $title);
+    $doc_id = add_document($_course, $relativeUrlPath.$filename, 'file', filesize($documentPath), $title);
     api_item_property_update(
         $_course,
         TOOL_DOCUMENT,

main/inc/lib/hook/HookManagement.php

Spacing +14 added lines, -14 removed lines

@@ -145,10 +145,10 @@ 
     public function listHookObservers($eventName)
     {
         $array = array();
-        $joinTable = $this->tables[TABLE_HOOK_CALL] . ' hc' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_EVENT] . ' he' .
-            ' ON hc.hook_event_id = he.id ' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_OBSERVER] . ' ho ' .
+        $joinTable = $this->tables[TABLE_HOOK_CALL].' hc'.
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_EVENT].' he'.
+            ' ON hc.hook_event_id = he.id '.
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_OBSERVER].' ho '.
             ' ON hc.hook_observer_id = ho.id ';
         $columns = 'ho.class_name, ho.path, ho.plugin_name, hc.enabled';
         $where = array('where' => array('he.class_name = ? ' => $eventName, 'AND hc.enabled = ? ' => 1));
@@ -202,10 +202,10 @@ 
     public function listAllHookCalls()
     {
         $array = array();
-        $joinTable = $this->tables[TABLE_HOOK_CALL] . ' hc' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_EVENT] . ' he' .
-            ' ON hc.hook_event_id = he.id ' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_OBSERVER] . ' ho ' .
+        $joinTable = $this->tables[TABLE_HOOK_CALL].' hc'.
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_EVENT].' he'.
+            ' ON hc.hook_event_id = he.id '.
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_OBSERVER].' ho '.
             ' ON hc.hook_observer_id = ho.id ';
         $columns = 'he.class_name AS event_class_name, ho.class_name AS observer_class_name, hc.id AS id, hc.type AS type';
         $rows = Database::select($columns, $joinTable);
@@ -231,7 +231,7 @@ 
         if (isset($eventName) && !isset($this->hookEvents[$eventName])) {
             $attributes = array(
                 'class_name' => $eventName,
-                'description' => get_lang('HookDescription' . $eventName),
+                'description' => get_lang('HookDescription'.$eventName),
             );
             $id = Database::insert($this->tables[TABLE_HOOK_EVENT], $attributes);
             $this->hookEvents[$eventName] = $id;
@@ -240,7 +240,7 @@ 
         // Check if exists hook observer
         if (isset($observerClassName) &&
             !isset($this->hookObservers[$observerClassName])
-        ){
+        ) {
             $object = $observerClassName::create();
             $attributes = array(
                 'class_name' => $observerClassName,
@@ -338,10 +338,10 @@ 
         $eventName = Database::escape_string($eventName);
         $observerClassName($observerClassName);
         $type = Database::escape_string($type);
-        $joinTable = $this->tables[TABLE_HOOK_CALL] . ' hc' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_EVENT] . ' he' .
-            ' ON hc.hook_event_id = he.id ' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_OBSERVER] . ' ho ' .
+        $joinTable = $this->tables[TABLE_HOOK_CALL].' hc'.
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_EVENT].' he'.
+            ' ON hc.hook_event_id = he.id '.
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_OBSERVER].' ho '.
             ' ON hc.hook_observer_id = ho.id ';
         $row = Database::select(
             'id',

main/inc/lib/promotion.lib.php

Spacing +8 added lines, -8 removed lines

@@ -57,7 +57,7 @@ 
                     case 'updated_at':
                         break;
                     case 'name':
-                        $val .= ' ' . get_lang('CopyLabelSuffix');
+                        $val .= ' '.get_lang('CopyLabelSuffix');
                         $new[$key] = $val;
                         break;
                     case 'created_at':
@@ -66,7 +66,7 @@ 
                         break;
                     case 'career_id':
                         if (!empty($career_id)) {
-                            $val = (int)$career_id;
+                            $val = (int) $career_id;
                         }
                         $new[$key] = $val;
                         break;
@@ -147,12 +147,12 @@ 
     {
         // Action links
         echo '<div class="actions" style="margin-bottom:20px">';
-        echo '<a href="career_dashboard.php">' . Display::return_icon('back.png',
-                get_lang('Back'), '', '32') . '</a>';
-        echo '<a href="' . api_get_self() . '?action=add">' . Display::return_icon('new_promotion.png',
-                get_lang('Add'), '', '32') . '</a>';
-        echo '<a href="' . api_get_path(WEB_CODE_PATH) . 'session/session_add.php">' . Display::return_icon('new_session.png',
-                get_lang('AddSession'), '', '32') . '</a>';
+        echo '<a href="career_dashboard.php">'.Display::return_icon('back.png',
+                get_lang('Back'), '', '32').'</a>';
+        echo '<a href="'.api_get_self().'?action=add">'.Display::return_icon('new_promotion.png',
+                get_lang('Add'), '', '32').'</a>';
+        echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_add.php">'.Display::return_icon('new_session.png',
+                get_lang('AddSession'), '', '32').'</a>';
         echo '</div>';
         echo Display::grid_html('promotions');
     }

main/inc/lib/online.inc.php

Spacing +38 added lines, -38 removed lines

@@ -32,17 +32,17 @@ 
 
         $login_date = api_get_utc_datetime();
         $access_url_id = 1;
-        if (api_get_multiple_access_url() && api_get_current_access_url_id()!=-1) {
+        if (api_get_multiple_access_url() && api_get_current_access_url_id() != -1) {
             $access_url_id = api_get_current_access_url_id();
         }
         $session_id = api_get_session_id();
         // if the $_course array exists this means we are in a course and we have to store this in the who's online table also
         // to have the x users in this course feature working
-        if (is_array($_course) && count($_course)>0 && !empty($_course['id'])) {
-            $query = "REPLACE INTO ".$online_table ." (login_id,login_user_id,login_date,user_ip, c_id, session_id, access_url_id)
+        if (is_array($_course) && count($_course) > 0 && !empty($_course['id'])) {
+            $query = "REPLACE INTO ".$online_table." (login_id,login_user_id,login_date,user_ip, c_id, session_id, access_url_id)
                       VALUES ($uid,$uid,'$login_date','$user_ip', '".$_course['real_id']."' , '$session_id' , '$access_url_id' )";
         } else {
-            $query = "REPLACE INTO ".$online_table ." (login_id,login_user_id,login_date,user_ip, c_id, session_id, access_url_id)
+            $query = "REPLACE INTO ".$online_table." (login_id,login_user_id,login_date,user_ip, c_id, session_id, access_url_id)
                       VALUES ($uid,$uid,'$login_date','$user_ip', 0, '$session_id', '$access_url_id')";
         }
         Database::query($query);
@@ -63,7 +63,7 @@ 
             $isFirstLogin = Session::read('first_user_login');
             if (empty($isFirstLogin)) {
                 $sql = "SELECT login_id FROM $table
-                        WHERE login_user_id = " . $userId . " LIMIT 1";
+                        WHERE login_user_id = ".$userId." LIMIT 1";
 
                 $result = Database::query($sql);
                 $loginData = array();
@@ -117,8 +117,8 @@ 
     		ORDER BY login_date DESC
     		LIMIT 0,1";
     $q_last_connection = Database::query($sql);
-    if (Database::num_rows($q_last_connection)>0) {
-        $i_id_last_connection = Database::result($q_last_connection,0,"login_id");
+    if (Database::num_rows($q_last_connection) > 0) {
+        $i_id_last_connection = Database::result($q_last_connection, 0, "login_id");
     }
 
     if (!isset($_SESSION['login_as'])) {
@@ -149,7 +149,7 @@ 
         }
     }
 
-    require_once api_get_path(SYS_PATH) . 'main/chat/chat_functions.lib.php';
+    require_once api_get_path(SYS_PATH).'main/chat/chat_functions.lib.php';
     exit_of_chat($user_id);
     session_regenerate_id();
     Session::destroy();
@@ -168,7 +168,7 @@ 
 {
 	$online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
     $user_id = intval($user_id);
-	$query = "DELETE FROM " . $online_table . " WHERE login_user_id = $user_id";
+	$query = "DELETE FROM ".$online_table." WHERE login_user_id = $user_id";
 	Database::query($query);
 }
 
@@ -184,7 +184,7 @@ 
 	$access_url_id = api_get_current_access_url_id();
 	$time_limit = api_get_setting('time_limit_whosonline');
 
-    $online_time = time() - $time_limit*60;
+    $online_time = time() - $time_limit * 60;
     $limit_date = api_get_utc_datetime($online_time);
     $user_id = intval($user_id);
 
@@ -241,7 +241,7 @@ 
     $current_date = api_get_utc_datetime($online_time);
 	$track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
 	$friend_user_table = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
-	$table_user	= Database::get_main_table(TABLE_MAIN_USER);
+	$table_user = Database::get_main_table(TABLE_MAIN_USER);
 
 	if ($friends) {
 		// 	who friends from social network is online
@@ -257,8 +257,8 @@ 
                   LIMIT $from, $number_of_items";
 	} else {
 		$query = "SELECT DISTINCT login_user_id, login_date
-                    FROM ".$track_online_table ." e
-		            INNER JOIN ".$table_user ." u ON (u.id = e.login_user_id)
+                    FROM ".$track_online_table." e
+		            INNER JOIN ".$table_user." u ON (u.id = e.login_user_id)
                   WHERE u.status != ".ANONYMOUS." AND login_date >= '".$current_date."'
                   ORDER BY $column $direction
                   LIMIT $from, $number_of_items";
@@ -281,8 +281,8 @@ 
 			} else {
 				// all users online
 				$query = "SELECT login_user_id, login_date
-						  FROM ".$track_online_table ." track
-                          INNER JOIN ".$table_user ." u
+						  FROM ".$track_online_table." track
+                          INNER JOIN ".$table_user." u
                           ON (u.id=track.login_user_id)
 						  WHERE u.status != ".ANONYMOUS." AND track.access_url_id =  $access_url_id AND
                                 login_date >= '".$current_date."'
@@ -397,10 +397,10 @@ 
         $time_limit = intval($time_limit);
     }
 
-    $online_time 		= time() - $time_limit*60;
+    $online_time 		= time() - $time_limit * 60;
     $current_date		= api_get_utc_datetime($online_time);
     $track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
-    $course_code         = Database::escape_string($course_code);
+    $course_code = Database::escape_string($course_code);
 	$courseInfo = api_get_course_info($course_code);
 	$courseId = $courseInfo['real_id'];
 
@@ -415,7 +415,7 @@ 
 	if ($result) {
 		$users_online = array();
 
-		while(list($login_user_id, $login_date) = Database::fetch_row($result)) {
+		while (list($login_user_id, $login_date) = Database::fetch_row($result)) {
             $users_online[] = $login_user_id;
 		}
 		return $users_online;
@@ -424,7 +424,7 @@ 
 	}
 }
 
-function who_is_online_in_this_course_count($uid, $time_limit, $coursecode=null)
+function who_is_online_in_this_course_count($uid, $time_limit, $coursecode = null)
 {
 	if (empty($coursecode)) {
 		return false;
@@ -465,8 +465,8 @@ 
 	$user_table = Database::get_main_table(TABLE_MAIN_USER);
 	$query = "SELECT firstname, lastname FROM ".$user_table." WHERE id=$uid";
 	$result = @Database::query($query);
-	if (count($result)>0) {
-		while(list($firstname,$lastname)= Database::fetch_array($result)) {
+	if (count($result) > 0) {
+		while (list($firstname, $lastname) = Database::fetch_array($result)) {
 			$str = str_replace(' ', ' ', api_get_person_name($firstname, $lastname));
 			return $str;
 		}
@@ -487,27 +487,27 @@ 
 	}
     $userId = intval($_user['user_id']);
 	$track_user_table = Database::get_main_table(TABLE_MAIN_USER);
-	$sql="SELECT chatcall_user_id, chatcall_date FROM $track_user_table
+	$sql = "SELECT chatcall_user_id, chatcall_date FROM $track_user_table
 	      WHERE ( id = $userId )";
-	$result=Database::query($sql);
-	$row=Database::fetch_array($result);
-
-	$login_date=$row['chatcall_date'];
-	$hour = substr($login_date,11,2);
-	$minute = substr($login_date,14,2);
-	$second = substr($login_date,17,2);
-	$month = substr($login_date,5,2);
-	$day = substr($login_date,8,2);
-	$year = substr($login_date,0,4);
-	$calltime = mktime($hour,$minute,$second,$month,$day,$year);
+	$result = Database::query($sql);
+	$row = Database::fetch_array($result);
+
+	$login_date = $row['chatcall_date'];
+	$hour = substr($login_date, 11, 2);
+	$minute = substr($login_date, 14, 2);
+	$second = substr($login_date, 17, 2);
+	$month = substr($login_date, 5, 2);
+	$day = substr($login_date, 8, 2);
+	$year = substr($login_date, 0, 4);
+	$calltime = mktime($hour, $minute, $second, $month, $day, $year);
 
 	$time = api_get_utc_datetime();
-	$minute_passed=5;  //within this limit, the chat call request is valid
-	$limittime = mktime(date("H"),date("i")-$minute_passed,date("s"),date("m"),date("d"),date("Y"));
+	$minute_passed = 5; //within this limit, the chat call request is valid
+	$limittime = mktime(date("H"), date("i") - $minute_passed, date("s"), date("m"), date("d"), date("Y"));
 
-	if (($row['chatcall_user_id']) and ($calltime>$limittime)) {
-		$webpath=api_get_path(WEB_CODE_PATH);
-		$message=get_lang('YouWereCalled').' : '.GetFullUserName($row['chatcall_user_id'],'').'<br>'.get_lang('DoYouAccept')
+	if (($row['chatcall_user_id']) and ($calltime > $limittime)) {
+		$webpath = api_get_path(WEB_CODE_PATH);
+		$message = get_lang('YouWereCalled').' : '.GetFullUserName($row['chatcall_user_id'], '').'<br>'.get_lang('DoYouAccept')
 							."<p>"
 				."<a href=\"".$webpath."chat/chat.php?cidReq=".$_cid."&origin=whoisonlinejoin\">"
 				. get_lang("Yes")

main/inc/lib/internationalization_database/name_order_conventions.php

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/fileManage.lib.php

Spacing +13 added lines, -13 removed lines

@@ -225,9 +225,9 @@ 
 		/* File case */
 		if (is_file($source)) {
 			if ($forceMove && !$isWindowsOS && $canExec) {
-				exec('mv ' . $source . ' ' . $target . '/' . $file_name);
+				exec('mv '.$source.' '.$target.'/'.$file_name);
 			} else {
-				copy($source, $target . '/' . $file_name);
+				copy($source, $target.'/'.$file_name);
 				unlink($source);
 			}
 			return true;
@@ -278,7 +278,7 @@ 
 		}
 		$destination_trail = $destination.'/'.$dir_name;
 		if (is_dir($destination)) {
-			chdir($orig_dir_path) ;
+			chdir($orig_dir_path);
 			$handle = opendir($orig_dir_path);
 
 			while ($element = readdir($handle)) {
@@ -288,14 +288,14 @@ 
 					copy($element, $destination_trail.'/'.$element);
 
 					if ($move) {
-						unlink($element) ;
+						unlink($element);
 					}
 				} elseif (is_dir($element)) {
 					$dir_to_copy[] = $orig_dir_path.'/'.$element;
 				}
 			}
 
-			closedir($handle) ;
+			closedir($handle);
 
 			if (sizeof($dir_to_copy) > 0) {
 				foreach ($dir_to_copy as $this_dir) {
@@ -304,7 +304,7 @@ 
 			}
 
 			if ($move) {
-				rmdir($orig_dir_path) ;
+				rmdir($orig_dir_path);
 			}
 			chdir($save_dir);
 		}
@@ -389,17 +389,17 @@ 
 			// Recursive operation if subdirectories exist
 			$dir_number = sizeof($dir_array);
 			if ($dir_number > 0) {
-				for ($i = 0 ; $i < $dir_number ; $i++) {
+				for ($i = 0; $i < $dir_number; $i++) {
 					$sub_dir_array = FileManager::list_all_directories($dir_array[$i]); // Function recursivity
 					if (is_array($dir_array) && is_array($sub_dir_array)) {
-						$dir_array  =  array_merge($dir_array, $sub_dir_array); // Data merge
+						$dir_array = array_merge($dir_array, $sub_dir_array); // Data merge
 					}
 				}
 			}
-			$result_array  =  $dir_array;
-			chdir($save_dir) ;
+			$result_array = $dir_array;
+			chdir($save_dir);
 		}
-		return $result_array ;
+		return $result_array;
 	}
 
 	/**
@@ -444,8 +444,8 @@ 
 		$buffer = '';
 		if (file_exists($file_name)) {
 			$fp = fopen($file_name, 'rb');
-			$buffer = fread ($fp, filesize($file_name));
-			fclose ($fp);
+			$buffer = fread($fp, filesize($file_name));
+			fclose($fp);
 		}
 		return $buffer;
 	}

main/inc/lib/getid3/module.audio-video.flv.php

Spacing +10 added lines, -10 removed lines

@@ -47,8 +47,8 @@ 
  */
 class getid3_flv extends getid3_handler {
 
-    const TAG_AUDIO    =  8;
-    const TAG_VIDEO    =  9;
+    const TAG_AUDIO    = 8;
+    const TAG_VIDEO    = 9;
     const TAG_META     = 18;
 
     const VIDEO_H263   = 2;
@@ -60,7 +60,7 @@ 
 	{
 	    $info = &$this->getid3->info;
 
-	    $info['flv'] = array ();
+	    $info['flv'] = array();
 	    $info_flv = &$info['flv'];
 
 		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
@@ -69,7 +69,7 @@ 
 		$flv_header = fread($this->getid3->fp, 5);
 
 		$info['fileformat'] = 'flv';
-		$info_flv['header']['signature'] =                           substr($flv_header, 0, 3);
+		$info_flv['header']['signature'] = substr($flv_header, 0, 3);
 		$info_flv['header']['version']   = getid3_lib::BigEndian2Int(substr($flv_header, 3, 1));
 		$type_flags                      = getid3_lib::BigEndian2Int(substr($flv_header, 4, 1));
 
@@ -87,10 +87,10 @@ 
 
 			$this_tag_header = fread($this->getid3->fp, 16);
 
-			$previous_tag_length = getid3_lib::BigEndian2Int(substr($this_tag_header,  0, 4));
-			$tag_type            = getid3_lib::BigEndian2Int(substr($this_tag_header,  4, 1));
-			$data_length         = getid3_lib::BigEndian2Int(substr($this_tag_header,  5, 3));
-			$timestamp           = getid3_lib::BigEndian2Int(substr($this_tag_header,  8, 3));
+			$previous_tag_length = getid3_lib::BigEndian2Int(substr($this_tag_header, 0, 4));
+			$tag_type            = getid3_lib::BigEndian2Int(substr($this_tag_header, 4, 1));
+			$data_length         = getid3_lib::BigEndian2Int(substr($this_tag_header, 5, 3));
+			$timestamp           = getid3_lib::BigEndian2Int(substr($this_tag_header, 8, 3));
 			$last_header_byte    = getid3_lib::BigEndian2Int(substr($this_tag_header, 15, 1));
 			$next_offset         = ftell($this->getid3->fp) - 1 + $data_length;
 
@@ -98,7 +98,7 @@ 
 
 				case getid3_flv::TAG_AUDIO:
 					if (!isset($info_flv['audio']['audioFormat'])) {
-						$info_flv['audio']['audioFormat']     =  $last_header_byte & 0x07;
+						$info_flv['audio']['audioFormat']     = $last_header_byte & 0x07;
 						$info_flv['audio']['audioRate']       = ($last_header_byte & 0x30) / 0x10;
 						$info_flv['audio']['audioSampleSize'] = ($last_header_byte & 0x40) / 0x40;
 						$info_flv['audio']['audioType']       = ($last_header_byte & 0x80) / 0x80;
@@ -401,7 +401,7 @@ 
 
 		$type = $this->stream->readByte();
 
-		switch($type) {
+		switch ($type) {
 			// Double
 			case 0:
 				$value = $this->readDouble();