chamilo / chamilo-lms

main/inc/lib/system/web/request.class.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
         return isset($_REQUEST[$key]) ? $_REQUEST[$key] : $default;
     }
 
-    public static function has($key){
+    public static function has($key) {
         return isset($_REQUEST[$key]);
     }
 

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/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/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/login_redirection.class.php

Spacing +6 added lines, -6 removed lines

@@ -18,30 +18,30 @@ 
         if (api_is_student() && !api_get_setting('student_page_after_login') == '') {
             $redirect_url = html_entity_decode(api_get_setting('student_page_after_login'));
             if ($redirect_url[0] == "/") {
-                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url;
+                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url;
             }
         }
         if (api_is_teacher() && !api_get_setting('teacher_page_after_login') == '') {
             $redirect_url = html_entity_decode(api_get_setting('teacher_page_after_login'));
             if ($redirect_url[0] == "/") {
-                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url;
+                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url;
             }
         }
         if (api_is_drh() && !api_get_setting('drh_page_after_login') == '') {
             $redirect_url = html_entity_decode(api_get_setting('drh_page_after_login'));
             if ($redirect_url[0] == "/") {
-                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url;
+                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url;
             }
         }
         if (api_is_session_admin() && !api_get_setting('sessionadmin_page_after_login') == '') {
             $redirect_url = html_entity_decode(api_get_setting('sessionadmin_page_after_login'));
             if ($redirect_url[0] == "/") {
-                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url;
+                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url;
             }
         }
 
         if (!empty($redirect_url)) {
-            header('Location: ' . $redirect_url . $param);
+            header('Location: '.$redirect_url.$param);
             exit();
         }
 
@@ -49,7 +49,7 @@ 
         if (CustomPages::enabled()) {
             CustomPages::display(CustomPages::INDEX_LOGGED);
         }
-        header('location: ' . api_get_path(WEB_PATH) . api_get_setting('page_after_login') . $param);
+        header('location: '.api_get_path(WEB_PATH).api_get_setting('page_after_login').$param);
         exit();
     }
 }

main/inc/lib/conditional_login.class.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
                     if (isset($condition['conditional_function']) && $condition['conditional_function']($user) == false) {
                         $_SESSION['conditional_login']['uid'] = $user['user_id'];
                         $_SESSION['conditional_login']['can_login'] = false;
-                        header("Location:". $condition['url']);
+                        header("Location:".$condition['url']);
                         exit();
                     }
                 }

main/inc/lib/image.lib.php

Spacing +19 added lines, -19 removed lines

@@ -115,7 +115,7 @@ 
             return false;
         }
         $this->path = preg_match(VALID_WEB_PATH, $path) ? (api_is_internal_path($path) ? api_get_path(TO_SYS, $path) : $path) : $path;
-        $this->set_image_wrapper();  //Creates image obj
+        $this->set_image_wrapper(); //Creates image obj
     }
 
     abstract function set_image_wrapper();
@@ -157,7 +157,7 @@ 
         if ($this->debug) error_log('Image::set_image_wrapper loaded');
         try {
             if (file_exists($this->path)) {
-                $this->image     = new Imagick($this->path);
+                $this->image = new Imagick($this->path);
 
                 if ($this->image) {
                     $this->fill_image_info(); //Fills height, width and type
@@ -165,7 +165,7 @@ 
             } else {
                 if ($this->debug) error_log('Image::image does not exist');
             }
-        } catch(ImagickException $e) {
+        } catch (ImagickException $e) {
             if ($this->debug) error_log($e->getMessage());
         }
     }
@@ -186,7 +186,7 @@ 
 
 	public function get_image_size()
     {
-		$imagesize = array('width'=>0,'height'=>0);
+		$imagesize = array('width'=>0, 'height'=>0);
 	    if ($this->image_validated) {
             $imagesize = $this->image->getImageGeometry();
 	    }
@@ -203,8 +203,8 @@ 
             $height = $thumbh;
         } else {
             $scale  = ($this->width > 0 && $this->height > 0) ? min($thumbw / $this->width, $thumbh / $this->height) : 0;
-            $width  = (int)($this->width * $scale);
-            $height = (int)($this->height * $scale);
+            $width  = (int) ($this->width * $scale);
+            $height = (int) ($this->height * $scale);
         }
 		$result = $this->image->resizeImage($width, $height, $this->filter, 1);
 		$this->width  = $thumbw;
@@ -250,7 +250,7 @@ 
 		$result = false;
 		try {
 		    $result = $this->image->writeImage($file);
-		} catch(ImagickException $e) {
+		} catch (ImagickException $e) {
             if ($this->debug) error_log($e->getMessage());
         }
 
@@ -311,9 +311,9 @@ 
 
     public function get_image_size()
     {
-        $return_array = array('width'=>0,'height'=>0);
+        $return_array = array('width'=>0, 'height'=>0);
         if ($this->image_validated) {
-	        $return_array = array('width'=>$this->width,'height'=>$this->height);
+	        $return_array = array('width'=>$this->width, 'height'=>$this->height);
         }
         return $return_array;
 	}
@@ -321,7 +321,7 @@ 
     public function fill_image_info()
     {
     	if (file_exists($this->path)) {
-	        $image_info     = getimagesize($this->path);
+	        $image_info = getimagesize($this->path);
 			$this->width    = $image_info[0];
 			$this->height   = $image_info[1];
 			$this->type     = $image_info[2];
@@ -341,11 +341,11 @@ 
                 $height = $thumbh;
             } else {
                 $scale = min($thumbw / $this->width, $thumbh / $this->height);
-                $width = (int)($this->width * $scale);
-                $height = (int)($this->height * $scale);
+                $width = (int) ($this->width * $scale);
+                $height = (int) ($this->height * $scale);
             }
-			$deltaw = (int)(($thumbw - $width) / 2);
-			$deltah = (int)(($thumbh - $height) / 2);
+			$deltaw = (int) (($thumbw - $width) / 2);
+			$deltah = (int) (($thumbh - $height) / 2);
 			$dst_img = @ImageCreateTrueColor($thumbw, $thumbh);
             		@imagealphablending($dst_img, false);
 		        @imagesavealpha($dst_img, true);
@@ -360,8 +360,8 @@ 
                 $height = $thumbh;
             } else {
                 $scale = ($this->width > 0 && $this->height > 0) ? min($thumbw / $this->width, $thumbh / $this->height) : 0;
-                $width  = (int)($this->width * $scale);
-                $height = (int)($this->height * $scale);
+                $width  = (int) ($this->width * $scale);
+                $height = (int) ($this->height * $scale);
             }
 			$deltaw = 0;
 			$deltah = 0;
@@ -419,7 +419,7 @@ 
 	public function send_image($file = '', $compress = -1, $convert_file_to = null)
     {
 	    if (!$this->image_validated) return false;
-        $compress = (int)$compress;
+        $compress = (int) $compress;
         $type = $this->type;
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
             $type = $convert_file_to;
@@ -463,11 +463,11 @@ 
          * so that we can use black (0,0,0) as transparent, which is what
          * the image is filled with when created.
          */
-        $transparent = imagecolorallocate($dest_img, 0,0,0);
+        $transparent = imagecolorallocate($dest_img, 0, 0, 0);
         imagealphablending($dest_img, false);
         imagesavealpha($dest_img, true);
         imagecolortransparent($dest_img, $transparent);
-        imagecopy($dest_img, $this->bg, 0,0, 0, 0,imagesx($this->bg), imagesx($this->bg));
+        imagecopy($dest_img, $this->bg, 0, 0, 0, 0, imagesx($this->bg), imagesx($this->bg));
         imagefilter($dest_img, IMG_FILTER_GRAYSCALE);
         $this->bg = $dest_img;