chamilo / chamilo-lms

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/current_courses.php

Indentation +209 added lines, -209 removed lines

@@ -12,7 +12,7 @@ 
 $filename = 'reporting.xls';
 
 if (!api_is_allowed_to_create_course()) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $user_id = api_get_user_id();
@@ -23,222 +23,222 @@ 
 $session_id = 0;
 
 if (!empty($my_courses)) {
-	foreach ($my_courses as $course) {
-		$course_code = $course['code'];
-		$course_id = $course['real_id'];
-		$course_info = api_get_course_info($course_code);
-
-		//Only show open courses
-		if ($course_info['visibility'] == 0) {
-			continue;
-		}
-
-		$teachers = CourseManager::get_teacher_list_from_course_code($course_code);
-		$teacher_list =  array();
-
-		if (!empty($teachers)) {
-			foreach($teachers as $teacher) {
-				$teacher_list[]= $teacher['firstname'].' '.$teacher['lastname'];
-			}
-		}
-
-		$tmp_students = CourseManager :: get_student_list_from_course_code($course_code, false);
-
-		//Cleaning students only REAL students
-		$students = array();
-		foreach ($tmp_students  as $student) {
-			$user_info = api_get_user_info($student['user_id']);
-			if ($user_info['status'] != STUDENT) {
-				continue;
-			}
-			$students[] = $student['user_id'];
-		}
-
-		$t_lp 	= Database :: get_course_table(TABLE_LP_MAIN);
-		$sql_lp = "SELECT lp.name, lp.id FROM $t_lp lp
+    foreach ($my_courses as $course) {
+        $course_code = $course['code'];
+        $course_id = $course['real_id'];
+        $course_info = api_get_course_info($course_code);
+
+        //Only show open courses
+        if ($course_info['visibility'] == 0) {
+            continue;
+        }
+
+        $teachers = CourseManager::get_teacher_list_from_course_code($course_code);
+        $teacher_list =  array();
+
+        if (!empty($teachers)) {
+            foreach($teachers as $teacher) {
+                $teacher_list[]= $teacher['firstname'].' '.$teacher['lastname'];
+            }
+        }
+
+        $tmp_students = CourseManager :: get_student_list_from_course_code($course_code, false);
+
+        //Cleaning students only REAL students
+        $students = array();
+        foreach ($tmp_students  as $student) {
+            $user_info = api_get_user_info($student['user_id']);
+            if ($user_info['status'] != STUDENT) {
+                continue;
+            }
+            $students[] = $student['user_id'];
+        }
+
+        $t_lp 	= Database :: get_course_table(TABLE_LP_MAIN);
+        $sql_lp = "SELECT lp.name, lp.id FROM $t_lp lp
 				   WHERE c_id = $course_id AND lp.session_id = 0";
-		$rs_lp 	= Database::query($sql_lp);
-		$t_lpi 	= Database :: get_course_table(TABLE_LP_ITEM);
-		$t_news = Database :: get_course_table(TABLE_ANNOUNCEMENT);
-
-		$total_tools_list = Tracking::get_tools_most_used_by_course(
-			$course_id,
-			$session_id
-		);
-
-		$total_tools = 0;
-		foreach($total_tools_list as $tool) {
-			$total_tools += $tool['count_access_tool'];
-		}
-
-		if (Database :: num_rows($rs_lp) > 0) {
-			while ($learnpath = Database :: fetch_array($rs_lp)) {
-				$lp_id = $learnpath['id'];
-
-				$lp_items =
-				$array[$i]['lp'] = '<a href="'.api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?cidReq='.$course_code.'&amp;action=view&amp;lp_id='.$lp_id.'" target="_blank">'.$learnpath['name'].'</a>';
-
-				$array[$i]['teachers'] = '';
-				if (!empty($teacher_list)) {
-					$array[$i]['teachers'] = implode(', ', $teacher_list);
-				}
-
-				$array[$i]['course_name'] = $course['title'];
-				$count_students_accessing = 0;
-				$count_students_complete_all_activities = 0;
-				$count_students_complete_all_activities_at_50 = 0;
-				$total_time_spent = 0;
-				$total_average_progress = 0;
-
-				if (!empty($students)) {
-					foreach ($students  as $student_id) {
-						$avg_student_progress   = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
-						$myavg_temp 			= Tracking::get_avg_student_score($student_id, $course_code, array($lp_id), $session_id);
-						$avg_progress_in_course = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
-
-						if (intval($avg_progress_in_course) == 100) {
-							$count_students_complete_all_activities++;
-						}
-						if (intval($avg_progress_in_course) > 0 && intval($avg_progress_in_course) <= 50) {
-							$count_students_complete_all_activities_at_50 ++;
-						}
-						$total_average_progress +=$avg_progress_in_course;
-
-						$time_spent = Tracking::get_time_spent_on_the_course($student_id, $course_id, $session_id);
-						$total_time_spent += $time_spent;
-						if (!empty($time_spent)) {
-							$count_students_accessing++;
-						}
-					}
-					//$total_tools += $nb_assignments +  $messages + $links + $chat_last_connection + $documents;
-				}
-
-				$student_count = count($students);
-
-				$array[$i]['count_students'] = $student_count;
-				$array[$i]['count_students_accessing'] = 0;
-				$array[$i]['count_students_accessing_percentage'] = 0;
-				$array[$i]['count_students_complete_all_activities_at_50'] = 0;
-				$array[$i]['count_students_complete_all_activities'] = 0;
-				$array[$i]['average_percentage_activities_completed_per_student'] = 0;
-				$array[$i]['total_time_spent'] = 0;
-				$array[$i]['average_time_spent_per_student'] = 0;
-				$array[$i]['total_time_spent'] = 0;
-				$array[$i]['average_time_spent_per_student'] = 0;
-				//$array[$i]['tools_used'] = 0;
-				$array[$i]['learnpath_docs'] = 0;
-				$array[$i]['learnpath_exercises'] = 0;
-				$array[$i]['learnpath_links'] = 0;
-				$array[$i]['learnpath_forums'] = 0;
-				$array[$i]['learnpath_assignments'] = 0;
-
-				//registering the number of each category of
-				//items in learning path
-				$sql_lpi = "SELECT lpi.item_type FROM $t_lpi lpi
+        $rs_lp 	= Database::query($sql_lp);
+        $t_lpi 	= Database :: get_course_table(TABLE_LP_ITEM);
+        $t_news = Database :: get_course_table(TABLE_ANNOUNCEMENT);
+
+        $total_tools_list = Tracking::get_tools_most_used_by_course(
+            $course_id,
+            $session_id
+        );
+
+        $total_tools = 0;
+        foreach($total_tools_list as $tool) {
+            $total_tools += $tool['count_access_tool'];
+        }
+
+        if (Database :: num_rows($rs_lp) > 0) {
+            while ($learnpath = Database :: fetch_array($rs_lp)) {
+                $lp_id = $learnpath['id'];
+
+                $lp_items =
+                $array[$i]['lp'] = '<a href="'.api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?cidReq='.$course_code.'&amp;action=view&amp;lp_id='.$lp_id.'" target="_blank">'.$learnpath['name'].'</a>';
+
+                $array[$i]['teachers'] = '';
+                if (!empty($teacher_list)) {
+                    $array[$i]['teachers'] = implode(', ', $teacher_list);
+                }
+
+                $array[$i]['course_name'] = $course['title'];
+                $count_students_accessing = 0;
+                $count_students_complete_all_activities = 0;
+                $count_students_complete_all_activities_at_50 = 0;
+                $total_time_spent = 0;
+                $total_average_progress = 0;
+
+                if (!empty($students)) {
+                    foreach ($students  as $student_id) {
+                        $avg_student_progress   = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
+                        $myavg_temp 			= Tracking::get_avg_student_score($student_id, $course_code, array($lp_id), $session_id);
+                        $avg_progress_in_course = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
+
+                        if (intval($avg_progress_in_course) == 100) {
+                            $count_students_complete_all_activities++;
+                        }
+                        if (intval($avg_progress_in_course) > 0 && intval($avg_progress_in_course) <= 50) {
+                            $count_students_complete_all_activities_at_50 ++;
+                        }
+                        $total_average_progress +=$avg_progress_in_course;
+
+                        $time_spent = Tracking::get_time_spent_on_the_course($student_id, $course_id, $session_id);
+                        $total_time_spent += $time_spent;
+                        if (!empty($time_spent)) {
+                            $count_students_accessing++;
+                        }
+                    }
+                    //$total_tools += $nb_assignments +  $messages + $links + $chat_last_connection + $documents;
+                }
+
+                $student_count = count($students);
+
+                $array[$i]['count_students'] = $student_count;
+                $array[$i]['count_students_accessing'] = 0;
+                $array[$i]['count_students_accessing_percentage'] = 0;
+                $array[$i]['count_students_complete_all_activities_at_50'] = 0;
+                $array[$i]['count_students_complete_all_activities'] = 0;
+                $array[$i]['average_percentage_activities_completed_per_student'] = 0;
+                $array[$i]['total_time_spent'] = 0;
+                $array[$i]['average_time_spent_per_student'] = 0;
+                $array[$i]['total_time_spent'] = 0;
+                $array[$i]['average_time_spent_per_student'] = 0;
+                //$array[$i]['tools_used'] = 0;
+                $array[$i]['learnpath_docs'] = 0;
+                $array[$i]['learnpath_exercises'] = 0;
+                $array[$i]['learnpath_links'] = 0;
+                $array[$i]['learnpath_forums'] = 0;
+                $array[$i]['learnpath_assignments'] = 0;
+
+                //registering the number of each category of
+                //items in learning path
+                $sql_lpi = "SELECT lpi.item_type FROM $t_lpi lpi
 						    WHERE c_id = $course_id AND lpi.lp_id = $lp_id
 						    ORDER BY item_type";
-				$res_lpi = Database::query($sql_lpi);
-				while ($row_lpi = Database::fetch_array($res_lpi)) {
-					switch($row_lpi['item_type']) {
-						case 'document':
-							$array[$i]['learnpath_docs']++;
-							break;
-						case 'quiz':
-							$array[$i]['learnpath_exercises']++;
-							break;
-						case 'link':
-							$array[$i]['learnpath_links']++;
-							break;
-						case 'forum':
-						case 'thread':
-							$array[$i]['learnpath_forums']++;
-							break;
-						case 'student_publication':
-							$array[$i]['learnpath_assignments']++;
-							break;
-					}
-				}
-				// Count announcements
-				$array[$i]['total_announcements'] = 0;
-				$sql_news = "SELECT count(id) FROM $t_news WHERE c_id = $course_id ";
-				$res_news = Database::query($sql_news);
-				while ($row_news = Database::fetch_array($res_news)) {
-					$array[$i]['total_announcements'] = $row_news[0];
-				}
-
-				//@todo don't know what means this value
-				$count_students_complete_all_activities_at_50 = 0;
-
-				if (!empty($student_count)) {
-					$array[$i]['count_students_accessing'] = $count_students_accessing;
-					$array[$i]['count_students_accessing_percentage'] = round($count_students_accessing / $student_count *100 , 0);
-					$array[$i]['count_students_complete_all_activities_at_50'] = $count_students_complete_all_activities;
-					$array[$i]['count_students_complete_all_activities'] = round($count_students_complete_all_activities / $student_count *100 , 0);;
-					$array[$i]['average_percentage_activities_completed_per_student'] = round($count_students_complete_all_activities/$student_count*100,2);
-					$array[$i]['total_time_spent'] = 0;
-					$array[$i]['average_time_spent_per_student'] = 0;
-
-					if (!empty($total_time_spent)) {
-						$array[$i]['total_time_spent'] = api_time_to_hms($total_time_spent);
-						$array[$i]['average_time_spent_per_student'] = api_time_to_hms($total_time_spent / $student_count);
-					}
-					//$array[$i]['tools_used'] = $total_tools;
-				}
-				$i++;
-			}
-		}
-	}
+                $res_lpi = Database::query($sql_lpi);
+                while ($row_lpi = Database::fetch_array($res_lpi)) {
+                    switch($row_lpi['item_type']) {
+                        case 'document':
+                            $array[$i]['learnpath_docs']++;
+                            break;
+                        case 'quiz':
+                            $array[$i]['learnpath_exercises']++;
+                            break;
+                        case 'link':
+                            $array[$i]['learnpath_links']++;
+                            break;
+                        case 'forum':
+                        case 'thread':
+                            $array[$i]['learnpath_forums']++;
+                            break;
+                        case 'student_publication':
+                            $array[$i]['learnpath_assignments']++;
+                            break;
+                    }
+                }
+                // Count announcements
+                $array[$i]['total_announcements'] = 0;
+                $sql_news = "SELECT count(id) FROM $t_news WHERE c_id = $course_id ";
+                $res_news = Database::query($sql_news);
+                while ($row_news = Database::fetch_array($res_news)) {
+                    $array[$i]['total_announcements'] = $row_news[0];
+                }
+
+                //@todo don't know what means this value
+                $count_students_complete_all_activities_at_50 = 0;
+
+                if (!empty($student_count)) {
+                    $array[$i]['count_students_accessing'] = $count_students_accessing;
+                    $array[$i]['count_students_accessing_percentage'] = round($count_students_accessing / $student_count *100 , 0);
+                    $array[$i]['count_students_complete_all_activities_at_50'] = $count_students_complete_all_activities;
+                    $array[$i]['count_students_complete_all_activities'] = round($count_students_complete_all_activities / $student_count *100 , 0);;
+                    $array[$i]['average_percentage_activities_completed_per_student'] = round($count_students_complete_all_activities/$student_count*100,2);
+                    $array[$i]['total_time_spent'] = 0;
+                    $array[$i]['average_time_spent_per_student'] = 0;
+
+                    if (!empty($total_time_spent)) {
+                        $array[$i]['total_time_spent'] = api_time_to_hms($total_time_spent);
+                        $array[$i]['average_time_spent_per_student'] = api_time_to_hms($total_time_spent / $student_count);
+                    }
+                    //$array[$i]['tools_used'] = $total_tools;
+                }
+                $i++;
+            }
+        }
+    }
 }
 
 $headers = array(
-	get_lang('LearningPath'),
-	get_lang('Teachers'),
-	get_lang('Courses'),
-	get_lang('NumberOfStudents'),
-	get_lang('NumberStudentsAccessingCourse'),
-	get_lang('PercentageStudentsAccessingCourse'),
-	get_lang('NumberStudentsCompleteAllActivities'),
-	get_lang('PercentageStudentsCompleteAllActivities'),
-	get_lang('AverageOfActivitiesCompletedPerStudent'),
-	get_lang('TotalTimeSpentInTheCourse'),
-	get_lang('AverageTimePerStudentInCourse'),
-	get_lang('NumberOfDocumentsInLearnpath'),
-	get_lang('NumberOfExercisesInLearnpath'),
-	get_lang('NumberOfLinksInLearnpath'),
-	get_lang('NumberOfForumsInLearnpath'),
-	get_lang('NumberOfAssignmentsInLearnpath'),
-	get_lang('NumberOfAnnouncementsInCourse'),
+    get_lang('LearningPath'),
+    get_lang('Teachers'),
+    get_lang('Courses'),
+    get_lang('NumberOfStudents'),
+    get_lang('NumberStudentsAccessingCourse'),
+    get_lang('PercentageStudentsAccessingCourse'),
+    get_lang('NumberStudentsCompleteAllActivities'),
+    get_lang('PercentageStudentsCompleteAllActivities'),
+    get_lang('AverageOfActivitiesCompletedPerStudent'),
+    get_lang('TotalTimeSpentInTheCourse'),
+    get_lang('AverageTimePerStudentInCourse'),
+    get_lang('NumberOfDocumentsInLearnpath'),
+    get_lang('NumberOfExercisesInLearnpath'),
+    get_lang('NumberOfLinksInLearnpath'),
+    get_lang('NumberOfForumsInLearnpath'),
+    get_lang('NumberOfAssignmentsInLearnpath'),
+    get_lang('NumberOfAnnouncementsInCourse'),
 );
 
 if (isset($_GET['export'])) {
-	global $charset;
+    global $charset;
     $spreadsheet = new PHPExcel();
     $spreadsheet->setActiveSheetIndex(0);
     $worksheet = $spreadsheet->getActiveSheet();
 
-	$line = 0;
-	$column = 0; //skip the first column (row titles)
-
-	foreach ($headers as $header) {
-		$worksheet->SetCellValueByColumnAndRow($line, $column, $header);
-		$column++;
-	}
-	$line++;
-	foreach ($array as $row) {
-		$column = 0;
-		foreach ($row as $item) {
-			$worksheet->SetCellValueByColumnAndRow($line, $column, html_entity_decode(strip_tags($item)));
-			$column++;
-		}
-		$line++;
-	}
-	$line++;
+    $line = 0;
+    $column = 0; //skip the first column (row titles)
+
+    foreach ($headers as $header) {
+        $worksheet->SetCellValueByColumnAndRow($line, $column, $header);
+        $column++;
+    }
+    $line++;
+    foreach ($array as $row) {
+        $column = 0;
+        foreach ($row as $item) {
+            $worksheet->SetCellValueByColumnAndRow($line, $column, html_entity_decode(strip_tags($item)));
+            $column++;
+        }
+        $line++;
+    }
+    $line++;
 
     $file = api_get_path(SYS_ARCHIVE_PATH).api_replace_dangerous_char($filename);
     $writer = new PHPExcel_Writer_Excel2007($spreadsheet);
     $writer->save($file);
     DocumentManager::file_send_for_download($file, true, $filename);
-	exit;
+    exit;
 }
 
 $interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('MySpace'));
@@ -249,20 +249,20 @@ 
 $row = 0;
 $column = 0;
 foreach ($headers as $header) {
-	$table->setHeaderContents($row, $column, $header);
-	$column++;
+    $table->setHeaderContents($row, $column, $header);
+    $column++;
 }
 $row++;
 
 foreach ($array as $row_table) {
-	$column = 0;
-	foreach ($row_table as $cell) {
-		$table->setCellContents($row, $column, $cell);
-		//$table->updateCellAttributes($row, $column, 'align="center"');
-		$column++;
-	}
-	$table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true);
-	$row++;
+    $column = 0;
+    foreach ($row_table as $cell) {
+        $table->setCellContents($row, $column, $cell);
+        //$table->updateCellAttributes($row, $column, 'align="center"');
+        $column++;
+    }
+    $table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true);
+    $row++;
 }
 
 echo '<div class="actions">';

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/pear/Text/Diff.php

Indentation +2 added lines, -2 removed lines

@@ -227,7 +227,7 @@ 
     function _getTempDir()
     {
         $tmp_locations = array('/tmp', '/var/tmp', 'c:\WUTemp', 'c:\temp',
-                               'c:\windows\temp', 'c:\winnt\temp');
+                                'c:\windows\temp', 'c:\winnt\temp');
 
         /* Try PHP's upload_tmp_dir directive. */
         $tmp = ini_get('upload_tmp_dir');
@@ -309,7 +309,7 @@ 
      *                                  of elements as $to_lines.
      */
     function Text_MappedDiff($from_lines, $to_lines,
-                             $mapped_from_lines, $mapped_to_lines)
+                                $mapped_from_lines, $mapped_to_lines)
     {
         assert(count($from_lines) == count($mapped_from_lines));
         assert(count($to_lines) == count($mapped_to_lines));

main/inc/lib/pear/HTML/QuickForm/Rule/Date.php

Indentation +10 added lines, -10 removed lines

@@ -6,15 +6,15 @@
  */
 class Html_Quickform_Rule_Date extends HTML_QuickForm_Rule
 {
-	/**
-	 * Function to check a date
-	 * @see HTML_QuickForm_Rule
-	 * @param array $date An array with keys F (month), d (day) and Y (year)
-	 * @return boolean True if date is valid
-	 */
-	function validate($date, $options)
-	{
-		$compareDate = create_function('$a', 'return checkdate($a[\'M\'],$a[\'d\'],$a[\'Y\']);');
+    /**
+     * Function to check a date
+     * @see HTML_QuickForm_Rule
+     * @param array $date An array with keys F (month), d (day) and Y (year)
+     * @return boolean True if date is valid
+     */
+    function validate($date, $options)
+    {
+        $compareDate = create_function('$a', 'return checkdate($a[\'M\'],$a[\'d\'],$a[\'Y\']);');
         return $compareDate($date);
-	}
+    }
 }

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