chamilo / chamilo-lms

main/inc/lib/phpseclib/Net/SFTP.php

Indentation +4 added lines, -4 removed lines

@@ -413,8 +413,8 @@ 
         if ($response === false) {
             // from PuTTY's psftp.exe
             $command = "test -x /usr/lib/sftp-server && exec /usr/lib/sftp-server\n" .
-                       "test -x /usr/local/lib/sftp-server && exec /usr/local/lib/sftp-server\n" .
-                       "exec sftp-server";
+                        "test -x /usr/local/lib/sftp-server && exec /usr/local/lib/sftp-server\n" .
+                        "exec sftp-server";
             // we don't do $this->exec($command, false) because exec() operates on a different channel and plus the SSH_MSG_CHANNEL_OPEN that exec() does
             // is redundant
             $packet = pack('CNNa*CNa*',
@@ -2055,7 +2055,7 @@ 
 
         if (defined('NET_SFTP_LOGGING')) {
             $packet_type = '-> ' . $this->packet_types[$type] . 
-                           ' (' . round($stop - $start, 4) . 's)';
+                            ' (' . round($stop - $start, 4) . 's)';
             if (NET_SFTP_LOGGING == NET_SFTP_LOG_REALTIME) {
                 echo "<pre>\r\n" . $this->_format_log(array($data), array($packet_type)) . "\r\n</pre>\r\n";
                 flush();
@@ -2131,7 +2131,7 @@ 
 
         if (defined('NET_SFTP_LOGGING')) {
             $packet_type = '<- ' . $this->packet_types[$this->packet_type] . 
-                           ' (' . round($stop - $start, 4) . 's)';
+                            ' (' . round($stop - $start, 4) . 's)';
             if (NET_SFTP_LOGGING == NET_SFTP_LOG_REALTIME) {
                 echo "<pre>\r\n" . $this->_format_log(array($packet), array($packet_type)) . "\r\n</pre>\r\n";
                 flush();

main/inc/lib/phpseclib/Net/SSH1.php

Indentation +6 added lines, -6 removed lines

@@ -1364,12 +1364,12 @@
                 }
                 $fragment = $this->_string_shift($current_log, $short_width);
                 $hex = substr(
-                           preg_replace(
-                               '#(.)#es',
-                               '"' . $boundary . '" . str_pad(dechex(ord(substr("\\1", -1))), 2, "0", STR_PAD_LEFT)',
-                               $fragment),
-                           strlen($boundary)
-                       );
+                            preg_replace(
+                                '#(.)#es',
+                                '"' . $boundary . '" . str_pad(dechex(ord(substr("\\1", -1))), 2, "0", STR_PAD_LEFT)',
+                                $fragment),
+                            strlen($boundary)
+                        );
                 // replace non ASCII printable characters with dots
                 // http://en.wikipedia.org/wiki/ASCII#ASCII_printable_characters
                 // also replace < with a . since < messes up the output on web browsers

main/inc/lib/phpseclib/Net/SCP.php

Indentation +3 added lines, -4 removed lines

@@ -18,7 +18,6 @@ 
  *    if (!$ssh->login('username', 'password')) {
  *        exit('bad login');
  *    }
-
  *    $scp = new Net_SCP($ssh);
  *    $scp->put('abcd', str_repeat('x', 1024*1024));
  * ?>
@@ -284,7 +283,7 @@ 
             case NET_SCP_SSH1:
                 $data = pack('CNa*', NET_SSH1_CMSG_STDIN_DATA, strlen($data), $data);
                 $this->ssh->_send_binary_packet($data);
-         }
+            }
     }
 
     /**
@@ -320,7 +319,7 @@ 
                             return false;
                     }
                 }
-         }
+            }
     }
 
     /**
@@ -336,6 +335,6 @@ 
                 break;
             case NET_SCP_SSH1:
                 $this->ssh->disconnect();
-         }
+            }
     }
 }

main/inc/lib/sortable_table.class.php

Indentation +5 added lines, -5 removed lines

@@ -339,9 +339,9 @@ 
     }
 
     /**
-    * This function shows the content of a table in a grid.
-    * Should not be use to edit information (edit/delete rows) only.
-    **/
+     * This function shows the content of a table in a grid.
+     * Should not be use to edit information (edit/delete rows) only.
+     **/
     public function display_grid()
     {
 
@@ -790,7 +790,7 @@ 
                 //$param[$tablename.'_direction'] = $_GET[$tablename.'_direction'];
                 $my_get_direction = $_GET[$tablename.'_direction'];
                 if (!in_array($my_get_direction, array('ASC', 'DESC'))) {
-                     $param[$tablename.'_direction'] =  'ASC';
+                        $param[$tablename.'_direction'] =  'ASC';
                 } else {
                     $param[$tablename.'_direction'] = $my_get_direction;
                 }
@@ -917,7 +917,7 @@ 
         if (is_array($row)) {
             foreach ($row as & $value) {
                 if (empty($value)) {
-                     $value = '-';
+                        $value = '-';
                 }
             }
         }

main/inc/lib/grade_model.lib.php

Indentation +17 added lines, -17 removed lines

@@ -50,15 +50,15 @@ 
     /**
      * Displays the title + grid
      */
-	public function display()
+    public function display()
     {
-		// action links
-		echo '<div class="actions" style="margin-bottom:20px">';
+        // action links
+        echo '<div class="actions" style="margin-bottom:20px">';
         echo '<a href="grade_models.php">'.Display::return_icon('back.png',get_lang('Back'),'','32').'</a>';
-		echo '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png',get_lang('Add'),'','32').'</a>';
-		echo '</div>';
+        echo '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png',get_lang('Add'),'','32').'</a>';
+        echo '</div>';
         echo Display::grid_html('grade_model');
-	}
+    }
 
     /**
      * Returns a Form validator Obj
@@ -115,7 +115,7 @@ 
         }
 
         $form->addElement('hidden', 'maxvalue', '100');
-		$form->addElement('hidden', 'minvalue', '0');
+        $form->addElement('hidden', 'minvalue', '0');
         $renderer = & $form->defaultRenderer();
 
         $component_array = array();
@@ -127,7 +127,7 @@ 
             $form->addElement('text', 'components['.$i.'][title]',      null);
             $form->addElement('hidden', 'components['.$i.'][id]',       null);
 
-             $template_percentage =
+                $template_percentage =
             '<div id=' . $i . ' style="display: '.(($i<=$nr_items)?'inline':'none').';" class="control-group">
                 <p>
                 <label class="control-label">{label}</label>
@@ -192,7 +192,7 @@ 
         // Setting the rules
         $form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
 
-		return $form;
+        return $form;
     }
 
     public function get_components($id)
@@ -206,8 +206,8 @@ 
 
     public function save($params, $show_query = false)
     {
-	    $id = parent::save($params, $show_query);
-	    if (!empty($id)) {
+        $id = parent::save($params, $show_query);
+        if (!empty($id)) {
             foreach ($params['components'] as $component) {
                 if (!empty($component['title']) && !empty($component['percentage']) && !empty($component['acronym'])) {
                     $obj = new GradeModelComponents();
@@ -218,7 +218,7 @@ 
         }
 
         //event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
-   		return $id;
+            return $id;
     }
 
     /**
@@ -244,8 +244,8 @@ 
 
     public function delete($id)
     {
-	    parent::delete($id);
-	    //event_system(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+        parent::delete($id);
+        //event_system(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
     }
 
     public function fill_grade_model_select_in_form(&$form, $name = 'gradebook_model_id', $default_value = null)
@@ -290,14 +290,14 @@ 
     public $table;
     public $columns = array('id', 'title', 'percentage', 'acronym', 'grade_model_id');
 
-	public function __construct()
+    public function __construct()
     {
         $this->table =  Database::get_main_table(TABLE_GRADE_MODEL_COMPONENTS);
-	}
+    }
 
     public function save($params, $show_query = false)
     {
-	    $id = parent::save($params, $show_query);
+        $id = parent::save($params, $show_query);
         return $id;
     }
 }

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/online.inc.php

Indentation +159 added lines, -159 removed lines

@@ -166,10 +166,10 @@ 
  */
 function LoginDelete($user_id)
 {
-	$online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    $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";
-	Database::query($query);
+    $query = "DELETE FROM " . $online_table . " WHERE login_user_id = $user_id";
+    Database::query($query);
 }
 
 /**
@@ -178,17 +178,17 @@ 
  */
 function user_is_online($user_id)
 {
-	$track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
-	$table_user = Database::get_main_table(TABLE_MAIN_USER);
+    $track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    $table_user = Database::get_main_table(TABLE_MAIN_USER);
 
-	$access_url_id = api_get_current_access_url_id();
-	$time_limit = api_get_setting('time_limit_whosonline');
+    $access_url_id = api_get_current_access_url_id();
+    $time_limit = api_get_setting('time_limit_whosonline');
 
     $online_time = time() - $time_limit*60;
     $limit_date = api_get_utc_datetime($online_time);
     $user_id = intval($user_id);
 
-	$query = " SELECT login_user_id,login_date
+    $query = " SELECT login_user_id,login_date
                FROM $track_online_table track
                INNER JOIN $table_user u ON (u.id=track.login_user_id)
                WHERE
@@ -197,13 +197,13 @@ 
                     u.id =  $user_id
                LIMIT 1 ";
 
-	$result = Database::query($query);
-	if (Database::num_rows($result)) {
+    $result = Database::query($query);
+    if (Database::num_rows($result)) {
 
-		return true;
-	}
+        return true;
+    }
 
-	return false;
+    return false;
 
 }
 /**
@@ -239,13 +239,13 @@ 
 
     $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);
-	$friend_user_table = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
-	$table_user	= Database::get_main_table(TABLE_MAIN_USER);
+    $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);
 
-	if ($friends) {
-		// 	who friends from social network is online
-		$query = "SELECT DISTINCT login_user_id, login_date
+    if ($friends) {
+        // 	who friends from social network is online
+        $query = "SELECT DISTINCT login_user_id, login_date
 				  FROM $track_online_table INNER JOIN $friend_user_table
 				  ON (friend_user_id = login_user_id)
 				  WHERE
@@ -255,21 +255,21 @@ 
                     user_id = '".api_get_user_id()."'
                   ORDER BY $column $direction
                   LIMIT $from, $number_of_items";
-	} else {
-		$query = "SELECT DISTINCT login_user_id, login_date
+    } 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)
                   WHERE u.status != ".ANONYMOUS." AND login_date >= '".$current_date."'
                   ORDER BY $column $direction
                   LIMIT $from, $number_of_items";
-	}
-
-	if (api_get_multiple_access_url()) {
-		$access_url_id = api_get_current_access_url_id();
-		if ($access_url_id != -1) {
-			if ($friends) {
-				// 	friends from social network is online
-				$query = "SELECT distinct login_user_id, login_date
+    }
+
+    if (api_get_multiple_access_url()) {
+        $access_url_id = api_get_current_access_url_id();
+        if ($access_url_id != -1) {
+            if ($friends) {
+                // 	friends from social network is online
+                $query = "SELECT distinct login_user_id, login_date
 							FROM $track_online_table track INNER JOIN $friend_user_table
 							ON (friend_user_id = login_user_id)
 							WHERE   track.access_url_id =  $access_url_id AND
@@ -278,9 +278,9 @@ 
                                     relation_type='".USER_RELATION_TYPE_FRIEND."'
                             ORDER BY $column $direction
                             LIMIT $from, $number_of_items";
-			} else {
-				// all users online
-				$query = "SELECT login_user_id, login_date
+            } else {
+                // all users online
+                $query = "SELECT login_user_id, login_date
 						  FROM ".$track_online_table ." track
                           INNER JOIN ".$table_user ." u
                           ON (u.id=track.login_user_id)
@@ -288,26 +288,26 @@ 
                                 login_date >= '".$current_date."'
                           ORDER BY $column $direction
                           LIMIT $from, $number_of_items";
-			}
-		}
-	}
+            }
+        }
+    }
 
-	//This query will show all registered users. Only for dev purposes.
-	/*$query = "SELECT DISTINCT u.id as login_user_id, login_date FROM ".$track_online_table ."  e , $table_user u
+    //This query will show all registered users. Only for dev purposes.
+    /*$query = "SELECT DISTINCT u.id as login_user_id, login_date FROM ".$track_online_table ."  e , $table_user u
             GROUP by u.id
             ORDER BY $column $direction
             LIMIT $from, $number_of_items";*/
 
-	$result = Database::query($query);
-	if ($result) {
-		$users_online = array();
-		while (list($login_user_id, $login_date) = Database::fetch_row($result)) {
+    $result = Database::query($query);
+    if ($result) {
+        $users_online = array();
+        while (list($login_user_id, $login_date) = Database::fetch_row($result)) {
             $users_online[] = $login_user_id;
-		}
-		return $users_online;
-	} else {
-		return false;
-	}
+        }
+        return $users_online;
+    } else {
+        return false;
+    }
 }
 
 function who_is_online_count($time_limit = null, $friends = false)
@@ -317,15 +317,15 @@ 
     } else {
         $time_limit = intval($time_limit);
     }
-	$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);
-	$online_time = time() - $time_limit * 60;
-	$current_date = api_get_utc_datetime($online_time);
-
-	if ($friends) {
-		// 	who friends from social network is online
-		$query = "SELECT DISTINCT count(login_user_id) as count
+    $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);
+    $online_time = time() - $time_limit * 60;
+    $current_date = api_get_utc_datetime($online_time);
+
+    if ($friends) {
+        // 	who friends from social network is online
+        $query = "SELECT DISTINCT count(login_user_id) as count
 				  FROM $track_online_table INNER JOIN $friend_user_table
                   ON (friend_user_id = login_user_id)
 				  WHERE
@@ -333,20 +333,20 @@ 
 				        friend_user_id <> '".api_get_user_id()."' AND
 				        relation_type='".USER_RELATION_TYPE_FRIEND."' AND
 				        user_id = '".api_get_user_id()."' ";
-	} else {
-		// All users online
-		$query = "SELECT count(login_id) as count
+    } else {
+        // All users online
+        $query = "SELECT count(login_id) as count
                   FROM $track_online_table track INNER JOIN $table_user u
                   ON (u.id=track.login_user_id)
                   WHERE u.status != ".ANONYMOUS." AND login_date >= '$current_date'  ";
-	}
-
-	if (api_get_multiple_access_url()) {
-		$access_url_id = api_get_current_access_url_id();
-		if ($access_url_id != -1) {
-			if ($friends) {
-				// 	friends from social network is online
-				$query = "SELECT DISTINCT count(login_user_id) as count
+    }
+
+    if (api_get_multiple_access_url()) {
+        $access_url_id = api_get_current_access_url_id();
+        if ($access_url_id != -1) {
+            if ($friends) {
+                // 	friends from social network is online
+                $query = "SELECT DISTINCT count(login_user_id) as count
 							FROM $track_online_table track
 							INNER JOIN $friend_user_table ON (friend_user_id = login_user_id)
 							WHERE
@@ -354,29 +354,29 @@ 
 							    login_date >= '".$current_date."' AND
 							    friend_user_id <> '".api_get_user_id()."' AND
 							    relation_type='".USER_RELATION_TYPE_FRIEND."'  ";
-			} else {
-				// all users online
-				$query = "SELECT count(login_id) as count FROM $track_online_table  track
+            } else {
+                // all users online
+                $query = "SELECT count(login_id) as count 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' ";
-			}
-		}
-	}
+            }
+        }
+    }
 
     // Dev purposes show all users online
     /*$table_user = Database::get_main_table(TABLE_MAIN_USER);
     $query = "SELECT count(*)  as count FROM ".$table_user;*/
 
-	$result = Database::query($query);
-	if (Database::num_rows($result) > 0) {
-		$row = Database::fetch_array($result);
-		return $row['count'];
-	} else {
-		return false;
-	}
+    $result = Database::query($query);
+    if (Database::num_rows($result) > 0) {
+        $row = Database::fetch_array($result);
+        return $row['count'];
+    } else {
+        return false;
+    }
 }
 
 
@@ -389,7 +389,7 @@ 
 */
 function who_is_online_in_this_course($from, $number_of_items, $uid, $time_limit, $course_code)
 {
-	if (empty($course_code)) return false;
+    if (empty($course_code)) return false;
 
     if (empty($time_limit)) {
         $time_limit = api_get_setting('time_limit_whosonline');
@@ -401,56 +401,56 @@ 
     $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);
-	$courseInfo = api_get_course_info($course_code);
-	$courseId = $courseInfo['real_id'];
+    $courseInfo = api_get_course_info($course_code);
+    $courseId = $courseInfo['real_id'];
 
     $from = intval($from);
     $number_of_items = intval($number_of_items);
 
-	$query = "SELECT login_user_id, login_date FROM $track_online_table
+    $query = "SELECT login_user_id, login_date FROM $track_online_table
               WHERE login_user_id <> 2 AND c_id = $courseId AND login_date >= '$current_date'
               LIMIT $from, $number_of_items ";
 
-	$result = Database::query($query);
-	if ($result) {
-		$users_online = array();
+    $result = Database::query($query);
+    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;
-	} else {
-		return false;
-	}
+        }
+        return $users_online;
+    } else {
+        return false;
+    }
 }
 
 function who_is_online_in_this_course_count($uid, $time_limit, $coursecode=null)
 {
-	if (empty($coursecode)) {
-		return false;
-	}
-	$track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
-	$coursecode = Database::escape_string($coursecode);
-	$time_limit = Database::escape_string($time_limit);
+    if (empty($coursecode)) {
+        return false;
+    }
+    $track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    $coursecode = Database::escape_string($coursecode);
+    $time_limit = Database::escape_string($time_limit);
 
     $online_time = time() - $time_limit * 60;
     $current_date = api_get_utc_datetime($online_time);
-	$courseId = api_get_course_int_id($coursecode);
+    $courseId = api_get_course_int_id($coursecode);
 
-	if (empty($courseId)) {
-		return false;
-	}
+    if (empty($courseId)) {
+        return false;
+    }
 
-	$query = "SELECT count(login_user_id) as count
+    $query = "SELECT count(login_user_id) as count
               FROM $track_online_table
               WHERE login_user_id <> 2 AND c_id = $courseId AND login_date >= '$current_date' ";
-	$result = Database::query($query);
-	if (Database::num_rows($result) > 0) {
-		$row = Database::fetch_array($result);
-		return $row['count'];
-	} else {
-		return false;
-	}
+    $result = Database::query($query);
+    if (Database::num_rows($result) > 0) {
+        $row = Database::fetch_array($result);
+        return $row['count'];
+    } else {
+        return false;
+    }
 }
 
 /**
@@ -460,17 +460,17 @@ 
  * @deprecated user api_get_user_info($user_id)
  */
 function GetFullUserName($uid) {
-	$uid = (int) $uid;
-	$uid = intval($uid);
-	$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)) {
-			$str = str_replace(' ', '&nbsp;', api_get_person_name($firstname, $lastname));
-			return $str;
-		}
-	}
+    $uid = (int) $uid;
+    $uid = intval($uid);
+    $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)) {
+            $str = str_replace(' ', '&nbsp;', api_get_person_name($firstname, $lastname));
+            return $str;
+        }
+    }
 }
 
 /**
@@ -482,44 +482,44 @@ 
     $_cid = api_get_course_id();
     $_user = api_get_user_info();
 
-	if (!$_user['user_id']) {
-		return (false);
-	}
+    if (!$_user['user_id']) {
+        return (false);
+    }
     $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
+    $track_user_table = Database::get_main_table(TABLE_MAIN_USER);
+    $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);
-
-	$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"));
-
-	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")
-				."</a>"
-				."&nbsp;&nbsp;|&nbsp;&nbsp;"
-				."<a href=\"".api_get_path(WEB_PATH)."webchatdeny.php\">"
-				. get_lang("No")
-				."</a>"
-				."</p>";
-
-		return($message);
-	} else {
-		return false;
-	}
+    $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"));
+
+    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")
+                ."</a>"
+                ."&nbsp;&nbsp;|&nbsp;&nbsp;"
+                ."<a href=\"".api_get_path(WEB_PATH)."webchatdeny.php\">"
+                . get_lang("No")
+                ."</a>"
+                ."</p>";
+
+        return($message);
+    } else {
+        return false;
+    }
 }

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()."))
                         )";
                     }

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')
 );