chamilo / chamilo-lms

main/admin/inactive_user_list.php

Indentation +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
     @author Andre Boivin base code
 	@author Julio Montoya fixing lot of little details
 	@todo this script is not ready for a production use that's why I'm commenting the function delete_inactive_student
-
-*	@package chamilo.admin
+ *	@package chamilo.admin
 *	script pour effacer les user inactif depuis x temps
 */
 $cidReset = true;

main/admin/event_controller.php

Indentation +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     }
 
     public function deleteAction($id) {
-         $event_email_template = new EventEmailTemplate();
+            $event_email_template = new EventEmailTemplate();
         return $event_email_template->delete($id);
     }
 }
@@ -73,7 +73,7 @@ 
                         array('name'=>'language_id',        'index'=>'language_id',        'width'=>'80',   'align'=>'left'),
                         array('name'=>'activated',        'index'=>'activated',        'width'=>'80',   'align'=>'left'),
                         array('name'=>'actions',        'index'=>'actions',     'width'=>'100')
-                       );
+                        );
 //Autowidth
 $extra_params['autowidth'] = 'true';
 //height auto

main/admin/ldap_users_list.php

Indentation +132 added lines, -132 removed lines

@@ -20,7 +20,7 @@ 
 // Login as ...
 if ($action == "login_as" && !empty ($login_as_user_id))
 {
-	login_user($login_as_user_id);
+    login_user($login_as_user_id);
 }
 
 //if we already have a session id and a user...
@@ -37,150 +37,150 @@ 
 
 if (isset ($_GET['action']))
 {
-	$check = Security::check_token('get');
-	if($check)
-	{
-		switch ($_GET['action'])
-		{
-			case 'show_message' :
-				Display :: display_header($tool_name);
-				Display :: display_normal_message($_GET['message']);
-				break;
-			case 'delete_user' :
-				Display :: display_header($tool_name);
-				if ($user_id != $_user['user_id'] && UserManager :: delete_user($_GET['user_id']))
-				{
-					Display :: display_normal_message(get_lang('UserDeleted'));
-				}
-				else
-				{
-					Display :: display_error_message(get_lang('CannotDeleteUser'));
-				}
-				break;
-			case 'lock' :
-				Display :: display_header($tool_name);
-				$message=lock_unlock_user('lock',$_GET['user_id']);
-				Display :: display_normal_message($message);
-				break;
-			case 'unlock';
-				Display :: display_header($tool_name);
-				$message=lock_unlock_user('unlock',$_GET['user_id']);
-				Display :: display_normal_message($message);
-				break;
-			case 'add_user';
-				$id=$_GET['id'];
-				$UserList=array();
-				$userid_match_login = array();
-				foreach ($id as $user_id) {
-					$tmp = ldap_add_user($user_id);
-					$UserList[]= $tmp;
-					$userid_match_login[$tmp] = $user_id;
-				}
-				if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session']>0)) {
-					ldap_add_user_to_session($UserList, $_GET['id_session']);
-					header('Location: resume_session.php?id_session='.$_GET['id_session']);
-				} else {
-					Display :: display_header($tool_name);
-					if(count($userid_match_login)>0)
-					{
-						$message=get_lang('LDAPUsersAddedOrUpdated').':<br />';
-						foreach($userid_match_login as $user_id => $login)
-						{
-							$message .= '- '.$login.'<br />';
-						}
-					}
-					else
-					{
-						$message=get_lang('NoUserAdded');
-					}
-					Display :: display_normal_message($message,false);
-				}
-				break;
-			default :
-				Display :: display_header($tool_name);
-		}
-		Security::clear_token();
-	}
-	else
-	{
-		Display::display_header($tool_name);
-	}
+    $check = Security::check_token('get');
+    if($check)
+    {
+        switch ($_GET['action'])
+        {
+            case 'show_message' :
+                Display :: display_header($tool_name);
+                Display :: display_normal_message($_GET['message']);
+                break;
+            case 'delete_user' :
+                Display :: display_header($tool_name);
+                if ($user_id != $_user['user_id'] && UserManager :: delete_user($_GET['user_id']))
+                {
+                    Display :: display_normal_message(get_lang('UserDeleted'));
+                }
+                else
+                {
+                    Display :: display_error_message(get_lang('CannotDeleteUser'));
+                }
+                break;
+            case 'lock' :
+                Display :: display_header($tool_name);
+                $message=lock_unlock_user('lock',$_GET['user_id']);
+                Display :: display_normal_message($message);
+                break;
+            case 'unlock';
+                Display :: display_header($tool_name);
+                $message=lock_unlock_user('unlock',$_GET['user_id']);
+                Display :: display_normal_message($message);
+                break;
+            case 'add_user';
+                $id=$_GET['id'];
+                $UserList=array();
+                $userid_match_login = array();
+                foreach ($id as $user_id) {
+                    $tmp = ldap_add_user($user_id);
+                    $UserList[]= $tmp;
+                    $userid_match_login[$tmp] = $user_id;
+                }
+                if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session']>0)) {
+                    ldap_add_user_to_session($UserList, $_GET['id_session']);
+                    header('Location: resume_session.php?id_session='.$_GET['id_session']);
+                } else {
+                    Display :: display_header($tool_name);
+                    if(count($userid_match_login)>0)
+                    {
+                        $message=get_lang('LDAPUsersAddedOrUpdated').':<br />';
+                        foreach($userid_match_login as $user_id => $login)
+                        {
+                            $message .= '- '.$login.'<br />';
+                        }
+                    }
+                    else
+                    {
+                        $message=get_lang('NoUserAdded');
+                    }
+                    Display :: display_normal_message($message,false);
+                }
+                break;
+            default :
+                Display :: display_header($tool_name);
+        }
+        Security::clear_token();
+    }
+    else
+    {
+        Display::display_header($tool_name);
+    }
 }
 else
 {
-	Display::display_header($tool_name);
+    Display::display_header($tool_name);
 }
 if (isset ($_POST['action']))
 {
-	$check = Security::check_token('get');
-	if($check)
-	{
-		switch ($_POST['action'])
-		{
-			case 'delete' :
-				$number_of_selected_users = count($_POST['id']);
-				$number_of_deleted_users = 0;
-				foreach ($_POST['id'] as $index => $user_id)
-				{
-					if($user_id != $_user['user_id'])
-					{
-						if(UserManager :: delete_user($user_id))
-						{
-							$number_of_deleted_users++;
-						}
-					}
-				}
-				if($number_of_selected_users == $number_of_deleted_users)
-				{
-					Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
-				}
-				else
-				{
-					Display :: display_error_message(get_lang('SomeUsersNotDeleted'));
-				}
-				break;
-			case 'add_user' :
-				$number_of_selected_users = count($_POST['id']);
-				$number_of_added_users = 0;
-				$UserList=array();
-				foreach ($_POST['id'] as $index => $user_id)
-				{
-					if($user_id != $_user['user_id'])
-					{
-						$UserList[] = ldap_add_user($user_id);
-					}
-				}
-				if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
-					addUserToSession($UserList, $_GET['id_session']);
-				if(count($UserList)>0)
-				{
-					Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
-				}
-				else
-				{
-					Display :: display_normal_message(get_lang('NoUserAdded'));
-				}
-				break;
+    $check = Security::check_token('get');
+    if($check)
+    {
+        switch ($_POST['action'])
+        {
+            case 'delete' :
+                $number_of_selected_users = count($_POST['id']);
+                $number_of_deleted_users = 0;
+                foreach ($_POST['id'] as $index => $user_id)
+                {
+                    if($user_id != $_user['user_id'])
+                    {
+                        if(UserManager :: delete_user($user_id))
+                        {
+                            $number_of_deleted_users++;
+                        }
+                    }
+                }
+                if($number_of_selected_users == $number_of_deleted_users)
+                {
+                    Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
+                }
+                else
+                {
+                    Display :: display_error_message(get_lang('SomeUsersNotDeleted'));
+                }
+                break;
+            case 'add_user' :
+                $number_of_selected_users = count($_POST['id']);
+                $number_of_added_users = 0;
+                $UserList=array();
+                foreach ($_POST['id'] as $index => $user_id)
+                {
+                    if($user_id != $_user['user_id'])
+                    {
+                        $UserList[] = ldap_add_user($user_id);
+                    }
+                }
+                if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
+                    addUserToSession($UserList, $_GET['id_session']);
+                if(count($UserList)>0)
+                {
+                    Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
+                }
+                else
+                {
+                    Display :: display_normal_message(get_lang('NoUserAdded'));
+                }
+                break;
 
-		}
-		Security::clear_token();
-	}
+        }
+        Security::clear_token();
+    }
 }
 
 $form = new FormValidator('advanced_search','get');
 $form->addText('keyword_username',get_lang('LoginName'),false);
 if (api_is_western_name_order())
 {
-	$form->addText('keyword_firstname', get_lang('FirstName'), false);
-	$form->addText('keyword_lastname', get_lang('LastName'), false);
+    $form->addText('keyword_firstname', get_lang('FirstName'), false);
+    $form->addText('keyword_lastname', get_lang('LastName'), false);
 }
 else
 {
-	$form->addText('keyword_lastname',get_lang('LastName'),false);
-	$form->addText('keyword_firstname',get_lang('FirstName'),false);
+    $form->addText('keyword_lastname',get_lang('LastName'),false);
+    $form->addText('keyword_firstname',get_lang('FirstName'),false);
 }
 if (isset($_GET['id_session']))
-	$form->addElement('hidden','id_session',$_GET['id_session']);
+    $form->addElement('hidden','id_session',$_GET['id_session']);
 
 $type = array();
 $type["all"] = get_lang('All');
@@ -202,7 +202,7 @@ 
 $parameters['keyword_lastname'] = @$_GET['keyword_lastname'] ?: null;
 $parameters['keyword_email'] = @$_GET['keyword_email'] ?: null;
 if (isset($_GET['id_session']))
-	$parameters['id_session'] = $_GET['id_session'];
+    $parameters['id_session'] = $_GET['id_session'];
 // Create a sortable table with user-data
 
 $parameters['sec_token'] = Security::get_token();
@@ -212,13 +212,13 @@ 
 $table->set_header(1, get_lang('LoginName'));
 if (api_is_western_name_order())
 {
-	$table->set_header(2, get_lang('FirstName'));
-	$table->set_header(3, get_lang('LastName'));
+    $table->set_header(2, get_lang('FirstName'));
+    $table->set_header(3, get_lang('LastName'));
 }
 else
 {
-	$table->set_header(2, get_lang('LastName'));
-	$table->set_header(3, get_lang('FirstName'));
+    $table->set_header(2, get_lang('LastName'));
+    $table->set_header(3, get_lang('FirstName'));
 }
 $table->set_header(4, get_lang('Email'));
 $table->set_header(5, get_lang('Actions'));

main/admin/course_create_content.php

Indentation +7 added lines, -7 removed lines

@@ -15,15 +15,15 @@
 Display::display_header($tool_name);
 //api_display_tool_title($tool_name);
 if (api_get_setting('server_type') != 'test') {
-	echo get_lang('DummyCourseOnlyOnTestServer');
+    echo get_lang('DummyCourseOnlyOnTestServer');
 } elseif( isset($_POST['action'])) {
-	require_once('../coursecopy/classes/DummyCourseCreator.class.php');
-	$dcc = new DummyCourseCreator();
-	$dcc->create_dummy_course($_POST['course_code']);
-	echo get_lang('Done');
+    require_once('../coursecopy/classes/DummyCourseCreator.class.php');
+    $dcc = new DummyCourseCreator();
+    $dcc->create_dummy_course($_POST['course_code']);
+    echo get_lang('Done');
 } else {
-	echo get_lang('DummyCourseDescription');
-	echo '<form method="post"><input type="hidden" name="course_code" value="'.Security::remove_XSS($_GET['course_code']).'"/><input type="submit" name="action" value="'.get_lang('Ok').'"/></form>';
+    echo get_lang('DummyCourseDescription');
+    echo '<form method="post"><input type="hidden" name="course_code" value="'.Security::remove_XSS($_GET['course_code']).'"/><input type="submit" name="action" value="'.get_lang('Ok').'"/></form>';
 }
 
 Display::display_footer();

main/mySpace/progression.php

Indentation +27 added lines, -27 removed lines

@@ -33,36 +33,36 @@
 $result_course = Database::query($sql_course);
 
 if (Database::num_rows($result_course) > 0) {
-	if (isset($_POST['export'])) {
-		$export_result = export_csv($header, $data, 'test.csv'); // TODO: There is no data for exporting yet.
-		Display :: display_error_message($export_result);
-	}
-	echo '<table class="data_table"><tr><th>'.get_lang('Course').'</th><th>'.get_lang('TempsFrequentation').'</th><th>'.get_lang('Progression').'</th><th>'.get_lang('MoyenneTest').'</th></tr>';
-	$header = array(get_lang('Course', ''), get_lang('TempsFrequentation', ''), get_lang('Progression', ''), get_lang('MoyenneTest', ''));
-	while ($a_course = Database::fetch_array($result_course)) {
-		// TODO: This query is to be checked, there are no HotPotatoes tests results.
-		$sql_moy_test = "SELECT exe_result,exe_weighting
+    if (isset($_POST['export'])) {
+        $export_result = export_csv($header, $data, 'test.csv'); // TODO: There is no data for exporting yet.
+        Display :: display_error_message($export_result);
+    }
+    echo '<table class="data_table"><tr><th>'.get_lang('Course').'</th><th>'.get_lang('TempsFrequentation').'</th><th>'.get_lang('Progression').'</th><th>'.get_lang('MoyenneTest').'</th></tr>';
+    $header = array(get_lang('Course', ''), get_lang('TempsFrequentation', ''), get_lang('Progression', ''), get_lang('MoyenneTest', ''));
+    while ($a_course = Database::fetch_array($result_course)) {
+        // TODO: This query is to be checked, there are no HotPotatoes tests results.
+        $sql_moy_test = "SELECT exe_result,exe_weighting
 			FROM $tbl_track_exercice
 			WHERE c_id = ".$a_course['id'];
-		$result_moy_test = Database::query($sql_moy_test);
-		$result = 0;
-		$weighting = 0;
-		while ($moy_test = Database::fetch_array($result_moy_test)) {
-			$result = $result + $moy_test['exe_result'];
-			$weighting = $weighting + $moy_test['exe_weighting'];
-		}
-		if ($weighting != 0) {
-			$moyenne_test = round(($result * 100) / $weighting);
-		} else {
-			$moyenne_test = null;
-		}
-		echo '<tr><td>'.$a_course['title'].'</td><td> </td><td> </td><td>'.(is_null($moyenne_test) ? '' : $moyenne_test.'%').'</td> </tr>';
-	}
-	echo '</table>';
-	echo "<br /><br />";
-	echo "<form method='post'><input type='submit' name='export' value='".get_lang('ExportExcel')."'/><form>";
+        $result_moy_test = Database::query($sql_moy_test);
+        $result = 0;
+        $weighting = 0;
+        while ($moy_test = Database::fetch_array($result_moy_test)) {
+            $result = $result + $moy_test['exe_result'];
+            $weighting = $weighting + $moy_test['exe_weighting'];
+        }
+        if ($weighting != 0) {
+            $moyenne_test = round(($result * 100) / $weighting);
+        } else {
+            $moyenne_test = null;
+        }
+        echo '<tr><td>'.$a_course['title'].'</td><td> </td><td> </td><td>'.(is_null($moyenne_test) ? '' : $moyenne_test.'%').'</td> </tr>';
+    }
+    echo '</table>';
+    echo "<br /><br />";
+    echo "<form method='post'><input type='submit' name='export' value='".get_lang('ExportExcel')."'/><form>";
 } else {
-	echo get_lang('NoCourse');
+    echo get_lang('NoCourse');
 }
 
 Display :: display_footer();

main/inc/lib/pdf.lib.php

Indentation -1 removed lines

@@ -16,7 +16,6 @@
  * @author Patrick Cool
  * @author René Haentjens, added CSV file import (October 2004)
  * @package chamilo.link
-
  */
 
 // Including libraries

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

Indentation +401 added lines, -401 removed lines

@@ -56,522 +56,522 @@
     const VIDEO_VP6    = 4;
 
 
-	public function Analyze()
-	{
-	    $info = &$this->getid3->info;
-
-	    $info['flv'] = array ();
-	    $info_flv = &$info['flv'];
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-
-		$flv_data_length = $info['avdataend'] - $info['avdataoffset'];
-		$flv_header = fread($this->getid3->fp, 5);
-
-		$info['fileformat'] = 'flv';
-		$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));
-
-		$info_flv['header']['hasAudio'] = (bool) ($type_flags & 0x04);
-		$info_flv['header']['hasVideo'] = (bool) ($type_flags & 0x01);
-
-		$frame_size_data_length = getid3_lib::BigEndian2Int(fread($this->getid3->fp, 4));
-		$flv_header_frame_length = 9;
-		if ($frame_size_data_length > $flv_header_frame_length) {
-			fseek($this->getid3->fp, $frame_size_data_length - $flv_header_frame_length, SEEK_CUR);
-		}
-
-		$duration = 0;
-		while ((ftell($this->getid3->fp) + 1) < $info['avdataend']) {
-
-			$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));
-			$last_header_byte    = getid3_lib::BigEndian2Int(substr($this_tag_header, 15, 1));
-			$next_offset         = ftell($this->getid3->fp) - 1 + $data_length;
-
-			switch ($tag_type) {
-
-				case getid3_flv::TAG_AUDIO:
-					if (!isset($info_flv['audio']['audioFormat'])) {
-						$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;
-					}
-					break;
-
-
-				case getid3_flv::TAG_VIDEO:
-					if (!isset($info_flv['video']['videoCodec'])) {
-						$info_flv['video']['videoCodec'] = $last_header_byte & 0x07;
-
-						$flv_video_header = fread($this->getid3->fp, 11);
-
-						if ($info_flv['video']['videoCodec'] != getid3_flv::VIDEO_VP6) {
-
-							$picture_size_type = (getid3_lib::BigEndian2Int(substr($flv_video_header, 3, 2))) >> 7;
-							$picture_size_type = $picture_size_type & 0x0007;
-							$info_flv['header']['videoSizeType'] = $picture_size_type;
-
-							switch ($picture_size_type) {
-								case 0:
-									$picture_size_enc = getid3_lib::BigEndian2Int(substr($flv_video_header, 5, 2));
-									$picture_size_enc <<= 1;
-									$info['video']['resolution_x'] = ($picture_size_enc & 0xFF00) >> 8;
-									$picture_size_enc = getid3_lib::BigEndian2Int(substr($flv_video_header, 6, 2));
-									$picture_size_enc <<= 1;
-									$info['video']['resolution_y'] = ($picture_size_enc & 0xFF00) >> 8;
-									break;
-
-								case 1:
-									$picture_size_enc = getid3_lib::BigEndian2Int(substr($flv_video_header, 5, 4));
-									$picture_size_enc <<= 1;
-									$info['video']['resolution_x'] = ($picture_size_enc & 0xFFFF0000) >> 16;
-
-									$picture_size_enc = getid3_lib::BigEndian2Int(substr($flv_video_header, 7, 4));
-									$picture_size_enc <<= 1;
-									$info['video']['resolution_y'] = ($picture_size_enc & 0xFFFF0000) >> 16;
-									break;
-
-								case 2:
-									$info['video']['resolution_x'] = 352;
-									$info['video']['resolution_y'] = 288;
-									break;
-
-								case 3:
-									$info['video']['resolution_x'] = 176;
-									$info['video']['resolution_y'] = 144;
-									break;
-
-								case 4:
-									$info['video']['resolution_x'] = 128;
-									$info['video']['resolution_y'] = 96;
-									break;
-
-								case 5:
-									$info['video']['resolution_x'] = 320;
-									$info['video']['resolution_y'] = 240;
-									break;
-
-								case 6:
-									$info['video']['resolution_x'] = 160;
-									$info['video']['resolution_y'] = 120;
-									break;
-
-								default:
-									$info['video']['resolution_x'] = 0;
-									$info['video']['resolution_y'] = 0;
-									break;
-							}
-						}
-					}
-					break;
-
-
-				// Meta tag
-				case getid3_flv::TAG_META:
-
-					fseek($this->getid3->fp, -1, SEEK_CUR);
-					$reader = new AMFReader(new AMFStream(fread($this->getid3->fp, $data_length)));
-					$event_name = $reader->readData();
-					$info['meta'][$event_name] = $reader->readData();
-					unset($reader);
-
-					$info['video']['frame_rate']   = @$info['meta']['onMetaData']['framerate'];
-					$info['video']['resolution_x'] = @$info['meta']['onMetaData']['width'];
-					$info['video']['resolution_y'] = @$info['meta']['onMetaData']['height'];
-					break;
-
-				default:
-					// noop
-					break;
-			}
-
-			if ($timestamp > $duration) {
-				$duration = $timestamp;
-			}
-
-			fseek($this->getid3->fp, $next_offset, SEEK_SET);
-		}
-
-		if ($info['playtime_seconds'] = $duration / 1000) {
-		    $info['bitrate'] = ($info['avdataend'] - $info['avdataoffset']) / $info['playtime_seconds'];
-		}
-
-		if ($info_flv['header']['hasAudio']) {
-			$info['audio']['codec']           = $this->FLVaudioFormat($info_flv['audio']['audioFormat']);
-			$info['audio']['sample_rate']     = $this->FLVaudioRate($info_flv['audio']['audioRate']);
-			$info['audio']['bits_per_sample'] = $this->FLVaudioBitDepth($info_flv['audio']['audioSampleSize']);
-
-			$info['audio']['channels']   = $info_flv['audio']['audioType'] + 1; // 0=mono,1=stereo
-			$info['audio']['lossless']   = ($info_flv['audio']['audioFormat'] ? false : true); // 0=uncompressed
-			$info['audio']['dataformat'] = 'flv';
-		}
-		if (@$info_flv['header']['hasVideo']) {
-			$info['video']['codec']      = $this->FLVvideoCodec($info_flv['video']['videoCodec']);
-			$info['video']['dataformat'] = 'flv';
-			$info['video']['lossless']   = false;
-		}
-
-		return true;
-	}
-
-
-	public static function FLVaudioFormat($id) {
-
-		static $lookup = array(
-			0 => 'uncompressed',
-			1 => 'ADPCM',
-			2 => 'mp3',
-			5 => 'Nellymoser 8kHz mono',
-			6 => 'Nellymoser',
-		);
-		return (@$lookup[$id] ? @$lookup[$id] : false);
-	}
-
-
-	public static function FLVaudioRate($id) {
-
-		static $lookup = array(
-			0 =>  5500,
-			1 => 11025,
-			2 => 22050,
-			3 => 44100,
-		);
-		return (@$lookup[$id] ? @$lookup[$id] : false);
-	}
-
-
-	public static function FLVaudioBitDepth($id) {
-
-		static $lookup = array(
-			0 =>  8,
-			1 => 16,
-		);
-		return (@$lookup[$id] ? @$lookup[$id] : false);
-	}
-
-
-	public static function FLVvideoCodec($id) {
-
-		static $lookup = array(
-			getid3_flv::VIDEO_H263   => 'Sorenson H.263',
-			getid3_flv::VIDEO_SCREEN => 'Screen video',
-			getid3_flv::VIDEO_VP6    => 'On2 VP6',
-		);
-		return (@$lookup[$id] ? @$lookup[$id] : false);
-	}
+    public function Analyze()
+    {
+        $info = &$this->getid3->info;
+
+        $info['flv'] = array ();
+        $info_flv = &$info['flv'];
+
+        fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
+
+        $flv_data_length = $info['avdataend'] - $info['avdataoffset'];
+        $flv_header = fread($this->getid3->fp, 5);
+
+        $info['fileformat'] = 'flv';
+        $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));
+
+        $info_flv['header']['hasAudio'] = (bool) ($type_flags & 0x04);
+        $info_flv['header']['hasVideo'] = (bool) ($type_flags & 0x01);
+
+        $frame_size_data_length = getid3_lib::BigEndian2Int(fread($this->getid3->fp, 4));
+        $flv_header_frame_length = 9;
+        if ($frame_size_data_length > $flv_header_frame_length) {
+            fseek($this->getid3->fp, $frame_size_data_length - $flv_header_frame_length, SEEK_CUR);
+        }
+
+        $duration = 0;
+        while ((ftell($this->getid3->fp) + 1) < $info['avdataend']) {
+
+            $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));
+            $last_header_byte    = getid3_lib::BigEndian2Int(substr($this_tag_header, 15, 1));
+            $next_offset         = ftell($this->getid3->fp) - 1 + $data_length;
+
+            switch ($tag_type) {
+
+                case getid3_flv::TAG_AUDIO:
+                    if (!isset($info_flv['audio']['audioFormat'])) {
+                        $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;
+                    }
+                    break;
+
+
+                case getid3_flv::TAG_VIDEO:
+                    if (!isset($info_flv['video']['videoCodec'])) {
+                        $info_flv['video']['videoCodec'] = $last_header_byte & 0x07;
+
+                        $flv_video_header = fread($this->getid3->fp, 11);
+
+                        if ($info_flv['video']['videoCodec'] != getid3_flv::VIDEO_VP6) {
+
+                            $picture_size_type = (getid3_lib::BigEndian2Int(substr($flv_video_header, 3, 2))) >> 7;
+                            $picture_size_type = $picture_size_type & 0x0007;
+                            $info_flv['header']['videoSizeType'] = $picture_size_type;
+
+                            switch ($picture_size_type) {
+                                case 0:
+                                    $picture_size_enc = getid3_lib::BigEndian2Int(substr($flv_video_header, 5, 2));
+                                    $picture_size_enc <<= 1;
+                                    $info['video']['resolution_x'] = ($picture_size_enc & 0xFF00) >> 8;
+                                    $picture_size_enc = getid3_lib::BigEndian2Int(substr($flv_video_header, 6, 2));
+                                    $picture_size_enc <<= 1;
+                                    $info['video']['resolution_y'] = ($picture_size_enc & 0xFF00) >> 8;
+                                    break;
+
+                                case 1:
+                                    $picture_size_enc = getid3_lib::BigEndian2Int(substr($flv_video_header, 5, 4));
+                                    $picture_size_enc <<= 1;
+                                    $info['video']['resolution_x'] = ($picture_size_enc & 0xFFFF0000) >> 16;
+
+                                    $picture_size_enc = getid3_lib::BigEndian2Int(substr($flv_video_header, 7, 4));
+                                    $picture_size_enc <<= 1;
+                                    $info['video']['resolution_y'] = ($picture_size_enc & 0xFFFF0000) >> 16;
+                                    break;
+
+                                case 2:
+                                    $info['video']['resolution_x'] = 352;
+                                    $info['video']['resolution_y'] = 288;
+                                    break;
+
+                                case 3:
+                                    $info['video']['resolution_x'] = 176;
+                                    $info['video']['resolution_y'] = 144;
+                                    break;
+
+                                case 4:
+                                    $info['video']['resolution_x'] = 128;
+                                    $info['video']['resolution_y'] = 96;
+                                    break;
+
+                                case 5:
+                                    $info['video']['resolution_x'] = 320;
+                                    $info['video']['resolution_y'] = 240;
+                                    break;
+
+                                case 6:
+                                    $info['video']['resolution_x'] = 160;
+                                    $info['video']['resolution_y'] = 120;
+                                    break;
+
+                                default:
+                                    $info['video']['resolution_x'] = 0;
+                                    $info['video']['resolution_y'] = 0;
+                                    break;
+                            }
+                        }
+                    }
+                    break;
+
+
+                // Meta tag
+                case getid3_flv::TAG_META:
+
+                    fseek($this->getid3->fp, -1, SEEK_CUR);
+                    $reader = new AMFReader(new AMFStream(fread($this->getid3->fp, $data_length)));
+                    $event_name = $reader->readData();
+                    $info['meta'][$event_name] = $reader->readData();
+                    unset($reader);
+
+                    $info['video']['frame_rate']   = @$info['meta']['onMetaData']['framerate'];
+                    $info['video']['resolution_x'] = @$info['meta']['onMetaData']['width'];
+                    $info['video']['resolution_y'] = @$info['meta']['onMetaData']['height'];
+                    break;
+
+                default:
+                    // noop
+                    break;
+            }
+
+            if ($timestamp > $duration) {
+                $duration = $timestamp;
+            }
+
+            fseek($this->getid3->fp, $next_offset, SEEK_SET);
+        }
+
+        if ($info['playtime_seconds'] = $duration / 1000) {
+            $info['bitrate'] = ($info['avdataend'] - $info['avdataoffset']) / $info['playtime_seconds'];
+        }
+
+        if ($info_flv['header']['hasAudio']) {
+            $info['audio']['codec']           = $this->FLVaudioFormat($info_flv['audio']['audioFormat']);
+            $info['audio']['sample_rate']     = $this->FLVaudioRate($info_flv['audio']['audioRate']);
+            $info['audio']['bits_per_sample'] = $this->FLVaudioBitDepth($info_flv['audio']['audioSampleSize']);
+
+            $info['audio']['channels']   = $info_flv['audio']['audioType'] + 1; // 0=mono,1=stereo
+            $info['audio']['lossless']   = ($info_flv['audio']['audioFormat'] ? false : true); // 0=uncompressed
+            $info['audio']['dataformat'] = 'flv';
+        }
+        if (@$info_flv['header']['hasVideo']) {
+            $info['video']['codec']      = $this->FLVvideoCodec($info_flv['video']['videoCodec']);
+            $info['video']['dataformat'] = 'flv';
+            $info['video']['lossless']   = false;
+        }
+
+        return true;
+    }
+
+
+    public static function FLVaudioFormat($id) {
+
+        static $lookup = array(
+            0 => 'uncompressed',
+            1 => 'ADPCM',
+            2 => 'mp3',
+            5 => 'Nellymoser 8kHz mono',
+            6 => 'Nellymoser',
+        );
+        return (@$lookup[$id] ? @$lookup[$id] : false);
+    }
+
+
+    public static function FLVaudioRate($id) {
+
+        static $lookup = array(
+            0 =>  5500,
+            1 => 11025,
+            2 => 22050,
+            3 => 44100,
+        );
+        return (@$lookup[$id] ? @$lookup[$id] : false);
+    }
+
+
+    public static function FLVaudioBitDepth($id) {
+
+        static $lookup = array(
+            0 =>  8,
+            1 => 16,
+        );
+        return (@$lookup[$id] ? @$lookup[$id] : false);
+    }
+
+
+    public static function FLVvideoCodec($id) {
+
+        static $lookup = array(
+            getid3_flv::VIDEO_H263   => 'Sorenson H.263',
+            getid3_flv::VIDEO_SCREEN => 'Screen video',
+            getid3_flv::VIDEO_VP6    => 'On2 VP6',
+        );
+        return (@$lookup[$id] ? @$lookup[$id] : false);
+    }
 }
 
 
 
 class AMFStream
 {
-	public $bytes;
-	public $pos;
+    public $bytes;
+    public $pos;
 
 
-	public function AMFStream($bytes) {
+    public function AMFStream($bytes) {
 
-		$this->bytes = $bytes;
-		$this->pos = 0;
-	}
+        $this->bytes = $bytes;
+        $this->pos = 0;
+    }
 
 
-	public function readByte() {
+    public function readByte() {
 
-		return getid3_lib::BigEndian2Int(substr($this->bytes, $this->pos++, 1));
-	}
+        return getid3_lib::BigEndian2Int(substr($this->bytes, $this->pos++, 1));
+    }
 
 
-	public function readInt() {
+    public function readInt() {
 
-		return ($this->readByte() << 8) + $this->readByte();
-	}
+        return ($this->readByte() << 8) + $this->readByte();
+    }
 
 
-	public function readLong() {
+    public function readLong() {
 
-		return ($this->readByte() << 24) + ($this->readByte() << 16) + ($this->readByte() << 8) + $this->readByte();
-	}
+        return ($this->readByte() << 24) + ($this->readByte() << 16) + ($this->readByte() << 8) + $this->readByte();
+    }
 
 
-	public function readDouble() {
+    public function readDouble() {
 
-		return getid3_lib::BigEndian2Float($this->read(8));
-	}
+        return getid3_lib::BigEndian2Float($this->read(8));
+    }
 
 
-	public function readUTF() {
+    public function readUTF() {
 
-		$length = $this->readInt();
-		return $this->read($length);
-	}
+        $length = $this->readInt();
+        return $this->read($length);
+    }
 
 
-	public function readLongUTF() {
+    public function readLongUTF() {
 
-		$length = $this->readLong();
-		return $this->read($length);
-	}
+        $length = $this->readLong();
+        return $this->read($length);
+    }
 
 
-	public function read($length) {
+    public function read($length) {
 
-		$val = substr($this->bytes, $this->pos, $length);
-		$this->pos += $length;
-		return $val;
-	}
+        $val = substr($this->bytes, $this->pos, $length);
+        $this->pos += $length;
+        return $val;
+    }
 
 
-	public function peekByte() {
+    public function peekByte() {
 
-		$pos = $this->pos;
-		$val = $this->readByte();
-		$this->pos = $pos;
-		return $val;
-	}
+        $pos = $this->pos;
+        $val = $this->readByte();
+        $this->pos = $pos;
+        return $val;
+    }
 
 
-	public function peekInt() {
+    public function peekInt() {
 
-		$pos = $this->pos;
-		$val = $this->readInt();
-		$this->pos = $pos;
-		return $val;
-	}
+        $pos = $this->pos;
+        $val = $this->readInt();
+        $this->pos = $pos;
+        return $val;
+    }
 
 
-	public function peekLong() {
+    public function peekLong() {
 
-		$pos = $this->pos;
-		$val = $this->readLong();
-		$this->pos = $pos;
-		return $val;
-	}
+        $pos = $this->pos;
+        $val = $this->readLong();
+        $this->pos = $pos;
+        return $val;
+    }
 
 
-	public function peekDouble() {
+    public function peekDouble() {
 
-		$pos = $this->pos;
-		$val = $this->readDouble();
-		$this->pos = $pos;
-		return $val;
-	}
+        $pos = $this->pos;
+        $val = $this->readDouble();
+        $this->pos = $pos;
+        return $val;
+    }
 
 
-	public function peekUTF() {
+    public function peekUTF() {
 
-		$pos = $this->pos;
-		$val = $this->readUTF();
-		$this->pos = $pos;
-		return $val;
-	}
+        $pos = $this->pos;
+        $val = $this->readUTF();
+        $this->pos = $pos;
+        return $val;
+    }
 
 
-	public function peekLongUTF() {
+    public function peekLongUTF() {
 
-		$pos = $this->pos;
-		$val = $this->readLongUTF();
-		$this->pos = $pos;
-		return $val;
-	}
+        $pos = $this->pos;
+        $val = $this->readLongUTF();
+        $this->pos = $pos;
+        return $val;
+    }
 }
 
 
 
 class AMFReader
 {
-	public $stream;
+    public $stream;
 
-	public function __construct($stream) {
+    public function __construct($stream) {
 
-		$this->stream = $stream;
-	}
+        $this->stream = $stream;
+    }
 
 
-	public function readData() {
+    public function readData() {
 
-		$value = null;
+        $value = null;
 
-		$type = $this->stream->readByte();
+        $type = $this->stream->readByte();
 
-		switch($type) {
-			// Double
-			case 0:
-				$value = $this->readDouble();
-			break;
+        switch($type) {
+            // Double
+            case 0:
+                $value = $this->readDouble();
+            break;
 
-			// Boolean
-			case 1:
-				$value = $this->readBoolean();
-				break;
+            // Boolean
+            case 1:
+                $value = $this->readBoolean();
+                break;
 
-			// String
-			case 2:
-				$value = $this->readString();
-				break;
+            // String
+            case 2:
+                $value = $this->readString();
+                break;
 
-			// Object
-			case 3:
-				$value = $this->readObject();
-				break;
+            // Object
+            case 3:
+                $value = $this->readObject();
+                break;
 
-			// null
-			case 6:
-				return null;
-				break;
+            // null
+            case 6:
+                return null;
+                break;
 
-			// Mixed array
-			case 8:
-				$value = $this->readMixedArray();
-				break;
+            // Mixed array
+            case 8:
+                $value = $this->readMixedArray();
+                break;
 
-			// Array
-			case 10:
-				$value = $this->readArray();
-				break;
+            // Array
+            case 10:
+                $value = $this->readArray();
+                break;
 
-			// Date
-			case 11:
-				$value = $this->readDate();
-				break;
+            // Date
+            case 11:
+                $value = $this->readDate();
+                break;
 
-			// Long string
-			case 13:
-				$value = $this->readLongString();
-				break;
+            // Long string
+            case 13:
+                $value = $this->readLongString();
+                break;
 
-			// XML (handled as string)
-			case 15:
-				$value = $this->readXML();
-				break;
+            // XML (handled as string)
+            case 15:
+                $value = $this->readXML();
+                break;
 
-			// Typed object (handled as object)
-			case 16:
-				$value = $this->readTypedObject();
-				break;
+            // Typed object (handled as object)
+            case 16:
+                $value = $this->readTypedObject();
+                break;
 
-			// Long string
-			default:
-				$value = '(unknown or unsupported data type)';
-			break;
-		}
+            // Long string
+            default:
+                $value = '(unknown or unsupported data type)';
+            break;
+        }
 
-		return $value;
-	}
+        return $value;
+    }
 
 
-	public function readDouble() {
+    public function readDouble() {
 
-		return $this->stream->readDouble();
-	}
+        return $this->stream->readDouble();
+    }
 
 
-	public function readBoolean() {
+    public function readBoolean() {
 
-		return $this->stream->readByte() == 1;
-	}
+        return $this->stream->readByte() == 1;
+    }
 
 
-	public function readString() {
+    public function readString() {
 
-		return $this->stream->readUTF();
-	}
+        return $this->stream->readUTF();
+    }
 
 
-	public function readObject() {
+    public function readObject() {
 
-		// Get highest numerical index - ignored
-		$highestIndex = $this->stream->readLong();
+        // Get highest numerical index - ignored
+        $highestIndex = $this->stream->readLong();
 
-		$data = array();
+        $data = array();
 
-		while ($key = $this->stream->readUTF()) {
-			// Mixed array record ends with empty string (0x00 0x00) and 0x09
-			if (($key == '') && ($this->stream->peekByte() == 0x09)) {
-				// Consume byte
-				$this->stream->readByte();
-				break;
-			}
+        while ($key = $this->stream->readUTF()) {
+            // Mixed array record ends with empty string (0x00 0x00) and 0x09
+            if (($key == '') && ($this->stream->peekByte() == 0x09)) {
+                // Consume byte
+                $this->stream->readByte();
+                break;
+            }
 
-			$data[$key] = $this->readData();
-		}
+            $data[$key] = $this->readData();
+        }
 
-		return $data;
-	}
+        return $data;
+    }
 
 
-	public function readMixedArray() {
+    public function readMixedArray() {
 
-		// Get highest numerical index - ignored
-		$highestIndex = $this->stream->readLong();
+        // Get highest numerical index - ignored
+        $highestIndex = $this->stream->readLong();
 
-		$data = array();
+        $data = array();
 
-		while ($key = $this->stream->readUTF()) {
-			// Mixed array record ends with empty string (0x00 0x00) and 0x09
-			if (($key == '') && ($this->stream->peekByte() == 0x09)) {
-				// Consume byte
-				$this->stream->readByte();
-				break;
-			}
+        while ($key = $this->stream->readUTF()) {
+            // Mixed array record ends with empty string (0x00 0x00) and 0x09
+            if (($key == '') && ($this->stream->peekByte() == 0x09)) {
+                // Consume byte
+                $this->stream->readByte();
+                break;
+            }
 
-			if (is_numeric($key)) {
-				$key = (float) $key;
-			}
+            if (is_numeric($key)) {
+                $key = (float) $key;
+            }
 
-			$data[$key] = $this->readData();
-		}
+            $data[$key] = $this->readData();
+        }
 
-		return $data;
-	}
+        return $data;
+    }
 
 
-	public function readArray() {
+    public function readArray() {
 
-		$length = $this->stream->readLong();
+        $length = $this->stream->readLong();
 
-		$data = array();
+        $data = array();
 
-		for ($i = 0; $i < count($length); $i++) {
-			$data[] = $this->readData();
-		}
+        for ($i = 0; $i < count($length); $i++) {
+            $data[] = $this->readData();
+        }
 
-		return $data;
-	}
+        return $data;
+    }
 
 
-	public function readDate() {
+    public function readDate() {
 
-		$timestamp = $this->stream->readDouble();
-		$timezone = $this->stream->readInt();
-		return $timestamp;
-	}
+        $timestamp = $this->stream->readDouble();
+        $timezone = $this->stream->readInt();
+        return $timestamp;
+    }
 
 
-	public function readLongString() {
+    public function readLongString() {
 
-		return $this->stream->readLongUTF();
-	}
+        return $this->stream->readLongUTF();
+    }
 
 
-	public function readXML() {
+    public function readXML() {
 
-		return $this->stream->readLongUTF();
-	}
+        return $this->stream->readLongUTF();
+    }
 
 
-	public function readTypedObject() {
+    public function readTypedObject() {
 
-		$className = $this->stream->readUTF();
-		return $this->readObject();
-	}
+        $className = $this->stream->readUTF();
+        return $this->readObject();
+    }
 }
 
 ?>

main/inc/lib/text.lib.php

Indentation +27 added lines, -27 removed lines

@@ -693,8 +693,8 @@ 
  */
 function get_week_from_day($date) {
     if (!empty($date)) {
-       $time = api_strtotime($date,'UTC');
-       return date('W', $time);
+        $time = api_strtotime($date,'UTC');
+        return date('W', $time);
     } else {
         return date('W');
     }
@@ -712,31 +712,31 @@ 
 
 function substrwords($text,$maxchar,$end='...')
 {
-	if(strlen($text)>$maxchar)
-	{
-		$words=explode(" ",$text);
-		$output = '';
-		$i=0;
-		while(1)
-		{
-			$length = (strlen($output)+strlen($words[$i]));
-			if($length>$maxchar)
-			{
-				break;
-			}
-			else
-			{
-				$output = $output." ".$words[$i];
-				$i++;
-			};
-		};
-	}
-	else
-	{
-		$output = $text;
-		return $output;
-	}
-	return $output.$end;
+    if(strlen($text)>$maxchar)
+    {
+        $words=explode(" ",$text);
+        $output = '';
+        $i=0;
+        while(1)
+        {
+            $length = (strlen($output)+strlen($words[$i]));
+            if($length>$maxchar)
+            {
+                break;
+            }
+            else
+            {
+                $output = $output." ".$words[$i];
+                $i++;
+            };
+        };
+    }
+    else
+    {
+        $output = $text;
+        return $output;
+    }
+    return $output.$end;
 }
 
 function implode_with_key($glue, $array) {

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

Indentation -1 removed lines

@@ -16,7 +16,6 @@
  * @author Patrick Cool
  * @author René Haentjens, added CSV file import (October 2004)
  * @package chamilo.link
-
  */
 
 // Including libraries