chamilo / chamilo-lms

main/inc/lib/promotion.lib.php

Spacing +8 added lines, -8 removed lines

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

main/inc/lib/internationalization_database/name_order_conventions.php

Spacing +78 added lines, -78 removed lines

@@ -19,82 +19,82 @@
  * last_name                   - sorting names with priority for the last name.
  */
 return array(
-	'afrikaans' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'albanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'alemannic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'amharic' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'armenian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'arabic' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'asturian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'bosnian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'brazilian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'breton' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'bulgarian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'catalan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'croatian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'czech' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'danish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'dari' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'dutch' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'english' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'esperanto' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'estonian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'basque'  =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'finnish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'french' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'frisian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'friulian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-    'galician' =>         array('format' => 'title last_name first_name',  'sort_by' => 'last_name'),
-	'georgian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'german' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'greek' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'hawaiian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'hebrew' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'hindi' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'hungarian' =>        array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
-	'icelandic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'indonesian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'irish' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'italian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'japanese' =>         array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
-	'korean' =>           array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
-	'latin' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'latvian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'lithuanian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'macedonian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'malay' =>            array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
-	'manx' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'marathi' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'middle_frisian' =>   array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'mingo' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'nepali' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'norwegian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'occitan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'pashto' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'persian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'polish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'portuguese' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'quechua_cusco' =>    array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'romanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'rumantsch' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'russian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'sanskrit' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'serbian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'serbian_cyrillic' => array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'simpl_chinese' =>    array('format' => 'title last_name first_name',  'sort_by' => 'last_name' ), // Eastern order
-	'slovak' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'slovenian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'spanish' =>          array('format' => 'title last_name, first_name',  'sort_by' => 'last_name'), // Library order
-	'swahili' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'swedish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'tagalog' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'tamil' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'thai' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'trad_chinese' =>     array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
-	'turkish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'ukrainian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'vietnamese' =>       array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
-	'welsh' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'yiddish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
-	'yoruba' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name')
+	'afrikaans' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'albanian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'alemannic' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'amharic' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'armenian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'arabic' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'asturian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'bosnian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'brazilian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'breton' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'bulgarian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'catalan' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'croatian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'czech' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'danish' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'dari' =>             array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'dutch' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'english' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'esperanto' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'estonian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'basque'  =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'finnish' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'french' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'frisian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'friulian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+    'galician' =>         array('format' => 'title last_name first_name', 'sort_by' => 'last_name'),
+	'georgian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'german' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'greek' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'hawaiian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'hebrew' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'hindi' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'hungarian' =>        array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
+	'icelandic' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'indonesian' =>       array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'irish' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'italian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'japanese' =>         array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
+	'korean' =>           array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
+	'latin' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'latvian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'lithuanian' =>       array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'macedonian' =>       array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'malay' =>            array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
+	'manx' =>             array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'marathi' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'middle_frisian' =>   array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'mingo' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'nepali' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'norwegian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'occitan' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'pashto' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'persian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'polish' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'portuguese' =>       array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'quechua_cusco' =>    array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'romanian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'rumantsch' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'russian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'sanskrit' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'serbian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'serbian_cyrillic' => array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'simpl_chinese' =>    array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
+	'slovak' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'slovenian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'spanish' =>          array('format' => 'title last_name, first_name', 'sort_by' => 'last_name'), // Library order
+	'swahili' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'swedish' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'tagalog' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'tamil' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'thai' =>             array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'trad_chinese' =>     array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
+	'turkish' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'ukrainian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'vietnamese' =>       array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
+	'welsh' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'yiddish' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
+	'yoruba' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name')
 );

main/inc/lib/fileManage.lib.php

Spacing +13 added lines, -13 removed lines

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

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

Spacing +10 added lines, -10 removed lines

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

main/inc/lib/getid3/getid3.php

Spacing +111 added lines, -111 removed lines

@@ -27,42 +27,42 @@ 
     //// Settings Section - do NOT modify this file - change setting after newing getid3!
 
     // Encoding
-    public $encoding                 = 'ISO-8859-1';      // CASE SENSITIVE! - i.e. (must be supported by iconv() - see http://www.gnu.org/software/libiconv/).  Examples:  ISO-8859-1  UTF-8  UTF-16  UTF-16BE.
-    public $encoding_id3v1           = 'ISO-8859-1';      // Override SPECIFICATION encoding for broken ID3v1 tags caused by bad tag programs. Examples: 'EUC-CN' for "Chinese MP3s" and 'CP1251' for "Cyrillic".
-    public $encoding_id3v2           = 'ISO-8859-1';      // Override ISO-8859-1 encoding for broken ID3v2 tags caused by BRAINDEAD tag programs that writes system codepage as 'ISO-8859-1' instead of UTF-8.
+    public $encoding                 = 'ISO-8859-1'; // CASE SENSITIVE! - i.e. (must be supported by iconv() - see http://www.gnu.org/software/libiconv/).  Examples:  ISO-8859-1  UTF-8  UTF-16  UTF-16BE.
+    public $encoding_id3v1           = 'ISO-8859-1'; // Override SPECIFICATION encoding for broken ID3v1 tags caused by bad tag programs. Examples: 'EUC-CN' for "Chinese MP3s" and 'CP1251' for "Cyrillic".
+    public $encoding_id3v2           = 'ISO-8859-1'; // Override ISO-8859-1 encoding for broken ID3v2 tags caused by BRAINDEAD tag programs that writes system codepage as 'ISO-8859-1' instead of UTF-8.
 
     // Tags - disable for speed
-    public $option_tag_id3v1         = false;              // Read and process ID3v1 tags.
-    public $option_tag_id3v2         = false;              // Read and process ID3v2 tags.
-    public $option_tag_lyrics3       = false;              // Read and process Lyrics3 tags.
-    public $option_tag_apetag        = false;              // Read and process APE tags.
+    public $option_tag_id3v1         = false; // Read and process ID3v1 tags.
+    public $option_tag_id3v2         = false; // Read and process ID3v2 tags.
+    public $option_tag_lyrics3       = false; // Read and process Lyrics3 tags.
+    public $option_tag_apetag        = false; // Read and process APE tags.
 
     // Misc calucations - disable for speed
-    public $option_analyze           = true;              // Analyze file - disable if you only need to detect file format.
-    public $option_accurate_results  = true;              // Disable to greatly speed up parsing of some file formats at the cost of accuracy.
-    public $option_tags_process      = true;              // Copy tags to root key 'tags' and 'comments' and encode to $this->encoding.
-    public $option_tags_images       = false;             // Scan tags for binary image data - ID3v2 and vorbiscomments only.
-    public $option_extra_info        = true;              // Calculate/return additional info such as bitrate, channelmode etc.
-    public $option_max_2gb_check     = false;             // Check whether file is larger than 2 Gb and thus not supported by PHP.
+    public $option_analyze           = true; // Analyze file - disable if you only need to detect file format.
+    public $option_accurate_results  = true; // Disable to greatly speed up parsing of some file formats at the cost of accuracy.
+    public $option_tags_process      = true; // Copy tags to root key 'tags' and 'comments' and encode to $this->encoding.
+    public $option_tags_images       = false; // Scan tags for binary image data - ID3v2 and vorbiscomments only.
+    public $option_extra_info        = true; // Calculate/return additional info such as bitrate, channelmode etc.
+    public $option_max_2gb_check     = false; // Check whether file is larger than 2 Gb and thus not supported by PHP.
 
     // Misc data hashes - slow - require hash module
-    public $option_md5_data          = false;             // Get MD5 sum of data part - slow.
-    public $option_md5_data_source   = false;             // Use MD5 of source file if available - only FLAC, MAC, OptimFROG and Wavpack4.
-    public $option_sha1_data         = false;             // Get SHA1 sum of data part - slow.
+    public $option_md5_data          = false; // Get MD5 sum of data part - slow.
+    public $option_md5_data_source   = false; // Use MD5 of source file if available - only FLAC, MAC, OptimFROG and Wavpack4.
+    public $option_sha1_data         = false; // Get SHA1 sum of data part - slow.
 
     // Public variables
-    public $filename;                                     // Filename of file being analysed.
-    public $fp;                                           // Filepointer to file being analysed.
-    public $info;                                         // Result array.
+    public $filename; // Filename of file being analysed.
+    public $fp; // Filepointer to file being analysed.
+    public $info; // Result array.
 
     // Protected variables
-    protected $include_path;                              // getid3 include path.
-    protected $warnings = array ();
+    protected $include_path; // getid3 include path.
+    protected $warnings = array();
     protected $iconv_present;
 
     // Class constants
     const VERSION           = '2.0.0b4';
-    const FREAD_BUFFER_SIZE = 16384;                      // Read buffer size in bytes.
+    const FREAD_BUFFER_SIZE = 16384; // Read buffer size in bytes.
     const ICONV_TEST_STRING = ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~�������������������������������� �����������������������������������������������������������������������������������������������';
 
 
@@ -87,7 +87,7 @@ 
         }
 
         // Get include_path
-        $this->include_path = $include_path = dirname(__FILE__) . '/';
+        $this->include_path = $include_path = dirname(__FILE__).'/';
 
         // Check for presence of iconv() and make sure it works (simpel test only).
         if (function_exists('iconv') && @iconv('UTF-16LE', 'ISO-8859-1', @iconv('ISO-8859-1', 'UTF-16LE', getid3::ICONV_TEST_STRING)) == getid3::ICONV_TEST_STRING) {
@@ -123,7 +123,7 @@ 
 
 
         // Check safe_mode off
-        if ((bool)ini_get('safe_mode')) {
+        if ((bool) ini_get('safe_mode')) {
             $this->warning('Safe mode is on, shorten support disabled, md5data/sha1data for ogg vorbis disabled, ogg vorbis/flac tag writing disabled.');
         }
 
@@ -137,10 +137,10 @@ 
 
         // Init and save values
         $this->filename = $filename;
-        $this->warnings = array ();
+        $this->warnings = array();
 
         // Init result array and set parameters
-        $this->info = array ();
+        $this->info = array();
         $this->info['GETID3_VERSION'] = getid3::VERSION;
 
         // Remote files not supported
@@ -179,7 +179,7 @@ 
 
             fseek($this->fp, 0, SEEK_SET);
             $header = fread($this->fp, 10);
-            if (substr($header, 0, 3) == 'ID3'  &&  strlen($header) == 10) {
+            if (substr($header, 0, 3) == 'ID3' && strlen($header) == 10) {
                 $this->info['id3v2']['header']        = true;
                 $this->info['id3v2']['majorversion']  = ord($header{3});
                 $this->info['id3v2']['minorversion']  = ord($header{4});
@@ -189,13 +189,13 @@ 
 
 
         // Handle tags
-        foreach (array ("id3v2", "id3v1", "apetag", "lyrics3") as $tag_name) {
+        foreach (array("id3v2", "id3v1", "apetag", "lyrics3") as $tag_name) {
 
-            $option_tag = 'option_tag_' . $tag_name;
+            $option_tag = 'option_tag_'.$tag_name;
             if ($this->$option_tag) {
                 $this->include_module('tag.'.$tag_name);
                 try {
-                    $tag_class = 'getid3_' . $tag_name;
+                    $tag_class = 'getid3_'.$tag_name;
                     $tag = new $tag_class($this);
                     $tag->Analyze();
                 }
@@ -231,7 +231,7 @@ 
                     return $this->info;
                 }
 
-                $determined_format = $info;  // copy $info deleted by foreach()
+                $determined_format = $info; // copy $info deleted by foreach()
                 continue;
             }
         }
@@ -341,7 +341,7 @@ 
 
             // Set playtime string
             if (!empty($this->info['playtime_seconds']) && empty($this->info['playtime_string'])) {
-                $this->info['playtime_string'] =  floor(round($this->info['playtime_seconds']) / 60) . ':' . str_pad(floor(round($this->info['playtime_seconds']) % 60), 2, 0, STR_PAD_LEFT);;
+                $this->info['playtime_string'] = floor(round($this->info['playtime_seconds']) / 60).':'.str_pad(floor(round($this->info['playtime_seconds']) % 60), 2, 0, STR_PAD_LEFT); ;
             }
 
 
@@ -349,7 +349,7 @@ 
             if (@$this->info['video'] && @$this->info['video']['resolution_x'] && @$this->info['video']['resolution_y'] && @$this->info['video']['bits_per_sample']) {
 
                 // From static image formats
-                if (in_array($this->info['video']['dataformat'], array ('bmp', 'gif', 'jpeg', 'jpg', 'png', 'tiff'))) {
+                if (in_array($this->info['video']['dataformat'], array('bmp', 'gif', 'jpeg', 'jpg', 'png', 'tiff'))) {
                     $frame_rate         = 1;
                     $bitrate_compressed = $this->info['filesize'] * 8;
                 }
@@ -471,7 +471,7 @@ 
     //  Clear all warnings when cloning
     public function __clone() {
 
-        $this->warnings = array ();
+        $this->warnings = array();
 
         // Copy info array, otherwise it will be a reference.
         $temp = $this->info;
@@ -503,7 +503,7 @@ 
             return $result;
         }
 
-        $this->warning('iconv() was unable to convert the string: "' . $string . '" from ' . $in_charset . ' to ' . $out_charset);
+        $this->warning('iconv() was unable to convert the string: "'.$string.'" from '.$in_charset.' to '.$out_charset);
         return $string;
     }
 
@@ -534,12 +534,12 @@ 
     // Return array containing information about all supported formats
     public static function GetFileFormatArray() {
 
-        static $format_info = array (
+        static $format_info = array(
 
                 // Audio formats
 
                 // AC-3   - audio      - Dolby AC-3 / Dolby Digital
-                'ac3'  => array (
+                'ac3'  => array(
                             'pattern'   => '^\x0B\x77',
                             'group'     => 'audio',
                             'module'    => 'ac3',
@@ -547,7 +547,7 @@ 
                           ),
 
                 // AAC  - audio       - Advanced Audio Coding (AAC) - ADIF format
-                'adif' => array (
+                'adif' => array(
                             'pattern'   => '^ADIF',
                             'group'     => 'audio',
                             'module'    => 'aac_adif',
@@ -557,7 +557,7 @@ 
 
 
                 // AAC  - audio       - Advanced Audio Coding (AAC) - ADTS format (very similar to MP3)
-                'adts' => array (
+                'adts' => array(
                             'pattern'   => '^\xFF[\xF0-\xF1\xF8-\xF9]',
                             'group'     => 'audio',
                             'module'    => 'aac_adts',
@@ -567,7 +567,7 @@ 
 
 
                 // AU   - audio       - NeXT/Sun AUdio (AU)
-                'au'   => array (
+                'au'   => array(
                             'pattern'   => '^\.snd',
                             'group'     => 'audio',
                             'module'    => 'au',
@@ -575,7 +575,7 @@ 
                           ),
 
                 // AVR  - audio       - Audio Visual Research
-                'avr'  => array (
+                'avr'  => array(
                             'pattern'   => '^2BIT',
                             'group'     => 'audio',
                             'module'    => 'avr',
@@ -583,7 +583,7 @@ 
                           ),
 
                 // BONK - audio       - Bonk v0.9+
-                'bonk' => array (
+                'bonk' => array(
                             'pattern'   => '^\x00(BONK|INFO|META| ID3)',
                             'group'     => 'audio',
                             'module'    => 'bonk',
@@ -599,7 +599,7 @@ 
 						),
 
                 // FLAC - audio       - Free Lossless Audio Codec
-                'flac' => array (
+                'flac' => array(
                             'pattern'   => '^fLaC',
                             'group'     => 'audio',
                             'module'    => 'xiph',
@@ -607,7 +607,7 @@ 
                           ),
 
                 // LA   - audio       - Lossless Audio (LA)
-                'la'   => array (
+                'la'   => array(
                             'pattern'   => '^LA0[2-4]',
                             'group'     => 'audio',
                             'module'    => 'la',
@@ -615,7 +615,7 @@ 
                           ),
 
                 // LPAC - audio       - Lossless Predictive Audio Compression (LPAC)
-                'lpac' => array (
+                'lpac' => array(
                             'pattern'   => '^LPAC',
                             'group'     => 'audio',
                             'module'    => 'lpac',
@@ -623,7 +623,7 @@ 
                           ),
 
                 // MIDI - audio       - MIDI (Musical Instrument Digital Interface)
-                'midi' => array (
+                'midi' => array(
                             'pattern'   => '^MThd',
                             'group'     => 'audio',
                             'module'    => 'midi',
@@ -631,7 +631,7 @@ 
                           ),
 
                 // MAC  - audio       - Monkey's Audio Compressor
-                'mac'  => array (
+                'mac'  => array(
                             'pattern'   => '^MAC ',
                             'group'     => 'audio',
                             'module'    => 'monkey',
@@ -639,31 +639,31 @@ 
                           ),
 
                 // MOD  - audio       - MODule (assorted sub-formats)
-                'mod'  => array (
+                'mod'  => array(
                             'pattern'   => '^.{1080}(M.K.|[5-9]CHN|[1-3][0-9]CH)',
                             'mime_type' => 'audio/mod',
                           ),
 
                 // MOD  - audio       - MODule (Impulse Tracker)
-                'it'   => array (
+                'it'   => array(
                             'pattern'   => '^IMPM',
                             'mime_type' => 'audio/it',
                           ),
 
                 // MOD  - audio       - MODule (eXtended Module, various sub-formats)
-                'xm'   => array (
+                'xm'   => array(
                             'pattern'   => '^Extended Module',
                             'mime_type' => 'audio/xm',
                           ),
 
                 // MOD  - audio       - MODule (ScreamTracker)
-                's3m'  => array (
+                's3m'  => array(
                             'pattern'   => '^.{44}SCRM',
                             'mime_type' => 'audio/s3m',
                           ),
 
                 // MPC  - audio       - Musepack / MPEGplus SV7+
-                'mpc'  => array (
+                'mpc'  => array(
                             'pattern'   => '^(MP\+)',
                             'group'     => 'audio',
                             'module'    => 'mpc',
@@ -671,7 +671,7 @@ 
                           ),
 
                 // MPC  - audio       - Musepack / MPEGplus SV4-6
-                'mpc_old' => array (
+                'mpc_old' => array(
                             'pattern'   => '^([\x00\x01\x10\x11\x40\x41\x50\x51\x80\x81\x90\x91\xC0\xC1\xD0\xD1][\x20-37][\x00\x20\x40\x60\x80\xA0\xC0\xE0])',
                             'group'     => 'audio',
                             'module'    => 'mpc_old',
@@ -680,7 +680,7 @@ 
 
 
                 // MP3  - audio       - MPEG-audio Layer 3 (very similar to AAC-ADTS)
-                'mp3'  => array (
+                'mp3'  => array(
                             'pattern'   => '^\xFF[\xE2-\xE7\xF2-\xF7\xFA-\xFF][\x00-\xEB]',
                             'group'     => 'audio',
                             'module'    => 'mp3',
@@ -688,7 +688,7 @@ 
                           ),
 
                 // OFR  - audio       - OptimFROG
-                'ofr'  => array (
+                'ofr'  => array(
                             'pattern'   => '^(\*RIFF|OFR)',
                             'group'     => 'audio',
                             'module'    => 'optimfrog',
@@ -696,7 +696,7 @@ 
                           ),
 
                 // RKAU - audio       - RKive AUdio compressor
-                'rkau' => array (
+                'rkau' => array(
                             'pattern'   => '^RKA',
                             'group'     => 'audio',
                             'module'    => 'rkau',
@@ -704,7 +704,7 @@ 
                           ),
 
                 // SHN  - audio       - Shorten
-                'shn'  => array (
+                'shn'  => array(
                             'pattern'   => '^ajkg',
                             'group'     => 'audio',
                             'module'    => 'shorten',
@@ -714,15 +714,15 @@ 
                           ),
 
                 // TTA  - audio       - TTA Lossless Audio Compressor (http://tta.corecodec.org)
-                'tta'  => array (
-                            'pattern'   => '^TTA',  // could also be '^TTA(\x01|\x02|\x03|2|1)'
+                'tta'  => array(
+                            'pattern'   => '^TTA', // could also be '^TTA(\x01|\x02|\x03|2|1)'
                             'group'     => 'audio',
                             'module'    => 'tta',
                             'mime_type' => 'application/octet-stream',
                           ),
 
                 // VOC  - audio       - Creative Voice (VOC)
-                'voc'  => array (
+                'voc'  => array(
                             'pattern'   => '^Creative Voice File',
                             'group'     => 'audio',
                             'module'    => 'voc',
@@ -730,7 +730,7 @@ 
                           ),
 
                 // VQF  - audio       - transform-domain weighted interleave Vector Quantization Format (VQF)
-                'vqf'  => array (
+                'vqf'  => array(
                             'pattern'   => '^TWIN',
                             'group'     => 'audio',
                             'module'    => 'vqf',
@@ -749,7 +749,7 @@ 
                 // Audio-Video formats
 
                 // ASF  - audio/video - Advanced Streaming Format, Windows Media Video, Windows Media Audio
-                'asf'  => array (
+                'asf'  => array(
                             'pattern'   => '^\x30\x26\xB2\x75\x8E\x66\xCF\x11\xA6\xD9\x00\xAA\x00\x62\xCE\x6C',
                             'group'     => 'audio-video',
                             'module'    => 'asf',
@@ -771,13 +771,13 @@ 
                           ),
 
                 // MKAV - audio/video - Mastroka
-                'matroska' => array (
+                'matroska' => array(
                             'pattern'   => '^\x1A\x45\xDF\xA3',
                             'mime_type' => 'application/octet-stream',
                           ),
 
                 // MPEG - audio/video - MPEG (Moving Pictures Experts Group)
-                'mpeg' => array (
+                'mpeg' => array(
                             'pattern'   => '^\x00\x00\x01(\xBA|\xB3)',
                             'group'     => 'audio-video',
                             'module'    => 'mpeg',
@@ -785,7 +785,7 @@ 
                           ),
 
                 // NSV  - audio/video - Nullsoft Streaming Video (NSV)
-                'nsv'  => array (
+                'nsv'  => array(
                             'pattern'   => '^NSV[sf]',
                             'group'     => 'audio-video',
                             'module'    => 'nsv',
@@ -793,7 +793,7 @@ 
                           ),
 
                 // Ogg  - audio/video - Ogg (Ogg Vorbis, OggFLAC, Speex, Ogg Theora(*), Ogg Tarkin(*))
-                'ogg'  => array (
+                'ogg'  => array(
                             'pattern'   => '^OggS',
                             'group'     => 'audio',
                             'module'    => 'xiph',
@@ -803,7 +803,7 @@ 
                           ),
 
                 // QT   - audio/video - Quicktime
-                'quicktime' => array (
+                'quicktime' => array(
                             'pattern'   => '^.{4}(cmov|free|ftyp|mdat|moov|pnot|skip|wide)',
                             'group'     => 'audio-video',
                             'module'    => 'quicktime',
@@ -811,7 +811,7 @@ 
                           ),
 
                 // RIFF - audio/video - Resource Interchange File Format (RIFF) / WAV / AVI / CD-audio / SDSS = renamed variant used by SmartSound QuickTracks (www.smartsound.com) / FORM = Audio Interchange File Format (AIFF)
-                'riff' => array (
+                'riff' => array(
                             'pattern'   => '^(RIFF|SDSS|FORM)',
                             'group'     => 'audio-video',
                             'module'    => 'riff',
@@ -820,7 +820,7 @@ 
                           ),
 
                 // Real - audio/video - RealAudio, RealVideo
-                'real' => array (
+                'real' => array(
                             'pattern'   => '^(\.RMF|.ra)',
                             'group'     => 'audio-video',
                             'module'    => 'real',
@@ -828,7 +828,7 @@ 
                           ),
 
                 // SWF - audio/video - ShockWave Flash
-                'swf' => array (
+                'swf' => array(
                             'pattern'   => '^(F|C)WS',
                             'group'     => 'audio-video',
                             'module'    => 'swf',
@@ -839,7 +839,7 @@ 
                 // Still-Image formats
 
                 // BMP  - still image - Bitmap (Windows, OS/2; uncompressed, RLE8, RLE4)
-                'bmp'  => array (
+                'bmp'  => array(
                             'pattern'   => '^BM',
                             'group'     => 'graphic',
                             'module'    => 'bmp',
@@ -849,7 +849,7 @@ 
                           ),
 
                 // GIF  - still image - Graphics Interchange Format
-                'gif'  => array (
+                'gif'  => array(
                             'pattern'   => '^GIF',
                             'group'     => 'graphic',
                             'module'    => 'gif',
@@ -859,7 +859,7 @@ 
                           ),
 
                 // JPEG - still image - Joint Photographic Experts Group (JPEG)
-                'jpeg'  => array (
+                'jpeg'  => array(
                             'pattern'   => '^\xFF\xD8\xFF',
                             'group'     => 'graphic',
                             'module'    => 'jpeg',
@@ -869,7 +869,7 @@ 
                           ),
 
                 // PCD  - still image - Kodak Photo CD
-                'pcd'  => array (
+                'pcd'  => array(
                             'pattern'   => '^.{2048}PCD_IPI\x00',
                             'group'     => 'graphic',
                             'module'    => 'pcd',
@@ -880,7 +880,7 @@ 
 
 
                 // PNG  - still image - Portable Network Graphics (PNG)
-                'png'  => array (
+                'png'  => array(
                             'pattern'   => '^\x89\x50\x4E\x47\x0D\x0A\x1A\x0A',
                             'group'     => 'graphic',
                             'module'    => 'png',
@@ -900,7 +900,7 @@ 
 
 
                 // TIFF  - still image - Tagged Information File Format (TIFF)
-                'tiff' => array (
+                'tiff' => array(
                             'pattern'   => '^(II\x2A\x00|MM\x00\x2A)',
                             'group'     => 'graphic',
                             'module'    => 'tiff',
@@ -920,7 +920,7 @@ 
                           ),
 
                 // ISO  - data        - International Standards Organization (ISO) CD-ROM Image
-                'iso'  => array (
+                'iso'  => array(
                             'pattern'   => '^.{32769}CD001',
                             'group'     => 'misc',
                             'module'    => 'iso',
@@ -938,7 +938,7 @@ 
                           ),
 
                 // SZIP - audio       - SZIP compressed data
-                'szip' => array (
+                'szip' => array(
                             'pattern'   => '^SZ\x0A\x04',
                             'group'     => 'archive',
                             'module'    => 'szip',
@@ -969,7 +969,7 @@ 
 
 
                 // ZIP  - data        - ZIP compressed data
-                'zip'  => array (
+                'zip'  => array(
                             'pattern'   => '^PK\x03\x04',
                             'group'     => 'archive',
                             'module'    => 'zip',
@@ -980,7 +980,7 @@ 
 
 
                 // PAR2 - data        - Parity Volume Set Specification 2.0
-                'par2' => array (
+                'par2' => array(
                 			'pattern'   => '^PAR2\x00PKT',
 							'mime_type' => 'application/octet-stream',
 							'fail_id3'  => 'ERROR',
@@ -1039,22 +1039,22 @@ 
     protected function HandleAllTags() {
 
         // Key name => array (tag name, character encoding)
-        static $tags = array (
-            'asf'       => array ('asf',           'UTF-16LE'),
-            'midi'      => array ('midi',          'ISO-8859-1'),
-            'nsv'       => array ('nsv',           'ISO-8859-1'),
-            'ogg'       => array ('vorbiscomment', 'UTF-8'),
-            'png'       => array ('png',           'UTF-8'),
-            'tiff'      => array ('tiff',          'ISO-8859-1'),
-            'quicktime' => array ('quicktime',     'ISO-8859-1'),
-            'real'      => array ('real',          'ISO-8859-1'),
-            'vqf'       => array ('vqf',           'ISO-8859-1'),
-            'zip'       => array ('zip',           'ISO-8859-1'),
-            'riff'      => array ('riff',          'ISO-8859-1'),
-            'lyrics3'   => array ('lyrics3',       'ISO-8859-1'),
-            'id3v1'     => array ('id3v1',         ''),            // change below - cannot assign variable to static array
-            'id3v2'     => array ('id3v2',         'UTF-8'),       // module converts all frames to UTF-8
-            'ape'       => array ('ape',           'UTF-8')
+        static $tags = array(
+            'asf'       => array('asf', 'UTF-16LE'),
+            'midi'      => array('midi', 'ISO-8859-1'),
+            'nsv'       => array('nsv', 'ISO-8859-1'),
+            'ogg'       => array('vorbiscomment', 'UTF-8'),
+            'png'       => array('png', 'UTF-8'),
+            'tiff'      => array('tiff', 'ISO-8859-1'),
+            'quicktime' => array('quicktime', 'ISO-8859-1'),
+            'real'      => array('real', 'ISO-8859-1'),
+            'vqf'       => array('vqf', 'ISO-8859-1'),
+            'zip'       => array('zip', 'ISO-8859-1'),
+            'riff'      => array('riff', 'ISO-8859-1'),
+            'lyrics3'   => array('lyrics3', 'ISO-8859-1'),
+            'id3v1'     => array('id3v1', ''), // change below - cannot assign variable to static array
+            'id3v2'     => array('id3v2', 'UTF-8'), // module converts all frames to UTF-8
+            'ape'       => array('ape', 'UTF-8')
         );
         $tags['id3v1'][1] = $this->encoding_id3v1;
 
@@ -1063,7 +1063,7 @@ 
             list($tag_name, $encoding) = $tag_name_encoding_array;
 
             // Fill in default encoding type if not already present
-            @$this->info[$comment_name]  and  $this->info[$comment_name]['encoding'] = $encoding;
+            @$this->info[$comment_name] and $this->info[$comment_name]['encoding'] = $encoding;
 
             // Copy comments if key name set
             if (@$this->info[$comment_name]['comments']) {
@@ -1142,11 +1142,11 @@ 
 abstract class getid3_handler
 {
 
-    protected $getid3;                          // pointer
+    protected $getid3; // pointer
 
-    protected $data_string_flag = false;        // analyzing filepointer or string
-    protected $data_string;                     // string to analyze
-    protected $data_string_position = 0;        // seek position in string
+    protected $data_string_flag = false; // analyzing filepointer or string
+    protected $data_string; // string to analyze
+    protected $data_string_position = 0; // seek position in string
 
 
     public function __construct(getID3 $getid3) {
@@ -1247,20 +1247,20 @@ 
     public function __construct($filename) {
 
         if (!file_exists($filename)) {
-            throw new getid3_exception('File does not exist: "' . $filename . '"');
+            throw new getid3_exception('File does not exist: "'.$filename.'"');
         }
 
         if (!is_writeable($filename)) {
-            throw new getid3_exception('File is not writeable: "' . $filename . '"');
+            throw new getid3_exception('File is not writeable: "'.$filename.'"');
         }
 
         if (!is_writeable(dirname($filename))) {
-            throw new getid3_exception('Directory is not writeable: ' . dirname($filename) . ' (need to write lock file).');
+            throw new getid3_exception('Directory is not writeable: '.dirname($filename).' (need to write lock file).');
         }
 
         $this->user_abort = ignore_user_abort(true);
 
-        $this->fp_lock = fopen($filename . '.getid3.lock', 'w');
+        $this->fp_lock = fopen($filename.'.getid3.lock', 'w');
         flock($this->fp_lock, LOCK_EX);
 
         $this->filename = $filename;
@@ -1271,7 +1271,7 @@ 
 
         flock($this->fp_lock, LOCK_UN);
         fclose($this->fp_lock);
-        unlink($this->filename . '.getid3.lock');
+        unlink($this->filename.'.getid3.lock');
 
         ignore_user_abort($this->user_abort);
     }
@@ -1325,7 +1325,7 @@ 
 
 
     // Convert number to Little Endian byte string
-    public static function LittleEndian2String($number, $minbytes=1, $synchsafe=false) {
+    public static function LittleEndian2String($number, $minbytes = 1, $synchsafe = false) {
         $intstring = '';
         while ($number > 0) {
             if ($synchsafe) {
@@ -1485,7 +1485,7 @@ 
 	}
 
 
-	public static function PrintHexBytes($string, $hex=true, $spaces=true, $html_safe=true) {
+	public static function PrintHexBytes($string, $hex = true, $spaces = true, $html_safe = true) {
 
         $return_string = '';
         for ($i = 0; $i < strlen($string); $i++) {
@@ -1545,7 +1545,7 @@ 
 
     public static function NameLookup($name_code) {
 
-        static $lookup = array (
+        static $lookup = array(
             0 => 'not set',
             1 => 'Track Gain Adjustment',
             2 => 'Album Gain Adjustment'
@@ -1558,7 +1558,7 @@ 
 
     public static function OriginatorLookup($originator_code) {
 
-        static $lookup = array (
+        static $lookup = array(
             0 => 'unspecified',
             1 => 'pre-set by artist/producer/mastering engineer',
             2 => 'set by user',
@@ -1572,7 +1572,7 @@ 
 
     public static function AdjustmentLookup($raw_adjustment, $sign_bit) {
 
-        return (float)$raw_adjustment / 10 * ($sign_bit == 1 ? -1 : 1);
+        return (float) $raw_adjustment / 10 * ($sign_bit == 1 ? -1 : 1);
     }
 
 

main/inc/lib/login_redirection.class.php

Spacing +6 added lines, -6 removed lines

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

main/inc/lib/attendance.lib.php

Spacing +63 added lines, -63 removed lines

@@ -73,7 +73,7 @@ 
             $course_id = intval($course_id);
         }
 
-        $session_id = isset($session_id)?intval($session_id):api_get_session_id();
+        $session_id = isset($session_id) ? intval($session_id) : api_get_session_id();
         $condition_session = api_get_session_condition($session_id);
 
         // Get attendance data
@@ -82,7 +82,7 @@ 
                 WHERE c_id = $course_id AND active = 1 $condition_session ";
         $rs  = Database::query($sql);
         if (Database::num_rows($rs) > 0) {
-            while ($row = Database::fetch_array($rs,'ASSOC')) {
+            while ($row = Database::fetch_array($rs, 'ASSOC')) {
                 $data[$row['id']] = $row;
             }
         }
@@ -108,7 +108,7 @@ 
 		$from = intval($from);
 		$number_of_items = intval($number_of_items);
 
-		if (!in_array($direction, array('ASC','DESC'))) {
+		if (!in_array($direction, array('ASC', 'DESC'))) {
 			$direction = 'ASC';
 		}
 
@@ -135,7 +135,7 @@ 
 				LIMIT $from,$number_of_items ";
 
 		$res = Database::query($sql);
-		$attendances = array ();
+		$attendances = array();
 		$user_info = api_get_user_info();
 		$allowDelete = api_get_setting('allow_delete_attendance');
 
@@ -194,8 +194,8 @@ 
 						$attendance[2] = '<span class="muted">'.$attendance[2].'</span>';
 					}
 					if ($allowDelete === 'true') {
-						$actions .= '<a href="index.php?' . api_get_cidreq() . '&action=attendance_delete&attendance_id=' . $attendance[0]. '">' .
-							Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL) . '</a>';
+						$actions .= '<a href="index.php?'.api_get_cidreq().'&action=attendance_delete&attendance_id='.$attendance[0].'">'.
+							Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
 					}
 				} else {
 					$is_locked_attendance = self::is_locked_attendance($attendance[0]);
@@ -215,8 +215,8 @@ 
 							$attendance[2] = '<span class="muted">'.$attendance[2].'</span>';
 						}
 						if ($allowDelete === 'true') {
-							$actions .= ' <a href="index.php?' . api_get_cidreq() . '&action=attendance_delete&attendance_id=' . $attendance[0].'">' .
-								Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL) . '</a>';
+							$actions .= ' <a href="index.php?'.api_get_cidreq().'&action=attendance_delete&attendance_id='.$attendance[0].'">'.
+								Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
 						}
 					}
 				}
@@ -225,7 +225,7 @@ 
 				$is_done_all_calendar = self::is_all_attendance_calendar_done($attendance[0]);
 
 				if ($is_done_all_calendar) {
-					$locked   = $attendance[4];
+					$locked = $attendance[4];
 					if ($locked == 0) {
 						if (api_is_platform_admin()) {
 							$message_alert = get_lang('AreYouSureToLockTheAttendance');
@@ -245,7 +245,7 @@ 
 				}
 				$actions .= '</center>';
 
-				$attendances[] = array($attendance[0], $attendance[1], $attendance[2], $attendance[3],$actions);
+				$attendances[] = array($attendance[0], $attendance[1], $attendance[2], $attendance[3], $actions);
 			} else {
 				$attendance[0] = '&nbsp;';
 				$attendances[] = array($attendance[0], $attendance[1], $attendance[2], $attendance[3]);
@@ -285,13 +285,13 @@ 
 	public function attendance_add($link_to_gradebook = false)
 	{
 		$_course = api_get_course_info();
-		$tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
+		$tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
 		$table_link = Database:: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
 		$session_id = api_get_session_id();
 		$user_id = api_get_user_id();
 		$course_code = $_course['code'];
 		$course_id = $_course['real_id'];
-		$title_gradebook= $this->attendance_qualify_title;
+		$title_gradebook = $this->attendance_qualify_title;
 		$value_calification = 0;
 		$weight_calification = floatval($this->attendance_weight);
 
@@ -434,12 +434,12 @@ 
 	public function attendance_restore($attendance_id)
 	{
 		$_course = api_get_course_info();
-		$tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
+		$tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
 		$user_id = api_get_user_id();
 		$course_id = $_course['real_id'];
 		if (is_array($attendance_id)) {
 			foreach ($attendance_id as $id) {
-				$id	= intval($id);
+				$id = intval($id);
 				$sql = "UPDATE $tbl_attendance SET active = 1
 						WHERE c_id = $course_id AND id = '$id'";
 				$result = Database::query($sql);
@@ -455,8 +455,8 @@ 
                     );
 				}
 			}
-		} else  {
-			$attendance_id	= intval($attendance_id);
+		} else {
+			$attendance_id = intval($attendance_id);
 			$sql = "UPDATE $tbl_attendance SET active = 1
 					WHERE c_id = $course_id AND id = '$attendance_id'";
 			$result = Database::query($sql);
@@ -484,13 +484,13 @@ 
 	public function attendance_delete($attendance_id)
 	{
 		$_course = api_get_course_info();
-		$tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
+		$tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
         $user_id = api_get_user_id();
         $course_id = $_course['real_id'];
 
 		if (is_array($attendance_id)) {
 			foreach ($attendance_id as $id) {
-				$id	= intval($id);
+				$id = intval($id);
 				$sql = "UPDATE $tbl_attendance SET active = 2
 						WHERE c_id = $course_id AND id = '$id'";
 				$result = Database::query($sql);
@@ -506,8 +506,8 @@ 
                     );
 				}
 			}
-		} else  {
-			$attendance_id= intval($attendance_id);
+		} else {
+			$attendance_id = intval($attendance_id);
 			$sql = "UPDATE $tbl_attendance SET active = 2
 					WHERE c_id = $course_id AND id = '$attendance_id'";
 
@@ -538,7 +538,7 @@ 
 	public function changeVisibility($attendanceId, $status = 1)
 	{
 		$_course = api_get_course_info();
-		$tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
+		$tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
 		$user_id = api_get_user_id();
 		$course_id = $_course['real_id'];
 		$status = intval($status);
@@ -550,7 +550,7 @@ 
 
 		if (is_array($attendanceId)) {
 			foreach ($attendanceId as $id) {
-				$id	= intval($id);
+				$id = intval($id);
 				$sql = "UPDATE $tbl_attendance SET active = $status
 						WHERE c_id = $course_id AND id = '$id'";
 				$result = Database::query($sql);
@@ -560,8 +560,8 @@ 
 					api_item_property_update($_course, TOOL_ATTENDANCE, $id, $action, $user_id);
 				}
 			}
-		} else  {
-			$attendanceId	= intval($attendanceId);
+		} else {
+			$attendanceId = intval($attendanceId);
 			$sql = "UPDATE $tbl_attendance SET active = $status
 					WHERE c_id = $course_id AND id = '$attendanceId'";
 			$result = Database::query($sql);
@@ -591,7 +591,7 @@ 
 		$tbl_attendance = Database::get_course_table(TABLE_ATTENDANCE);
 		$course_id = api_get_course_int_id();
 		$attendance_id = intval($attendance_id);
-		$locked = ($lock)?1:0;
+		$locked = ($lock) ? 1 : 0;
 		$upd = "UPDATE $tbl_attendance SET locked = $locked
 				WHERE c_id = $course_id AND id = $attendance_id";
 		$result = Database::query($upd);
@@ -720,8 +720,8 @@ 
 	 */
 	public function attendance_sheet_add($calendar_id, $users_present, $attendance_id)
 	{
-		$tbl_attendance_sheet 	= Database::get_course_table(TABLE_ATTENDANCE_SHEET);
-		$tbl_attendance_calendar= Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
+		$tbl_attendance_sheet = Database::get_course_table(TABLE_ATTENDANCE_SHEET);
+		$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
 
 		$calendar_id = intval($calendar_id);
 		$attendance_id = intval($attendance_id);
@@ -729,7 +729,7 @@ 
 		$course_id = api_get_course_int_id();
 
 		$user_ids = array_keys($users);
-		$users_absent = array_diff($user_ids,$users_present);
+		$users_absent = array_diff($user_ids, $users_present);
 		$affected_rows = 0;
 
 		// get last edit type
@@ -993,13 +993,13 @@ 
 	public function get_faults_of_user($user_id, $attendance_id, $groupId = null)
 	{
 		// initializing database table and variables
-		$user_id 		= intval($user_id);
+		$user_id = intval($user_id);
 		$attendance_id 	= intval($attendance_id);
 		$results = array();
 		$calendar_count = self::get_number_of_attendance_calendar($attendance_id, $groupId, NULL, $user_id);
 		// $total_done_attendance 	= $attendance_data['attendance_qualify_max'];
-        $total_done_attendance 	= self::get_number_of_attendance_calendar($attendance_id, $groupId, true, $user_id);
-		$attendance_user_score  = $this->get_user_score($user_id, $attendance_id, $groupId);
+        $total_done_attendance = self::get_number_of_attendance_calendar($attendance_id, $groupId, true, $user_id);
+		$attendance_user_score = $this->get_user_score($user_id, $attendance_id, $groupId);
 
 		//This is the main change of the BT#1381
 		//$total_done_attendance = $calendar_count;
@@ -1012,7 +1012,7 @@ 
         }
 
         $faults = $faults > 0 ? $faults : 0;
-		$faults_porcent = $calendar_count > 0 ?round(($faults*100)/$calendar_count,0):0;
+		$faults_porcent = $calendar_count > 0 ? round(($faults * 100) / $calendar_count, 0) : 0;
         $results['faults'] = $faults;
         $results['total'] = $calendar_count;
         $results['faults_porcent'] = $faults_porcent;
@@ -1046,13 +1046,13 @@ 
 			//$course_code = $course['code'];
 			//$course_info = api_get_course_info($course_code);
 			$course_id = $course['real_id'];
-			$tbl_attendance_result 	= Database::get_course_table(TABLE_ATTENDANCE_RESULT);
+			$tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
 
 			$attendances_by_course = $this->get_attendances_list($course_id);
 
 			foreach ($attendances_by_course as $attendance) {
 				// get total faults and total weight
-				$total_done_attendance 	= $attendance['attendance_qualify_max'];
+				$total_done_attendance = $attendance['attendance_qualify_max'];
 				$sql = "SELECT score
 						FROM $tbl_attendance_result
                         WHERE
@@ -1065,16 +1065,16 @@ 
 					$row = Database::fetch_array($rs);
 					$score = $row['score'];
 				}
-				$faults = $total_done_attendance-$score;
-				$faults = $faults > 0 ? $faults:0;
+				$faults = $total_done_attendance - $score;
+				$faults = $faults > 0 ? $faults : 0;
 				$total_faults += $faults;
 				$total_weight += $total_done_attendance;
 			}
 		}
 
-		$porcent = $total_weight > 0 ?round(($total_faults*100)/$total_weight,0):0;
+		$porcent = $total_weight > 0 ? round(($total_faults * 100) / $total_weight, 0) : 0;
 		$results['faults'] 	= $total_faults;
-		$results['total']	= $total_weight;
+		$results['total'] = $total_weight;
 		$results['porcent'] = $porcent;
 
 		return $results;
@@ -1092,7 +1092,7 @@ 
 	{
 		// Database tables and variables
 		$course_info = api_get_course_info($course_code);
-		$tbl_attendance_result 	= Database::get_course_table(TABLE_ATTENDANCE_RESULT);
+		$tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
 		$user_id = intval($user_id);
 		$results = array();
 		$total_faults = $total_weight = $porcent = 0;
@@ -1100,7 +1100,7 @@ 
 
 		foreach ($attendances_by_course as $attendance) {
 			// Get total faults and total weight
-			$total_done_attendance 	= $attendance['attendance_qualify_max'];
+			$total_done_attendance = $attendance['attendance_qualify_max'];
 			$sql = "SELECT score FROM $tbl_attendance_result
 					WHERE
 						c_id = {$course_info['real_id']} AND
@@ -1112,15 +1112,15 @@ 
 				$row = Database::fetch_array($rs);
 				$score = $row['score'];
 			}
-			$faults = $total_done_attendance-$score;
-			$faults = $faults > 0 ? $faults:0;
+			$faults = $total_done_attendance - $score;
+			$faults = $faults > 0 ? $faults : 0;
 			$total_faults += $faults;
 			$total_weight += $total_done_attendance;
 		}
 
-		$porcent = $total_weight > 0 ?round(($total_faults*100)/$total_weight,0):0;
+		$porcent = $total_weight > 0 ? round(($total_faults * 100) / $total_weight, 0) : 0;
 		$results['faults'] 	= $total_faults;
-		$results['total']	= $total_weight;
+		$results['total'] = $total_weight;
 		$results['porcent'] = $porcent;
 
 		return $results;
@@ -1134,8 +1134,8 @@ 
 	 */
 	public function get_users_attendance_sheet($attendance_id, $user_id = 0, $groupId = null)
 	{
-		$tbl_attendance_sheet 	= Database::get_course_table(TABLE_ATTENDANCE_SHEET);
-		$tbl_attendance_calendar= Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
+		$tbl_attendance_sheet = Database::get_course_table(TABLE_ATTENDANCE_SHEET);
+		$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
 
 		$attendance_calendar = $this->get_attendance_calendar($attendance_id, 'all', null, $groupId);
 		$calendar_ids = array();
@@ -1157,7 +1157,7 @@ 
 					        WHERE
 					        	c_id = $course_id AND
 					        	user_id = '$uid' AND
-					        	attendance_calendar_id IN(".implode(',',$calendar_ids).")
+					        	attendance_calendar_id IN(".implode(',', $calendar_ids).")
 							";
 					$res = Database::query($sql);
 					if (Database::num_rows($res) > 0) {
@@ -1179,7 +1179,7 @@ 
 							att.c_id = $course_id AND
 							cal.c_id =  $course_id AND
 							att.user_id = '$user_id' AND
-							att.attendance_calendar_id IN (".implode(',',$calendar_ids).")
+							att.attendance_calendar_id IN (".implode(',', $calendar_ids).")
                         ORDER BY date_time";
 				$res = Database::query($sql);
 				if (Database::num_rows($res) > 0) {
@@ -1255,7 +1255,7 @@ 
 	 */
 	public function get_user_score($user_id, $attendance_id, $groupId = null)
 	{
-		$tbl_attendance_result 	= Database::get_course_table(TABLE_ATTENDANCE_RESULT);
+		$tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
         $tbl_attendance_sheet = Database::get_course_table(TABLE_ATTENDANCE_SHEET);
         $tbl_attendance_cal_rel_group = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR_REL_GROUP);
         $tbl_attendance_cal = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
@@ -1369,7 +1369,7 @@ 
                    ";
 		}
 
-		if (!in_array($type, array('today', 'all', 'all_done', 'all_not_done','calendar_id'))) {
+		if (!in_array($type, array('today', 'all', 'all_done', 'all_not_done', 'calendar_id'))) {
 			$type = 'all';
 		}
 
@@ -1377,7 +1377,7 @@ 
 			case 'calendar_id':
 				$calendar_id = intval($calendar_id);
 				if (!empty($calendar_id)) {
-					$sql.= " AND c.id = $calendar_id";
+					$sql .= " AND c.id = $calendar_id";
 				}
 				break;
 			case 'today':
@@ -1398,7 +1398,7 @@ 
 		$rs = Database::query($sql);
 		$data = array();
 		if (Database::num_rows($rs) > 0) {
-			while ($row = Database::fetch_array($rs,'ASSOC')) {
+			while ($row = Database::fetch_array($rs, 'ASSOC')) {
 				$row['db_date_time'] = $row['date_time'];
 				$row['date_time'] = api_get_local_time($row['date_time']);
 				$row['date'] = api_format_date($row['date_time'], DATE_FORMAT_SHORT);
@@ -1762,14 +1762,14 @@ 
 	 * @param   int     The number of years to add
 	 * @return  int     The new timestamp
 	 */
-	private function add_month($timestamp, $num=1)
+	private function add_month($timestamp, $num = 1)
 	{
 		$values = api_get_utc_datetime($timestamp);
-		$values = str_replace(array(':','-',' '), '/', $values);
-		list($y, $m, $d, $h, $n, $s) = split('/',$values);
-		if($m+$num>12) {
-			$y += floor($num/12);
-			$m += $num%12;
+		$values = str_replace(array(':', '-', ' '), '/', $values);
+		list($y, $m, $d, $h, $n, $s) = split('/', $values);
+		if ($m + $num > 12) {
+			$y += floor($num / 12);
+			$m += $num % 12;
 		} else {
 			$m += $num;
 		}
@@ -1827,7 +1827,7 @@ 
 	 * @param	bool	true for removing all calendar inside current attendance, false for removing by calendar id
 	 * @return	int affected rows
 	 */
-	public function attendance_calendar_delete($calendar_id, $attendance_id , $all_delete = false)
+	public function attendance_calendar_delete($calendar_id, $attendance_id, $all_delete = false)
 	{
 		$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
 		$tbl_attendance_sheet = Database::get_course_table(TABLE_ATTENDANCE_SHEET);
@@ -1963,7 +1963,7 @@ 
 		}
 
 		$sessionId = api_get_session_id();
-		$courseCode  = api_get_course_id();
+		$courseCode = api_get_course_id();
 		if (!empty($sessionId)) {
 			$users = CourseManager:: get_user_list_from_course_code(
 				$courseCode,
@@ -1984,7 +1984,7 @@ 
 
 		$dateTimeStartOriginal = new DateTime($startDate);
 		$dateTimeStart = new DateTime($startDate);
-		$dateTimeEnd= new DateTime($endDate);
+		$dateTimeEnd = new DateTime($endDate);
 		$interval = $dateTimeStart->diff($dateTimeEnd);
 		$days = intval($interval->format('%a'));
 
@@ -2057,7 +2057,7 @@ 
 				0,
 				$user['lastname'].' '.$user['firstname'].' ('.$user['username'].')'
 			);
-			$row ++;
+			$row++;
 		}
 
 		$column = 1;
@@ -2134,7 +2134,7 @@ 
 		$tableToString = $table->toHtml();
 
 		$params = array(
-			'filename' => get_lang('Attendance') . '_' . api_get_utc_datetime(),
+			'filename' => get_lang('Attendance').'_'.api_get_utc_datetime(),
 			'pdf_title' => get_lang('Attendance'),
 			'course_code' => api_get_course_id(),
 			'show_real_course_teachers' => true

main/inc/lib/magpierss/rss_fetch.inc

Spacing +77 added lines, -77 removed lines

@@ -26,15 +26,15 @@ 
 }
 
 if (!defined('MAGPIE_DIR')) {
-    define('MAGPIE_DIR', dirname(__FILE__) . DIR_SEP);
+    define('MAGPIE_DIR', dirname(__FILE__).DIR_SEP);
 }
 
-require_once( MAGPIE_DIR . 'rss_parse.inc' );
-require_once( MAGPIE_DIR . 'rss_cache.inc' );
+require_once(MAGPIE_DIR.'rss_parse.inc');
+require_once(MAGPIE_DIR.'rss_cache.inc');
 
 // for including 3rd party libraries
-define('MAGPIE_EXTLIB', MAGPIE_DIR . 'extlib' . DIR_SEP);
-require_once( MAGPIE_EXTLIB . 'Snoopy.class.inc');
+define('MAGPIE_EXTLIB', MAGPIE_DIR.'extlib'.DIR_SEP);
+require_once(MAGPIE_EXTLIB.'Snoopy.class.inc');
 define('MAGPIE_CACHE_DIR', api_get_path(SYS_ARCHIVE_PATH));
 
 /* 
@@ -87,21 +87,21 @@ 
 
 $MAGPIE_ERROR = "";
 
-function fetch_rss ($url) {
+function fetch_rss($url) {
     // initialize constants
     init();
     
-    if ( !isset($url) ) {
+    if (!isset($url)) {
         error("fetch_rss called without a url");
         return false;
     }
     
     // if cache is disabled
-    if ( !MAGPIE_CACHE_ON ) {
+    if (!MAGPIE_CACHE_ON) {
         // fetch file, and parse it
-        $resp = _fetch_remote_file( $url );
-        if ( is_success( $resp->status ) ) {
-            return _response_to_rss( $resp );
+        $resp = _fetch_remote_file($url);
+        if (is_success($resp->status)) {
+            return _response_to_rss($resp);
         }
         else {
             error("Failed to fetch $url and cache is off");
@@ -116,34 +116,34 @@ 
         // 3. if cached obj fails freshness check, fetch remote
         // 4. if remote fails, return stale object, or error
         
-        $cache = new RSSCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE );
+        $cache = new RSSCache(MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE);
         
         if (MAGPIE_DEBUG and $cache->ERROR) {
             debug($cache->ERROR, E_USER_WARNING);
         }
         
         
-        $cache_status    = 0;       // response of check_cache
+        $cache_status    = 0; // response of check_cache
         $request_headers = array(); // HTTP headers to send with fetch
-        $rss             = 0;       // parsed RSS object
-        $errormsg        = 0;       // errors, if any
+        $rss             = 0; // parsed RSS object
+        $errormsg        = 0; // errors, if any
         
         // store parsed XML by desired output encoding
         // as character munging happens at parse time
-        $cache_key       = $url . MAGPIE_OUTPUT_ENCODING;
+        $cache_key = $url.MAGPIE_OUTPUT_ENCODING;
         
         if (!$cache->ERROR) {
             // return cache HIT, MISS, or STALE
-            $cache_status = $cache->check_cache( $cache_key);
+            $cache_status = $cache->check_cache($cache_key);
         }
                 
         // if object cached, and cache is fresh, return cached obj
-        if ( $cache_status == 'HIT' ) {
-            $rss = $cache->get( $cache_key );
-            if ( isset($rss) and $rss ) {
+        if ($cache_status == 'HIT') {
+            $rss = $cache->get($cache_key);
+            if (isset($rss) and $rss) {
                 // should be cache age
                 $rss->from_cache = 1;
-                if ( MAGPIE_DEBUG > 1) {
+                if (MAGPIE_DEBUG > 1) {
                     debug("MagpieRSS: Cache HIT", E_USER_NOTICE);
                 }
                 return $rss;
@@ -153,50 +153,50 @@ 
         // else attempt a conditional get
         
         // setup headers
-        if ( $cache_status == 'STALE' ) {
-            $rss = $cache->get( $cache_key );
-            if ( $rss and $rss->etag and $rss->last_modified ) {
+        if ($cache_status == 'STALE') {
+            $rss = $cache->get($cache_key);
+            if ($rss and $rss->etag and $rss->last_modified) {
                 $request_headers['If-None-Match'] = $rss->etag;
                 $request_headers['If-Last-Modified'] = $rss->last_modified;
             }
         }
         
-        $resp = _fetch_remote_file( $url, $request_headers );
+        $resp = _fetch_remote_file($url, $request_headers);
         
         if (isset($resp) and $resp) {
-          if ($resp->status == '304' ) {
+          if ($resp->status == '304') {
                 // we have the most current copy
-                if ( MAGPIE_DEBUG > 1) {
+                if (MAGPIE_DEBUG > 1) {
                     debug("Got 304 for $url");
                 }
                 // reset cache on 304 (at minutillo insistent prodding)
                 $cache->set($cache_key, $rss);
                 return $rss;
             }
-            elseif ( is_success( $resp->status ) ) {
-                $rss = _response_to_rss( $resp );
-                if ( $rss ) {
+            elseif (is_success($resp->status)) {
+                $rss = _response_to_rss($resp);
+                if ($rss) {
                     if (MAGPIE_DEBUG > 1) {
                         debug("Fetch successful");
                     }
                     // add object to cache
-                    $cache->set( $cache_key, $rss );
+                    $cache->set($cache_key, $rss);
                     return $rss;
                 }
             }
             else {
                 $errormsg = "Failed to fetch $url ";
-                if ( $resp->status == '-100' ) {
-                    $errormsg .= "(Request timed out after " . MAGPIE_FETCH_TIME_OUT . " seconds)";
+                if ($resp->status == '-100') {
+                    $errormsg .= "(Request timed out after ".MAGPIE_FETCH_TIME_OUT." seconds)";
                 }
-                elseif ( $resp->error ) {
+                elseif ($resp->error) {
                     # compensate for Snoopy's annoying habbit to tacking
                     # on '\n'
                     $http_error = substr($resp->error, 0, -2); 
                     $errormsg .= "(HTTP Error: $http_error)";
                 }
                 else {
-                    $errormsg .=  "(HTTP Response: " . $resp->response_code .')';
+                    $errormsg .= "(HTTP Response: ".$resp->response_code.')';
                 }
             }
         }
@@ -208,7 +208,7 @@ 
         
         // attempt to return cached object
         if ($rss) {
-            if ( MAGPIE_DEBUG ) {
+            if (MAGPIE_DEBUG) {
                 debug("Returning STALE object for $url");
             }
             return $rss;
@@ -228,21 +228,21 @@ 
     Purpose:    set MAGPIE_ERROR, and trigger error
 \*=======================================================================*/
 
-function error ($errormsg, $lvl=E_USER_WARNING) {
+function error($errormsg, $lvl = E_USER_WARNING) {
         global $MAGPIE_ERROR;
         
         // append PHP's error message if track_errors enabled
-        if ( isset($php_errormsg) ) { 
+        if (isset($php_errormsg)) { 
             $errormsg .= " ($php_errormsg)";
         }
-        if ( $errormsg ) {
+        if ($errormsg) {
             $errormsg = "MagpieRSS: $errormsg";
             $MAGPIE_ERROR = $errormsg;
-            trigger_error( $errormsg, $lvl);                
+            trigger_error($errormsg, $lvl);                
         }
 }
 
-function debug ($debugmsg, $lvl=E_USER_NOTICE) {
+function debug($debugmsg, $lvl = E_USER_NOTICE) {
     trigger_error("MagpieRSS [debug] $debugmsg", $lvl);
 }
             
@@ -250,10 +250,10 @@ 
     Function:   magpie_error
     Purpose:    accessor for the magpie error variable
 \*=======================================================================*/
-function magpie_error ($errormsg="") {
+function magpie_error($errormsg = "") {
     global $MAGPIE_ERROR;
     
-    if ( isset($errormsg) and $errormsg ) { 
+    if (isset($errormsg) and $errormsg) { 
         $MAGPIE_ERROR = $errormsg;
     }
     
@@ -267,13 +267,13 @@ 
                 headers to send along with the request (optional)
     Output:     an HTTP response object (see Snoopy.class.inc)  
 \*=======================================================================*/
-function _fetch_remote_file ($url, $headers = "" ) {
+function _fetch_remote_file($url, $headers = "") {
     // Snoopy is an HTTP client in PHP
     $client = new Snoopy();
     $client->agent = MAGPIE_USER_AGENT;
     $client->read_timeout = MAGPIE_FETCH_TIME_OUT;
     $client->use_gzip = MAGPIE_USE_GZIP;
-    if (is_array($headers) ) {
+    if (is_array($headers)) {
         $client->rawheaders = $headers;
     }
     
@@ -288,14 +288,14 @@ 
     Input:      an HTTP response object (see Snoopy)
     Output:     parsed RSS object (see rss_parse)
 \*=======================================================================*/
-function _response_to_rss ($resp) {
-    $rss = new MagpieRSS( $resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING );
+function _response_to_rss($resp) {
+    $rss = new MagpieRSS($resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING);
     
     // if RSS parsed successfully       
-    if ( $rss and !$rss->ERROR) {
+    if ($rss and !$rss->ERROR) {
         
         // find Etag, and Last-Modified
-        foreach($resp->headers as $h) {
+        foreach ($resp->headers as $h) {
             // 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
             if (strpos($h, ": ")) {
                 list($field, $val) = explode(": ", $h, 2);
@@ -305,11 +305,11 @@ 
                 $val = "";
             }
             
-            if ( $field == 'ETag' ) {
+            if ($field == 'ETag') {
                 $rss->etag = $val;
             }
             
-            if ( $field == 'Last-Modified' ) {
+            if ($field == 'Last-Modified') {
                 $rss->last_modified = $val;
             }
         }
@@ -320,9 +320,9 @@ 
         $errormsg = "Failed to parse RSS file.";
         
         if ($rss) {
-            $errormsg .= " (" . $rss->ERROR . ")";
+            $errormsg .= " (".$rss->ERROR.")";
         }
-        error($errormsg,E_USER_NOTICE);
+        error($errormsg, E_USER_NOTICE);
         
         return false;
     } // end if ($rss and !$rss->error)
@@ -333,65 +333,65 @@ 
     Purpose:    setup constants with default values
                 check for user overrides
 \*=======================================================================*/
-function init () {
-    if ( defined('MAGPIE_INITALIZED') ) {
+function init() {
+    if (defined('MAGPIE_INITALIZED')) {
         return;
     }
     else {
         define('MAGPIE_INITALIZED', true);
     }
     
-    if ( !defined('MAGPIE_CACHE_ON') ) {
+    if (!defined('MAGPIE_CACHE_ON')) {
         define('MAGPIE_CACHE_ON', true);
     }
 
-    if ( !defined('MAGPIE_CACHE_DIR') ) {
+    if (!defined('MAGPIE_CACHE_DIR')) {
         define('MAGPIE_CACHE_DIR', './cache');
     }
 
-    if ( !defined('MAGPIE_CACHE_AGE') ) {
-        define('MAGPIE_CACHE_AGE', 60*60); // one hour
+    if (!defined('MAGPIE_CACHE_AGE')) {
+        define('MAGPIE_CACHE_AGE', 60 * 60); // one hour
     }
 
-    if ( !defined('MAGPIE_CACHE_FRESH_ONLY') ) {
+    if (!defined('MAGPIE_CACHE_FRESH_ONLY')) {
         define('MAGPIE_CACHE_FRESH_ONLY', false);
     }
 
-    if ( !defined('MAGPIE_OUTPUT_ENCODING') ) {
+    if (!defined('MAGPIE_OUTPUT_ENCODING')) {
         define('MAGPIE_OUTPUT_ENCODING', 'UTF-8');
     }
     
-    if ( !defined('MAGPIE_INPUT_ENCODING') ) {
+    if (!defined('MAGPIE_INPUT_ENCODING')) {
         define('MAGPIE_INPUT_ENCODING', null);
     }
     
-    if ( !defined('MAGPIE_DETECT_ENCODING') ) {
+    if (!defined('MAGPIE_DETECT_ENCODING')) {
         define('MAGPIE_DETECT_ENCODING', true);
     }
     
-    if ( !defined('MAGPIE_DEBUG') ) {
+    if (!defined('MAGPIE_DEBUG')) {
         define('MAGPIE_DEBUG', 0);
     }
     
-    if ( !defined('MAGPIE_USER_AGENT') ) {
-        $ua = 'MagpieRSS/'. MAGPIE_VERSION . ' (+http://magpierss.sf.net';
+    if (!defined('MAGPIE_USER_AGENT')) {
+        $ua = 'MagpieRSS/'.MAGPIE_VERSION.' (+http://magpierss.sf.net';
         
-        if ( MAGPIE_CACHE_ON ) {
-            $ua = $ua . ')';
+        if (MAGPIE_CACHE_ON) {
+            $ua = $ua.')';
         }
         else {
-            $ua = $ua . '; No cache)';
+            $ua = $ua.'; No cache)';
         }
         
         define('MAGPIE_USER_AGENT', $ua);
     }
     
-    if ( !defined('MAGPIE_FETCH_TIME_OUT') ) {
+    if (!defined('MAGPIE_FETCH_TIME_OUT')) {
         define('MAGPIE_FETCH_TIME_OUT', 5); // 5 second timeout
     }
     
     // use gzip encoding to fetch rss files if supported?
-    if ( !defined('MAGPIE_USE_GZIP') ) {
+    if (!defined('MAGPIE_USE_GZIP')) {
         define('MAGPIE_USE_GZIP', true);    
     }
 }
@@ -414,7 +414,7 @@ 
     Function:   is_info
     Purpose:    return true if Informational status code
 \*=======================================================================*/
-function is_info ($sc) { 
+function is_info($sc) { 
     return $sc >= 100 && $sc < 200; 
 }
 
@@ -422,7 +422,7 @@ 
     Function:   is_success
     Purpose:    return true if Successful status code
 \*=======================================================================*/
-function is_success ($sc) { 
+function is_success($sc) { 
     return $sc >= 200 && $sc < 300; 
 }
 
@@ -430,7 +430,7 @@ 
     Function:   is_redirect
     Purpose:    return true if Redirection status code
 \*=======================================================================*/
-function is_redirect ($sc) { 
+function is_redirect($sc) { 
     return $sc >= 300 && $sc < 400; 
 }
 
@@ -438,7 +438,7 @@ 
     Function:   is_error
     Purpose:    return true if Error status code
 \*=======================================================================*/
-function is_error ($sc) { 
+function is_error($sc) { 
     return $sc >= 400 && $sc < 600; 
 }
 
@@ -446,7 +446,7 @@ 
     Function:   is_client_error
     Purpose:    return true if Error status code, and its a client error
 \*=======================================================================*/
-function is_client_error ($sc) { 
+function is_client_error($sc) { 
     return $sc >= 400 && $sc < 500; 
 }
 
@@ -454,6 +454,6 @@ 
     Function:   is_client_error
     Purpose:    return true if Error status code, and its a server error
 \*=======================================================================*/
-function is_server_error ($sc) { 
+function is_server_error($sc) { 
     return $sc >= 500 && $sc < 600; 
 }

main/inc/lib/magpierss/rss_cache.inc

Spacing +47 added lines, -47 removed lines

@@ -19,26 +19,26 @@ 
  * @package chamilo.include.rss
  */
 class RSSCache {
-    public $BASE_CACHE = './cache';    // where the cache files are stored
-    public $MAX_AGE    = 3600;         // when are files stale, default one hour
-    public $ERROR      = "";           // accumulate error messages
+    public $BASE_CACHE = './cache'; // where the cache files are stored
+    public $MAX_AGE    = 3600; // when are files stale, default one hour
+    public $ERROR      = ""; // accumulate error messages
     
-    public function RSSCache ($base='', $age='') {
-        if ( $base ) {
+    public function RSSCache($base = '', $age = '') {
+        if ($base) {
             $this->BASE_CACHE = $base;
         }
-        if ( $age ) {
+        if ($age) {
             $this->MAX_AGE = $age;
         }
         
         // attempt to make the cache directory
-        if ( ! file_exists( $this->BASE_CACHE ) ) {
-            $status = @mkdir( $this->BASE_CACHE, 0755 );
+        if (!file_exists($this->BASE_CACHE)) {
+            $status = @mkdir($this->BASE_CACHE, 0755);
             
             // if make failed 
-            if ( ! $status ) {
+            if (!$status) {
                 $this->error(
-                    "Cache couldn't make dir '" . $this->BASE_CACHE . "'."
+                    "Cache couldn't make dir '".$this->BASE_CACHE."'."
                 );
             }
         }
@@ -50,12 +50,12 @@ 
     Input:      url from wich the rss file was fetched
     Output:     true on sucess  
 \*=======================================================================*/
-    public function set ($url, $rss) {
+    public function set($url, $rss) {
         $this->ERROR = "";
-        $cache_file = $this->file_name( $url );
-        $fp = @fopen( $cache_file, 'w' );
+        $cache_file = $this->file_name($url);
+        $fp = @fopen($cache_file, 'w');
         
-        if ( ! $fp ) {
+        if (!$fp) {
             $this->error(
                 "Cache unable to open file for writing: $cache_file"
             );
@@ -63,9 +63,9 @@ 
         }
         
         
-        $data = $this->serialize( $rss );
-        fwrite( $fp, $data );
-        fclose( $fp );
+        $data = $this->serialize($rss);
+        fwrite($fp, $data);
+        fclose($fp);
         
         return $cache_file;
     }
@@ -76,11 +76,11 @@ 
     Input:      url from wich the rss file was fetched
     Output:     cached object on HIT, false on MISS 
 \*=======================================================================*/ 
-    public function get ($url) {
+    public function get($url) {
         $this->ERROR = "";
-        $cache_file = $this->file_name( $url );
+        $cache_file = $this->file_name($url);
         
-        if ( ! file_exists( $cache_file ) ) {
+        if (!file_exists($cache_file)) {
             $this->debug( 
                 "Cache doesn't contain: $url (cache file: $cache_file)"
             );
@@ -88,16 +88,16 @@ 
         }
         
         $fp = @fopen($cache_file, 'r');
-        if ( ! $fp ) {
+        if (!$fp) {
             $this->error(
                 "Failed to open cache file for reading: $cache_file"
             );
             return 0;
         }
         
-        if ($filesize = filesize($cache_file) ) {
-        	$data = fread( $fp, filesize($cache_file) );
-        	$rss = $this->unserialize( $data );
+        if ($filesize = filesize($cache_file)) {
+        	$data = fread($fp, filesize($cache_file));
+        	$rss = $this->unserialize($data);
         
         	return $rss;
     	}
@@ -112,16 +112,16 @@ 
     Input:      url from wich the rss file was fetched
     Output:     cached object on HIT, false on MISS 
 \*=======================================================================*/     
-    public function check_cache ( $url ) {
+    public function check_cache($url) {
         $this->ERROR = "";
-        $filename = $this->file_name( $url );
+        $filename = $this->file_name($url);
         
-        if ( file_exists( $filename ) ) {
+        if (file_exists($filename)) {
             // find how long ago the file was added to the cache
             // and whether that is longer then MAX_AGE
-            $mtime = filemtime( $filename );
+            $mtime = filemtime($filename);
             $age = time() - $mtime;
-            if ( $this->MAX_AGE > $age ) {
+            if ($this->MAX_AGE > $age) {
                 // object exists and is current
                 return 'HIT';
             }
@@ -136,10 +136,10 @@ 
         }
     }
 
-	public function cache_age( $url ) {
-		$filename = $this->file_name( $url);
-		if ( file_exists( $filename ) ) {
-			$mtime = filemtime( $filename );
+	public function cache_age($url) {
+		$filename = $this->file_name($url);
+		if (file_exists($filename)) {
+			$mtime = filemtime($filename);
             $age = time() - $mtime;
 			return $age;
 		}
@@ -151,15 +151,15 @@ 
 /*=======================================================================*\
     Function:   serialize
 \*=======================================================================*/     
-    public function serialize ( $rss ) {
-        return serialize( $rss );
+    public function serialize($rss) {
+        return serialize($rss);
     }
 
 /*=======================================================================*\
     Function:   unserialize
 \*=======================================================================*/     
-    public function unserialize ( $data ) {
-        return unserialize( $data );
+    public function unserialize($data) {
+        return unserialize($data);
     }
     
 /*=======================================================================*\
@@ -168,31 +168,31 @@ 
     Input:      url from wich the rss file was fetched
     Output:     a file name
 \*=======================================================================*/     
-    public function file_name ($url) {
-        $filename = md5( $url );
-        return join( DIRECTORY_SEPARATOR, array( $this->BASE_CACHE, $filename ) );
+    public function file_name($url) {
+        $filename = md5($url);
+        return join(DIRECTORY_SEPARATOR, array($this->BASE_CACHE, $filename));
     }
 
 /*=======================================================================*\
     Function:   error
     Purpose:    register error
 \*=======================================================================*/         
-    public function error ($errormsg, $lvl=E_USER_WARNING) {
+    public function error($errormsg, $lvl = E_USER_WARNING) {
         // append PHP's error message if track_errors enabled
-        if ( isset($php_errormsg) ) { 
+        if (isset($php_errormsg)) { 
             $errormsg .= " ($php_errormsg)";
         }
         $this->ERROR = $errormsg;
-        if ( MAGPIE_DEBUG ) {
-            trigger_error( $errormsg, $lvl);
+        if (MAGPIE_DEBUG) {
+            trigger_error($errormsg, $lvl);
         }
         else {
-            error_log( $errormsg, 0);
+            error_log($errormsg, 0);
         }
     }
     
-    public function debug ($debugmsg, $lvl=E_USER_NOTICE) {
-        if ( MAGPIE_DEBUG ) {
+    public function debug($debugmsg, $lvl = E_USER_NOTICE) {
+        if (MAGPIE_DEBUG) {
             $this->error("MagpieRSS [debug] $debugmsg", $lvl);
         }
     }