chamilo / chamilo-lms

main/inc/lib/hook/interfaces/HookSkypeObserverInterface.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * This file contains all Hook interfaces and their relation.
- * They are used for Hook classes
- * @package chamilo.library.hook
- */
+     * This file contains all Hook interfaces and their relation.
+     * They are used for Hook classes
+     * @package chamilo.library.hook
+     */
 
 /**
  * Interface SkypeHookInterface

main/inc/lib/hook/HookObserver.php

Indentation +5 added lines, -5 removed lines

@@ -1,11 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * This file contains an abstract Hook observer class
- * Used for Hook Observers in plugins, called when a hook event happens
- * (e.g Create user, Webservice registration)
- * @package chamilo.library.hook
- */
+     * This file contains an abstract Hook observer class
+     * Used for Hook Observers in plugins, called when a hook event happens
+     * (e.g Create user, Webservice registration)
+     * @package chamilo.library.hook
+     */
 
 /**
  * Class HookObserver

main/inc/lib/hook/HookNotificationTitle.php

Indentation +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * This file contains the Hook Event class for Title of Notifications
- * @package chamilo.library.hook
- */
+     * This file contains the Hook Event class for Title of Notifications
+     * @package chamilo.library.hook
+     */
 
 /**
  * Class HookNotificationTitle

main/inc/lib/hook/HookManagement.php

Indentation +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * @TODO: Improve description
- * @package chamilo.hookmanagement
- */
+     * @TODO: Improve description
+     * @package chamilo.hookmanagement
+     */
 class HookManagement implements HookManagementInterface
 {
     /**

main/inc/lib/hook/HookEvent.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * This file contains an abstract Hook event class
- * Used for Hook Events (e.g Create user, Webservice registration)
- * @package chamilo.library.hook
- */
+     * This file contains an abstract Hook event class
+     * Used for Hook Events (e.g Create user, Webservice registration)
+     * @package chamilo.library.hook
+     */
 
 /**
  * Class HookEvent

main/inc/lib/online.inc.php

Indentation +159 added lines, -159 removed lines

@@ -166,10 +166,10 @@ 
  */
 function LoginDelete($user_id)
 {
-	$online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    $online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
     $user_id = intval($user_id);
-	$query = "DELETE FROM " . $online_table . " WHERE login_user_id = $user_id";
-	Database::query($query);
+    $query = "DELETE FROM " . $online_table . " WHERE login_user_id = $user_id";
+    Database::query($query);
 }
 
 /**
@@ -178,17 +178,17 @@ 
  */
 function user_is_online($user_id)
 {
-	$track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
-	$table_user = Database::get_main_table(TABLE_MAIN_USER);
+    $track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    $table_user = Database::get_main_table(TABLE_MAIN_USER);
 
-	$access_url_id = api_get_current_access_url_id();
-	$time_limit = api_get_setting('time_limit_whosonline');
+    $access_url_id = api_get_current_access_url_id();
+    $time_limit = api_get_setting('time_limit_whosonline');
 
     $online_time = time() - $time_limit*60;
     $limit_date = api_get_utc_datetime($online_time);
     $user_id = intval($user_id);
 
-	$query = " SELECT login_user_id,login_date
+    $query = " SELECT login_user_id,login_date
                FROM $track_online_table track
                INNER JOIN $table_user u ON (u.id=track.login_user_id)
                WHERE
@@ -197,13 +197,13 @@ 
                     u.id =  $user_id
                LIMIT 1 ";
 
-	$result = Database::query($query);
-	if (Database::num_rows($result)) {
+    $result = Database::query($query);
+    if (Database::num_rows($result)) {
 
-		return true;
-	}
+        return true;
+    }
 
-	return false;
+    return false;
 
 }
 /**
@@ -239,13 +239,13 @@ 
 
     $online_time = time() - $time_limit * 60;
     $current_date = api_get_utc_datetime($online_time);
-	$track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
-	$friend_user_table = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
-	$table_user	= Database::get_main_table(TABLE_MAIN_USER);
+    $track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    $friend_user_table = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
+    $table_user	= Database::get_main_table(TABLE_MAIN_USER);
 
-	if ($friends) {
-		// 	who friends from social network is online
-		$query = "SELECT DISTINCT login_user_id, login_date
+    if ($friends) {
+        // 	who friends from social network is online
+        $query = "SELECT DISTINCT login_user_id, login_date
 				  FROM $track_online_table INNER JOIN $friend_user_table
 				  ON (friend_user_id = login_user_id)
 				  WHERE
@@ -255,21 +255,21 @@ 
                     user_id = '".api_get_user_id()."'
                   ORDER BY $column $direction
                   LIMIT $from, $number_of_items";
-	} else {
-		$query = "SELECT DISTINCT login_user_id, login_date
+    } else {
+        $query = "SELECT DISTINCT login_user_id, login_date
                     FROM ".$track_online_table ." e
 		            INNER JOIN ".$table_user ." u ON (u.id = e.login_user_id)
                   WHERE u.status != ".ANONYMOUS." AND login_date >= '".$current_date."'
                   ORDER BY $column $direction
                   LIMIT $from, $number_of_items";
-	}
-
-	if (api_get_multiple_access_url()) {
-		$access_url_id = api_get_current_access_url_id();
-		if ($access_url_id != -1) {
-			if ($friends) {
-				// 	friends from social network is online
-				$query = "SELECT distinct login_user_id, login_date
+    }
+
+    if (api_get_multiple_access_url()) {
+        $access_url_id = api_get_current_access_url_id();
+        if ($access_url_id != -1) {
+            if ($friends) {
+                // 	friends from social network is online
+                $query = "SELECT distinct login_user_id, login_date
 							FROM $track_online_table track INNER JOIN $friend_user_table
 							ON (friend_user_id = login_user_id)
 							WHERE   track.access_url_id =  $access_url_id AND
@@ -278,9 +278,9 @@ 
                                     relation_type='".USER_RELATION_TYPE_FRIEND."'
                             ORDER BY $column $direction
                             LIMIT $from, $number_of_items";
-			} else {
-				// all users online
-				$query = "SELECT login_user_id, login_date
+            } else {
+                // all users online
+                $query = "SELECT login_user_id, login_date
 						  FROM ".$track_online_table ." track
                           INNER JOIN ".$table_user ." u
                           ON (u.id=track.login_user_id)
@@ -288,26 +288,26 @@ 
                                 login_date >= '".$current_date."'
                           ORDER BY $column $direction
                           LIMIT $from, $number_of_items";
-			}
-		}
-	}
+            }
+        }
+    }
 
-	//This query will show all registered users. Only for dev purposes.
-	/*$query = "SELECT DISTINCT u.id as login_user_id, login_date FROM ".$track_online_table ."  e , $table_user u
+    //This query will show all registered users. Only for dev purposes.
+    /*$query = "SELECT DISTINCT u.id as login_user_id, login_date FROM ".$track_online_table ."  e , $table_user u
             GROUP by u.id
             ORDER BY $column $direction
             LIMIT $from, $number_of_items";*/
 
-	$result = Database::query($query);
-	if ($result) {
-		$users_online = array();
-		while (list($login_user_id, $login_date) = Database::fetch_row($result)) {
+    $result = Database::query($query);
+    if ($result) {
+        $users_online = array();
+        while (list($login_user_id, $login_date) = Database::fetch_row($result)) {
             $users_online[] = $login_user_id;
-		}
-		return $users_online;
-	} else {
-		return false;
-	}
+        }
+        return $users_online;
+    } else {
+        return false;
+    }
 }
 
 function who_is_online_count($time_limit = null, $friends = false)
@@ -317,15 +317,15 @@ 
     } else {
         $time_limit = intval($time_limit);
     }
-	$track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
-	$friend_user_table = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
-	$table_user = Database::get_main_table(TABLE_MAIN_USER);
-	$online_time = time() - $time_limit * 60;
-	$current_date = api_get_utc_datetime($online_time);
-
-	if ($friends) {
-		// 	who friends from social network is online
-		$query = "SELECT DISTINCT count(login_user_id) as count
+    $track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    $friend_user_table = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
+    $table_user = Database::get_main_table(TABLE_MAIN_USER);
+    $online_time = time() - $time_limit * 60;
+    $current_date = api_get_utc_datetime($online_time);
+
+    if ($friends) {
+        // 	who friends from social network is online
+        $query = "SELECT DISTINCT count(login_user_id) as count
 				  FROM $track_online_table INNER JOIN $friend_user_table
                   ON (friend_user_id = login_user_id)
 				  WHERE
@@ -333,20 +333,20 @@ 
 				        friend_user_id <> '".api_get_user_id()."' AND
 				        relation_type='".USER_RELATION_TYPE_FRIEND."' AND
 				        user_id = '".api_get_user_id()."' ";
-	} else {
-		// All users online
-		$query = "SELECT count(login_id) as count
+    } else {
+        // All users online
+        $query = "SELECT count(login_id) as count
                   FROM $track_online_table track INNER JOIN $table_user u
                   ON (u.id=track.login_user_id)
                   WHERE u.status != ".ANONYMOUS." AND login_date >= '$current_date'  ";
-	}
-
-	if (api_get_multiple_access_url()) {
-		$access_url_id = api_get_current_access_url_id();
-		if ($access_url_id != -1) {
-			if ($friends) {
-				// 	friends from social network is online
-				$query = "SELECT DISTINCT count(login_user_id) as count
+    }
+
+    if (api_get_multiple_access_url()) {
+        $access_url_id = api_get_current_access_url_id();
+        if ($access_url_id != -1) {
+            if ($friends) {
+                // 	friends from social network is online
+                $query = "SELECT DISTINCT count(login_user_id) as count
 							FROM $track_online_table track
 							INNER JOIN $friend_user_table ON (friend_user_id = login_user_id)
 							WHERE
@@ -354,29 +354,29 @@ 
 							    login_date >= '".$current_date."' AND
 							    friend_user_id <> '".api_get_user_id()."' AND
 							    relation_type='".USER_RELATION_TYPE_FRIEND."'  ";
-			} else {
-				// all users online
-				$query = "SELECT count(login_id) as count FROM $track_online_table  track
+            } else {
+                // all users online
+                $query = "SELECT count(login_id) as count FROM $track_online_table  track
                           INNER JOIN $table_user u ON (u.id=track.login_user_id)
 						  WHERE
 						    u.status != ".ANONYMOUS." AND
 						    track.access_url_id =  $access_url_id AND
 						    login_date >= '$current_date' ";
-			}
-		}
-	}
+            }
+        }
+    }
 
     // Dev purposes show all users online
     /*$table_user = Database::get_main_table(TABLE_MAIN_USER);
     $query = "SELECT count(*)  as count FROM ".$table_user;*/
 
-	$result = Database::query($query);
-	if (Database::num_rows($result) > 0) {
-		$row = Database::fetch_array($result);
-		return $row['count'];
-	} else {
-		return false;
-	}
+    $result = Database::query($query);
+    if (Database::num_rows($result) > 0) {
+        $row = Database::fetch_array($result);
+        return $row['count'];
+    } else {
+        return false;
+    }
 }
 
 
@@ -389,7 +389,7 @@ 
 */
 function who_is_online_in_this_course($from, $number_of_items, $uid, $time_limit, $course_code)
 {
-	if (empty($course_code)) return false;
+    if (empty($course_code)) return false;
 
     if (empty($time_limit)) {
         $time_limit = api_get_setting('time_limit_whosonline');
@@ -401,56 +401,56 @@ 
     $current_date		= api_get_utc_datetime($online_time);
     $track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
     $course_code         = Database::escape_string($course_code);
-	$courseInfo = api_get_course_info($course_code);
-	$courseId = $courseInfo['real_id'];
+    $courseInfo = api_get_course_info($course_code);
+    $courseId = $courseInfo['real_id'];
 
     $from = intval($from);
     $number_of_items = intval($number_of_items);
 
-	$query = "SELECT login_user_id, login_date FROM $track_online_table
+    $query = "SELECT login_user_id, login_date FROM $track_online_table
               WHERE login_user_id <> 2 AND c_id = $courseId AND login_date >= '$current_date'
               LIMIT $from, $number_of_items ";
 
-	$result = Database::query($query);
-	if ($result) {
-		$users_online = array();
+    $result = Database::query($query);
+    if ($result) {
+        $users_online = array();
 
-		while(list($login_user_id, $login_date) = Database::fetch_row($result)) {
+        while(list($login_user_id, $login_date) = Database::fetch_row($result)) {
             $users_online[] = $login_user_id;
-		}
-		return $users_online;
-	} else {
-		return false;
-	}
+        }
+        return $users_online;
+    } else {
+        return false;
+    }
 }
 
 function who_is_online_in_this_course_count($uid, $time_limit, $coursecode=null)
 {
-	if (empty($coursecode)) {
-		return false;
-	}
-	$track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
-	$coursecode = Database::escape_string($coursecode);
-	$time_limit = Database::escape_string($time_limit);
+    if (empty($coursecode)) {
+        return false;
+    }
+    $track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    $coursecode = Database::escape_string($coursecode);
+    $time_limit = Database::escape_string($time_limit);
 
     $online_time = time() - $time_limit * 60;
     $current_date = api_get_utc_datetime($online_time);
-	$courseId = api_get_course_int_id($coursecode);
+    $courseId = api_get_course_int_id($coursecode);
 
-	if (empty($courseId)) {
-		return false;
-	}
+    if (empty($courseId)) {
+        return false;
+    }
 
-	$query = "SELECT count(login_user_id) as count
+    $query = "SELECT count(login_user_id) as count
               FROM $track_online_table
               WHERE login_user_id <> 2 AND c_id = $courseId AND login_date >= '$current_date' ";
-	$result = Database::query($query);
-	if (Database::num_rows($result) > 0) {
-		$row = Database::fetch_array($result);
-		return $row['count'];
-	} else {
-		return false;
-	}
+    $result = Database::query($query);
+    if (Database::num_rows($result) > 0) {
+        $row = Database::fetch_array($result);
+        return $row['count'];
+    } else {
+        return false;
+    }
 }
 
 /**
@@ -460,17 +460,17 @@ 
  * @deprecated user api_get_user_info($user_id)
  */
 function GetFullUserName($uid) {
-	$uid = (int) $uid;
-	$uid = intval($uid);
-	$user_table = Database::get_main_table(TABLE_MAIN_USER);
-	$query = "SELECT firstname, lastname FROM ".$user_table." WHERE id=$uid";
-	$result = @Database::query($query);
-	if (count($result)>0) {
-		while(list($firstname,$lastname)= Database::fetch_array($result)) {
-			$str = str_replace(' ', '&nbsp;', api_get_person_name($firstname, $lastname));
-			return $str;
-		}
-	}
+    $uid = (int) $uid;
+    $uid = intval($uid);
+    $user_table = Database::get_main_table(TABLE_MAIN_USER);
+    $query = "SELECT firstname, lastname FROM ".$user_table." WHERE id=$uid";
+    $result = @Database::query($query);
+    if (count($result)>0) {
+        while(list($firstname,$lastname)= Database::fetch_array($result)) {
+            $str = str_replace(' ', '&nbsp;', api_get_person_name($firstname, $lastname));
+            return $str;
+        }
+    }
 }
 
 /**
@@ -482,44 +482,44 @@ 
     $_cid = api_get_course_id();
     $_user = api_get_user_info();
 
-	if (!$_user['user_id']) {
-		return (false);
-	}
+    if (!$_user['user_id']) {
+        return (false);
+    }
     $userId = intval($_user['user_id']);
-	$track_user_table = Database::get_main_table(TABLE_MAIN_USER);
-	$sql="SELECT chatcall_user_id, chatcall_date FROM $track_user_table
+    $track_user_table = Database::get_main_table(TABLE_MAIN_USER);
+    $sql="SELECT chatcall_user_id, chatcall_date FROM $track_user_table
 	      WHERE ( id = $userId )";
-	$result=Database::query($sql);
-	$row=Database::fetch_array($result);
-
-	$login_date=$row['chatcall_date'];
-	$hour = substr($login_date,11,2);
-	$minute = substr($login_date,14,2);
-	$second = substr($login_date,17,2);
-	$month = substr($login_date,5,2);
-	$day = substr($login_date,8,2);
-	$year = substr($login_date,0,4);
-	$calltime = mktime($hour,$minute,$second,$month,$day,$year);
-
-	$time = api_get_utc_datetime();
-	$minute_passed=5;  //within this limit, the chat call request is valid
-	$limittime = mktime(date("H"),date("i")-$minute_passed,date("s"),date("m"),date("d"),date("Y"));
-
-	if (($row['chatcall_user_id']) and ($calltime>$limittime)) {
-		$webpath=api_get_path(WEB_CODE_PATH);
-		$message=get_lang('YouWereCalled').' : '.GetFullUserName($row['chatcall_user_id'],'').'<br>'.get_lang('DoYouAccept')
-							."<p>"
-				."<a href=\"".$webpath."chat/chat.php?cidReq=".$_cid."&origin=whoisonlinejoin\">"
-				. get_lang("Yes")
-				."</a>"
-				."&nbsp;&nbsp;|&nbsp;&nbsp;"
-				."<a href=\"".api_get_path(WEB_PATH)."webchatdeny.php\">"
-				. get_lang("No")
-				."</a>"
-				."</p>";
-
-		return($message);
-	} else {
-		return false;
-	}
+    $result=Database::query($sql);
+    $row=Database::fetch_array($result);
+
+    $login_date=$row['chatcall_date'];
+    $hour = substr($login_date,11,2);
+    $minute = substr($login_date,14,2);
+    $second = substr($login_date,17,2);
+    $month = substr($login_date,5,2);
+    $day = substr($login_date,8,2);
+    $year = substr($login_date,0,4);
+    $calltime = mktime($hour,$minute,$second,$month,$day,$year);
+
+    $time = api_get_utc_datetime();
+    $minute_passed=5;  //within this limit, the chat call request is valid
+    $limittime = mktime(date("H"),date("i")-$minute_passed,date("s"),date("m"),date("d"),date("Y"));
+
+    if (($row['chatcall_user_id']) and ($calltime>$limittime)) {
+        $webpath=api_get_path(WEB_CODE_PATH);
+        $message=get_lang('YouWereCalled').' : '.GetFullUserName($row['chatcall_user_id'],'').'<br>'.get_lang('DoYouAccept')
+                            ."<p>"
+                ."<a href=\"".$webpath."chat/chat.php?cidReq=".$_cid."&origin=whoisonlinejoin\">"
+                . get_lang("Yes")
+                ."</a>"
+                ."&nbsp;&nbsp;|&nbsp;&nbsp;"
+                ."<a href=\"".api_get_path(WEB_PATH)."webchatdeny.php\">"
+                . get_lang("No")
+                ."</a>"
+                ."</p>";
+
+        return($message);
+    } else {
+        return false;
+    }
 }

main/inc/lib/AnnouncementManager.php

Indentation +1 added lines, -1 removed lines

@@ -1510,7 +1510,7 @@
                             ip.to_user_id=$user_id OR (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".implode(", ", $group_memberships)."))
                         ) ";
                     } else {
-                       $cond_user_id = " AND (
+                        $cond_user_id = " AND (
                             ip.to_user_id=$user_id OR (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".api_get_group_id()."))
                         )";
                     }

main/inc/lib/upload.xajax.php

Indentation +16 added lines, -16 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * @package chamilo.library
- */
+     * @package chamilo.library
+     */
 /**
- * Code
- */
+     * Code
+     */
 include(dirname(__FILE__).'/../global.inc.php');
 $xajax_upload = new Xajax();
 $xajax_upload -> registerFunction ('updateProgress');
@@ -17,17 +17,17 @@ 
  */
 function updateProgress($div_id, $upload_id, $waitAfterupload = false) {
 
-	$objResponse = new xajaxResponse();
-	$ul_info = uploadprogress_get_info($upload_id);
-	$percent = intval($ul_info['bytes_uploaded']*100/$ul_info['bytes_total']);
-	if($waitAfterupload && $ul_info['est_sec']<2) {
-		$percent = 100;
-		$objResponse -> addAssign($div_id.'_label' , 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
-		$objResponse -> addAssign($div_id.'_waiter_frame','innerHTML','<img src="'.api_get_path(WEB_CODE_PATH).'img/progress_bar.gif" />');
-		$objResponse -> addScript('clearInterval("myUpload.__progress_bar_interval")');
-	}
-	$objResponse -> addAssign($div_id.'_label' , 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
-	$objResponse -> addAssign($div_id.'_filled' , 'style.width', $percent.'%');
+    $objResponse = new xajaxResponse();
+    $ul_info = uploadprogress_get_info($upload_id);
+    $percent = intval($ul_info['bytes_uploaded']*100/$ul_info['bytes_total']);
+    if($waitAfterupload && $ul_info['est_sec']<2) {
+        $percent = 100;
+        $objResponse -> addAssign($div_id.'_label' , 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
+        $objResponse -> addAssign($div_id.'_waiter_frame','innerHTML','<img src="'.api_get_path(WEB_CODE_PATH).'img/progress_bar.gif" />');
+        $objResponse -> addScript('clearInterval("myUpload.__progress_bar_interval")');
+    }
+    $objResponse -> addAssign($div_id.'_label' , 'innerHTML', get_lang('UploadFile').' : '.$percent.' %');
+    $objResponse -> addAssign($div_id.'_filled' , 'style.width', $percent.'%');
 
-	return $objResponse;
+    return $objResponse;
 }

main/inc/lib/internationalization_database/conversion/character_map_selector.php

Indentation +193 added lines, -193 removed lines

@@ -1,202 +1,202 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * @package chamilo.include.internationalization
- */
+     * @package chamilo.include.internationalization
+     */
 /**
- * Code
- */
+     * Code
+     */
 // See http://demo.icu-project.org/icu-bin/convexp
 return array(
 
-	// UTF-8 multibyte encoding
-
-	'UTF-8' => 'UTF-8',
-	'WINDOWS-65001' => 'UTF-8',
-	'CP65001' => 'UTF-8',
-	'WIN-65001' => 'UTF-8',
-	'WIN65001' => 'UTF-8',
-	'65001' => 'UTF-8',
-
-	// HTML entities
-
-	'HTML-ENTITIES' => 'HTML-ENTITIES',
-
-	// Singlebyte encodings
-
-	'US-ASCII' => 'US-ASCII',
-	'US' => 'US-ASCII',
-	'ASCII' => 'US-ASCII',
-	'CP367' => 'US-ASCII',
-	'ISO646-US' => 'US-ASCII',
-
-	'ISO-8859-1' => '8859-1',
-	'ISO8859-1' => '8859-1',
-	'8859-1' => '8859-1',
-	'LATIN1' => '8859-1',
-	'CP819' => '8859-1',
-
-	'ISO-8859-2' => '8859-2',
-	'ISO8859-2' => '8859-2',
-	'8859-2' => '8859-2',
-	'LATIN2' => '8859-2',
-	'CP912' => '8859-2',
-
-	'ISO-8859-3' => '8859-3',
-	'ISO8859-3' => '8859-3',
-	'8859-3' => '8859-3',
-	'LATIN3' => '8859-3',
-	'CP913' => '8859-3',
-
-	'ISO-8859-4' => '8859-4',
-	'ISO8859-4' => '8859-4',
-	'8859-4' => '8859-4',
-	'LATIN4' => '8859-4',
-	'CP914' => '8859-4',
-
-	'ISO-8859-5' => '8859-5',
-	'ISO8859-5' => '8859-5',
-	'8859-5' => '8859-5',
-	'CYRILLIC' => '8859-5',
-	'CP915' => '8859-5',
-
-	'ISO-8859-6' => '8859-6',
-	'ISO8859-6' => '8859-6',
-	'8859-6' => '8859-6',
-	'ARABIC' => '8859-6',
-	'CP1089' => '8859-6',
-
-	'ISO-8859-7' => '8859-7',
-	'ISO8859-7' => '8859-7',
-	'8859-7' => '8859-7',
-	'GREEK' => '8859-7',
-
-	'ISO-8859-8' => '8859-8',
-	'ISO8859-8' => '8859-8',
-	'8859-8' => '8859-8',
-	'HEBREW' => '8859-8',
-
-	'ISO-8859-9' => '8859-9',
-	'ISO8859-9' => '8859-9',
-	'8859-9' => '8859-9',
-	'LATIN5' => '8859-9',
-	'TURKISH' => '8859-9',
-	'CP920' => '8859-9',
-
-	'ISO-8859-10' => '8859-10',
-	'ISO8859-10' => '8859-10',
-	'8859-10' => '8859-10',
-	'LATIN6' => '8859-10',
-
-	'ISO-8859-11' => '8859-11',
-	'ISO8859-11' => '8859-11',
-	'8859-11' => '8859-11',
-	'THAI8' => '8859-11',
-
-	'ISO-8859-13' => '8859-13',
-	'ISO8859-13' => '8859-13',
-	'8859-13' => '8859-13',
-	'CP921' => '8859-13',
-
-	'ISO-8859-14' => '8859-14',
-	'ISO8859-14' => '8859-14',
-	'8859-14' => '8859-14',
-	'LATIN8' => '8859-14',
-	'ISO-CELTIC' => '8859-14',
-
-	'ISO-8859-15' => '8859-15',
-	'ISO8859-15' => '8859-15',
-	'8859-15' => '8859-15',
-	'LATIN0' => '8859-15',
-	'LATIN-9' => '8859-15',
-	'CP923' => '8859-15',
-
-	'WINDOWS-855' => 'CP855',
-	'CP855' => 'CP855',
-	'WINDOWS-855' => 'CP855',
-	'WIN-855' => 'CP855',
-	'WIN855' => 'CP855',
-	'855' => 'CP855',
-	'IBM-855' => 'CP855',
-	'IBM855' => 'CP855',
-
-	'WINDOWS-866' => 'CP866',
-	'CP866' => 'CP866',
-	'WINDOWS-866' => 'CP866',
-	'WIN-866' => 'CP866',
-	'WIN866' => 'CP866',
-	'866' => 'CP866',
-	'IBM-866' => 'CP866',
-	'IBM866' => 'CP866',
-
-	'WINDOWS-874' => 'CP874',
-	'TIS-620' => 'CP874',
-	'CP874' => 'CP874',
-	'EUCTH' => 'CP874',
-	'WIN-874' => 'CP874',
-	'WIN874' => 'CP874',
-	'874' => 'CP874',
-
-	'WINDOWS-1250' => 'CP1250',
-	'CP1250' => 'CP1250',
-	'WIN-1250' => 'CP1250',
-	'WIN1250' => 'CP1250',
-	'1250' => 'CP1250',
-
-	'WINDOWS-1251' => 'CP1251',
-	'CP1251' => 'CP1251',
-	'ANSI1251' => 'CP1251',
-	'WIN-1251' => 'CP1251',
-	'WIN1251' => 'CP1251',
-	'1251' => 'CP1251',
-
-	'WINDOWS-1252' => 'CP1252',
-	'CP1252' => 'CP1252',
-	'WIN-1252' => 'CP1252',
-	'WIN1252' => 'CP1252',
-	'1252' => 'CP1252',
-
-	'WINDOWS-1253' => 'CP1253',
-	'CP1253' => 'CP1253',
-	'WIN-1253' => 'CP1253',
-	'WIN1253' => 'CP1253',
-	'1253' => 'CP1253',
-
-	'WINDOWS-1254' => 'CP1254',
-	'CP1254' => 'CP1254',
-	'WIN-1254' => 'CP1254',
-	'WIN1254' => 'CP1254',
-	'1254' => 'CP1254',
-
-	'WINDOWS-1255' => 'CP1255',
-	'CP1255' => 'CP1255',
-	'WIN-1255' => 'CP1255',
-	'WIN1255' => 'CP1255',
-	'1255' => 'CP1255',
-
-	'WINDOWS-1256' => 'CP1256',
-	'CP1256' => 'CP1256',
-	'WIN-1256' => 'CP1256',
-	'WIN1256' => 'CP1256',
-	'1256' => 'CP1256',
-
-	'WINDOWS-1257' => 'CP1257',
-	'CP1257' => 'CP1257',
-	'WIN-1257' => 'CP1257',
-	'WIN1257' => 'CP1257',
-	'1257' => 'CP1257',
-
-	'WINDOWS-1258' => 'CP1258',
-	'CP1258' => 'CP1258',
-	'WIN-1258' => 'CP1258',
-	'WIN1258' => 'CP1258',
-	'1258' => 'CP1258',
-
-	'KOI8-R' => 'KOI8-R',
-	'CP878' => 'KOI8-R',
-	'KOI8R' => 'KOI8-R',
-	'KOI8-RU' => 'KOI8-R',
-
-	'KOI8-U' => 'KOI8-U',
+    // UTF-8 multibyte encoding
+
+    'UTF-8' => 'UTF-8',
+    'WINDOWS-65001' => 'UTF-8',
+    'CP65001' => 'UTF-8',
+    'WIN-65001' => 'UTF-8',
+    'WIN65001' => 'UTF-8',
+    '65001' => 'UTF-8',
+
+    // HTML entities
+
+    'HTML-ENTITIES' => 'HTML-ENTITIES',
+
+    // Singlebyte encodings
+
+    'US-ASCII' => 'US-ASCII',
+    'US' => 'US-ASCII',
+    'ASCII' => 'US-ASCII',
+    'CP367' => 'US-ASCII',
+    'ISO646-US' => 'US-ASCII',
+
+    'ISO-8859-1' => '8859-1',
+    'ISO8859-1' => '8859-1',
+    '8859-1' => '8859-1',
+    'LATIN1' => '8859-1',
+    'CP819' => '8859-1',
+
+    'ISO-8859-2' => '8859-2',
+    'ISO8859-2' => '8859-2',
+    '8859-2' => '8859-2',
+    'LATIN2' => '8859-2',
+    'CP912' => '8859-2',
+
+    'ISO-8859-3' => '8859-3',
+    'ISO8859-3' => '8859-3',
+    '8859-3' => '8859-3',
+    'LATIN3' => '8859-3',
+    'CP913' => '8859-3',
+
+    'ISO-8859-4' => '8859-4',
+    'ISO8859-4' => '8859-4',
+    '8859-4' => '8859-4',
+    'LATIN4' => '8859-4',
+    'CP914' => '8859-4',
+
+    'ISO-8859-5' => '8859-5',
+    'ISO8859-5' => '8859-5',
+    '8859-5' => '8859-5',
+    'CYRILLIC' => '8859-5',
+    'CP915' => '8859-5',
+
+    'ISO-8859-6' => '8859-6',
+    'ISO8859-6' => '8859-6',
+    '8859-6' => '8859-6',
+    'ARABIC' => '8859-6',
+    'CP1089' => '8859-6',
+
+    'ISO-8859-7' => '8859-7',
+    'ISO8859-7' => '8859-7',
+    '8859-7' => '8859-7',
+    'GREEK' => '8859-7',
+
+    'ISO-8859-8' => '8859-8',
+    'ISO8859-8' => '8859-8',
+    '8859-8' => '8859-8',
+    'HEBREW' => '8859-8',
+
+    'ISO-8859-9' => '8859-9',
+    'ISO8859-9' => '8859-9',
+    '8859-9' => '8859-9',
+    'LATIN5' => '8859-9',
+    'TURKISH' => '8859-9',
+    'CP920' => '8859-9',
+
+    'ISO-8859-10' => '8859-10',
+    'ISO8859-10' => '8859-10',
+    '8859-10' => '8859-10',
+    'LATIN6' => '8859-10',
+
+    'ISO-8859-11' => '8859-11',
+    'ISO8859-11' => '8859-11',
+    '8859-11' => '8859-11',
+    'THAI8' => '8859-11',
+
+    'ISO-8859-13' => '8859-13',
+    'ISO8859-13' => '8859-13',
+    '8859-13' => '8859-13',
+    'CP921' => '8859-13',
+
+    'ISO-8859-14' => '8859-14',
+    'ISO8859-14' => '8859-14',
+    '8859-14' => '8859-14',
+    'LATIN8' => '8859-14',
+    'ISO-CELTIC' => '8859-14',
+
+    'ISO-8859-15' => '8859-15',
+    'ISO8859-15' => '8859-15',
+    '8859-15' => '8859-15',
+    'LATIN0' => '8859-15',
+    'LATIN-9' => '8859-15',
+    'CP923' => '8859-15',
+
+    'WINDOWS-855' => 'CP855',
+    'CP855' => 'CP855',
+    'WINDOWS-855' => 'CP855',
+    'WIN-855' => 'CP855',
+    'WIN855' => 'CP855',
+    '855' => 'CP855',
+    'IBM-855' => 'CP855',
+    'IBM855' => 'CP855',
+
+    'WINDOWS-866' => 'CP866',
+    'CP866' => 'CP866',
+    'WINDOWS-866' => 'CP866',
+    'WIN-866' => 'CP866',
+    'WIN866' => 'CP866',
+    '866' => 'CP866',
+    'IBM-866' => 'CP866',
+    'IBM866' => 'CP866',
+
+    'WINDOWS-874' => 'CP874',
+    'TIS-620' => 'CP874',
+    'CP874' => 'CP874',
+    'EUCTH' => 'CP874',
+    'WIN-874' => 'CP874',
+    'WIN874' => 'CP874',
+    '874' => 'CP874',
+
+    'WINDOWS-1250' => 'CP1250',
+    'CP1250' => 'CP1250',
+    'WIN-1250' => 'CP1250',
+    'WIN1250' => 'CP1250',
+    '1250' => 'CP1250',
+
+    'WINDOWS-1251' => 'CP1251',
+    'CP1251' => 'CP1251',
+    'ANSI1251' => 'CP1251',
+    'WIN-1251' => 'CP1251',
+    'WIN1251' => 'CP1251',
+    '1251' => 'CP1251',
+
+    'WINDOWS-1252' => 'CP1252',
+    'CP1252' => 'CP1252',
+    'WIN-1252' => 'CP1252',
+    'WIN1252' => 'CP1252',
+    '1252' => 'CP1252',
+
+    'WINDOWS-1253' => 'CP1253',
+    'CP1253' => 'CP1253',
+    'WIN-1253' => 'CP1253',
+    'WIN1253' => 'CP1253',
+    '1253' => 'CP1253',
+
+    'WINDOWS-1254' => 'CP1254',
+    'CP1254' => 'CP1254',
+    'WIN-1254' => 'CP1254',
+    'WIN1254' => 'CP1254',
+    '1254' => 'CP1254',
+
+    'WINDOWS-1255' => 'CP1255',
+    'CP1255' => 'CP1255',
+    'WIN-1255' => 'CP1255',
+    'WIN1255' => 'CP1255',
+    '1255' => 'CP1255',
+
+    'WINDOWS-1256' => 'CP1256',
+    'CP1256' => 'CP1256',
+    'WIN-1256' => 'CP1256',
+    'WIN1256' => 'CP1256',
+    '1256' => 'CP1256',
+
+    'WINDOWS-1257' => 'CP1257',
+    'CP1257' => 'CP1257',
+    'WIN-1257' => 'CP1257',
+    'WIN1257' => 'CP1257',
+    '1257' => 'CP1257',
+
+    'WINDOWS-1258' => 'CP1258',
+    'CP1258' => 'CP1258',
+    'WIN-1258' => 'CP1258',
+    'WIN1258' => 'CP1258',
+    '1258' => 'CP1258',
+
+    'KOI8-R' => 'KOI8-R',
+    'CP878' => 'KOI8-R',
+    'KOI8R' => 'KOI8-R',
+    'KOI8-RU' => 'KOI8-R',
+
+    'KOI8-U' => 'KOI8-U',
 
 );