Completed
Pull Request — 1.11.x (#1621)
by José
27:41
created
main/inc/lib/text.lib.php 1 patch
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -693,8 +693,8 @@  discard block
 block discarded – undo
693 693
  */
694 694
 function get_week_from_day($date) {
695 695
     if (!empty($date)) {
696
-       $time = api_strtotime($date,'UTC');
697
-       return date('W', $time);
696
+        $time = api_strtotime($date,'UTC');
697
+        return date('W', $time);
698 698
     } else {
699 699
         return date('W');
700 700
     }
@@ -712,31 +712,31 @@  discard block
 block discarded – undo
712 712
 
713 713
 function substrwords($text,$maxchar,$end='...')
714 714
 {
715
-	if(strlen($text)>$maxchar)
716
-	{
717
-		$words=explode(" ",$text);
718
-		$output = '';
719
-		$i=0;
720
-		while(1)
721
-		{
722
-			$length = (strlen($output)+strlen($words[$i]));
723
-			if($length>$maxchar)
724
-			{
725
-				break;
726
-			}
727
-			else
728
-			{
729
-				$output = $output." ".$words[$i];
730
-				$i++;
731
-			};
732
-		};
733
-	}
734
-	else
735
-	{
736
-		$output = $text;
737
-		return $output;
738
-	}
739
-	return $output.$end;
715
+    if(strlen($text)>$maxchar)
716
+    {
717
+        $words=explode(" ",$text);
718
+        $output = '';
719
+        $i=0;
720
+        while(1)
721
+        {
722
+            $length = (strlen($output)+strlen($words[$i]));
723
+            if($length>$maxchar)
724
+            {
725
+                break;
726
+            }
727
+            else
728
+            {
729
+                $output = $output." ".$words[$i];
730
+                $i++;
731
+            };
732
+        };
733
+    }
734
+    else
735
+    {
736
+        $output = $text;
737
+        return $output;
738
+    }
739
+    return $output.$end;
740 740
 }
741 741
 
742 742
 function implode_with_key($glue, $array) {
Please login to merge, or discard this patch.
main/inc/lib/search/ChamiloQuery.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
  * @param   string    $query_string   The term string
34 34
  */
35 35
 function chamilo_get_boolean_query($term) {
36
-  return xapian_get_boolean_query($term);
36
+    return xapian_get_boolean_query($term);
37 37
 }
38 38
 
39 39
 /**
@@ -44,22 +44,22 @@  discard block
 block discarded – undo
44 44
     $results_by_tool = array();
45 45
     if (count($results)>0) {
46 46
 
47
-	    foreach ($results as $key => $row) {
48
-	        $results_by_tool[$row['toolid']][] = $row;
49
-	    }
47
+        foreach ($results as $key => $row) {
48
+            $results_by_tool[$row['toolid']][] = $row;
49
+        }
50 50
 
51
-	    $processed_results = array();
52
-	    foreach ($results_by_tool as $toolid => $rows) {
53
-	        $tool_processor_class = $toolid .'_processor';
54
-	        $tool_processor_path = api_get_path(LIBRARY_PATH) .'search/tool_processors/'. $tool_processor_class .'.class.php';
55
-	        if (file_exists($tool_processor_path)) {
56
-	            require_once($tool_processor_path);
57
-	            $tool_processor = new $tool_processor_class($rows);
58
-	            $processed_results = array_merge($tool_processor->process(), $processed_results);
59
-	        }
60
-	    }
51
+        $processed_results = array();
52
+        foreach ($results_by_tool as $toolid => $rows) {
53
+            $tool_processor_class = $toolid .'_processor';
54
+            $tool_processor_path = api_get_path(LIBRARY_PATH) .'search/tool_processors/'. $tool_processor_class .'.class.php';
55
+            if (file_exists($tool_processor_path)) {
56
+                require_once($tool_processor_path);
57
+                $tool_processor = new $tool_processor_class($rows);
58
+                $processed_results = array_merge($tool_processor->process(), $processed_results);
59
+            }
60
+        }
61 61
 
62
-	    return array(count($processed_results), $processed_results);
62
+        return array(count($processed_results), $processed_results);
63 63
     }
64 64
 }
65 65
 
@@ -72,5 +72,5 @@  discard block
 block discarded – undo
72 72
  * @return XapianQuery query joined
73 73
  */
74 74
 function chamilo_join_queries($query1, $query2=NULL, $op='or') {
75
-	return xapian_join_queries($query1, $query2, $op);
75
+    return xapian_join_queries($query1, $query2, $op);
76 76
 }
Please login to merge, or discard this patch.
main/dashboard/index.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 $actions = array('listing', 'store_user_block', 'disable_block');
27 27
 $action = 'listing';
28 28
 if (isset($_GET['action']) && in_array($_GET['action'],$actions)) {
29
-	$action = $_GET['action'];
29
+    $action = $_GET['action'];
30 30
 }
31 31
 
32 32
 // load styles from dashboard plugins
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 $dashboard_controller = new DashboardController();
38 38
 
39 39
 if (isset($_GET['path'])) {
40
-	$path = $_GET['path'];
40
+    $path = $_GET['path'];
41 41
 }
42 42
 
43 43
 // distpacher actions to controller
Please login to merge, or discard this patch.
main/auth/ldap/newUser.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -21,17 +21,17 @@
 block discarded – undo
21 21
 
22 22
 if ($ldap_login_success)
23 23
 {
24
-	//error_log('Found user '.$login.' on LDAP server',0);
25
-	/*
24
+    //error_log('Found user '.$login.' on LDAP server',0);
25
+    /*
26 26
 		In here, we know that
27 27
 		- the user does not exist in dokeos
28 28
 		- the users login and password are correct
29 29
 	*/
30
-	$info_array = ldap_find_user_info($login);
31
-	ldap_put_user_info_locally($login, $info_array);
30
+    $info_array = ldap_find_user_info($login);
31
+    ldap_put_user_info_locally($login, $info_array);
32 32
 } else {
33 33
     //error_log('Could not find '.$login.' on LDAP server',0);
34
-	$loginFailed = true;
35
-	unset($_user['user_id']);
36
-	$uidReset = false;
34
+    $loginFailed = true;
35
+    unset($_user['user_id']);
36
+    $uidReset = false;
37 37
 }
Please login to merge, or discard this patch.
main/cron/user_import/get_data_from_mail.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -20,16 +20,16 @@
 block discarded – undo
20 20
 $users = Database::get_main_table(TABLE_MAIN_USER);
21 21
 $string='';
22 22
 foreach ($list as $mail) {
23
-  $mail = trim($mail);
24
-  $sql = "SELECT user_id, official_code, firstname, lastname, email FROM $users WHERE email = '$mail'\n";
25
-  $res = Database::query($sql);
26
-  if ($res === false) { die(mysql_error());}
27
-  if (Database::num_rows($res) == 0) {
23
+    $mail = trim($mail);
24
+    $sql = "SELECT user_id, official_code, firstname, lastname, email FROM $users WHERE email = '$mail'\n";
25
+    $res = Database::query($sql);
26
+    if ($res === false) { die(mysql_error());}
27
+    if (Database::num_rows($res) == 0) {
28 28
     $string .= 'No encontrado;'.$row['email'];
29
-  } else {
29
+    } else {
30 30
     $row = Database::fetch_assoc($res);
31
-   $string .= $row['user_id'].';'.$row['email'].';'.$row['firstname'].';'.$row['lastname'].';'.$row['official_code']."\r\n";
32
-  }
31
+    $string .= $row['user_id'].';'.$row['email'].';'.$row['firstname'].';'.$row['lastname'].';'.$row['official_code']."\r\n";
32
+    }
33 33
 }
34 34
 echo $string;
35 35
 file_put_contents('/tmp/list.txt',$string);
Please login to merge, or discard this patch.
main/webservices/soap_session.php 1 patch
Indentation   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -13,19 +13,19 @@  discard block
 block discarded – undo
13 13
 $s->register(
14 14
     'WSSession.CreateSession',
15 15
     array(
16
-	'secret_key' => 'xsd:string',
17
-	'name' => 'xsd:string',
18
-	'start_date' => 'xsd:string',
19
-	'end_date' => 'xsd:string',
20
-	'nb_days_access_before' => 'xsd:int',
21
-	'nb_days_access_after' => 'xsd:int',
22
-	'nolimit' => 'xsd:int',
23
-	'visibility' => 'xsd:int',
24
-	'user_id_field_name' => 'xsd:string',
25
-	'user_id_value' => 'xsd:string',
26
-	'session_id_field_name' => 'xsd:string',
27
-	'session_id_value' => 'xsd:string',
28
-	'extras' => 'tns:extra_field'
16
+    'secret_key' => 'xsd:string',
17
+    'name' => 'xsd:string',
18
+    'start_date' => 'xsd:string',
19
+    'end_date' => 'xsd:string',
20
+    'nb_days_access_before' => 'xsd:int',
21
+    'nb_days_access_after' => 'xsd:int',
22
+    'nolimit' => 'xsd:int',
23
+    'visibility' => 'xsd:int',
24
+    'user_id_field_name' => 'xsd:string',
25
+    'user_id_value' => 'xsd:string',
26
+    'session_id_field_name' => 'xsd:string',
27
+    'session_id_value' => 'xsd:string',
28
+    'extras' => 'tns:extra_field'
29 29
     ),
30 30
     array('return' => 'xsd:int')
31 31
 );
@@ -33,50 +33,50 @@  discard block
 block discarded – undo
33 33
 $s->register(
34 34
     'WSSession.DeleteSession',
35 35
     array(
36
-	'secret_key' => 'xsd:string',
37
-	'session_id_field_name' => 'xsd:string',
38
-	'session_id_value' => 'xsd:string'
36
+    'secret_key' => 'xsd:string',
37
+    'session_id_field_name' => 'xsd:string',
38
+    'session_id_value' => 'xsd:string'
39 39
     )
40 40
 );
41 41
 
42 42
 $s->register(
43 43
     'WSSession.EditSession',
44 44
     array(
45
-	'secret_key' => 'xsd:string',
46
-	'name' => 'xsd:string',
47
-	'start_date' => 'xsd:string',
48
-	'end_date' => 'xsd:string',
49
-	'nb_days_access_before' => 'xsd:int',
50
-	'nb_days_access_after' => 'xsd:int',
51
-	'nolimit' => 'xsd:int',
52
-	'visibility' => 'xsd:int',
53
-	'user_id_field_name' => 'xsd:string',
54
-	'user_id_value' => 'xsd:string',
55
-	'session_id_field_name' => 'xsd:string',
56
-	'session_id_value' => 'xsd:string',
57
-	'extras' => 'tns:extra_field'
45
+    'secret_key' => 'xsd:string',
46
+    'name' => 'xsd:string',
47
+    'start_date' => 'xsd:string',
48
+    'end_date' => 'xsd:string',
49
+    'nb_days_access_before' => 'xsd:int',
50
+    'nb_days_access_after' => 'xsd:int',
51
+    'nolimit' => 'xsd:int',
52
+    'visibility' => 'xsd:int',
53
+    'user_id_field_name' => 'xsd:string',
54
+    'user_id_value' => 'xsd:string',
55
+    'session_id_field_name' => 'xsd:string',
56
+    'session_id_value' => 'xsd:string',
57
+    'extras' => 'tns:extra_field'
58 58
     )
59 59
 );
60 60
 
61 61
 $s->register(
62 62
     'WSSession.SubscribeUserToSession',
63 63
     array(
64
-	'secret_key' => 'xsd:string',
65
-	'user_id_field_name' => 'xsd:string',
66
-	'user_id_value' => 'xsd:string',
67
-	'session_id_field_name' => 'xsd:string',
68
-	'session_id_value' => 'xsd:string'
64
+    'secret_key' => 'xsd:string',
65
+    'user_id_field_name' => 'xsd:string',
66
+    'user_id_value' => 'xsd:string',
67
+    'session_id_field_name' => 'xsd:string',
68
+    'session_id_value' => 'xsd:string'
69 69
     )
70 70
 );
71 71
 
72 72
 $s->register(
73 73
     'WSSession.UnsubscribeUserFromSession',
74 74
     array(
75
-	'secret_key' => 'xsd:string',
76
-	'user_id_field_name' => 'xsd:string',
77
-	'user_id_value' => 'xsd:string',
78
-	'session_id_field_name' => 'xsd:string',
79
-	'session_id_value' => 'xsd:string'
75
+    'secret_key' => 'xsd:string',
76
+    'user_id_field_name' => 'xsd:string',
77
+    'user_id_value' => 'xsd:string',
78
+    'session_id_field_name' => 'xsd:string',
79
+    'session_id_value' => 'xsd:string'
80 80
     )
81 81
 );
82 82
 
@@ -84,46 +84,46 @@  discard block
 block discarded – undo
84 84
     'WSSession.SubscribeTeacherToSessionCourse',
85 85
     array(
86 86
         'secret_key' => 'xsd:string',
87
-	'user_id_field_name' => 'xsd:string',
88
-	'user_id_value' => 'xsd:string',
89
-	'session_id_field_name' => 'xsd:string',
90
-	'session_id_value' => 'xsd:string',
87
+    'user_id_field_name' => 'xsd:string',
88
+    'user_id_value' => 'xsd:string',
89
+    'session_id_field_name' => 'xsd:string',
90
+    'session_id_value' => 'xsd:string',
91 91
         'course_id_field_name' => 'xsd:string',
92
-	'course_id_value' => 'xsd:string'
92
+    'course_id_value' => 'xsd:string'
93 93
     )
94 94
 );
95 95
 
96 96
 $s->register(
97 97
     'WSSession.UnsubscribeTeacherFromSessionCourse',
98 98
     array(
99
-	'secret_key' => 'xsd:string',
100
-	'user_id_field_name' => 'xsd:string',
101
-	'user_id_value' => 'xsd:string',
102
-	'session_id_field_name' => 'xsd:string',
103
-	'session_id_value' => 'xsd:string',
99
+    'secret_key' => 'xsd:string',
100
+    'user_id_field_name' => 'xsd:string',
101
+    'user_id_value' => 'xsd:string',
102
+    'session_id_field_name' => 'xsd:string',
103
+    'session_id_value' => 'xsd:string',
104 104
         'course_id_field_name' => 'xsd:string',
105
-	'course_id_value' => 'xsd:string'
105
+    'course_id_value' => 'xsd:string'
106 106
     )
107 107
 );
108 108
 
109 109
 $s->register(
110 110
     'WSSession.SubscribeCourseToSession',
111 111
     array(
112
-	'secret_key' => 'xsd:string',
113
-	'course_id_field_name' => 'xsd:string',
114
-	'course_id_value' => 'xsd:string',
115
-	'session_id_field_name' => 'xsd:string',
116
-	'session_id_value' => 'xsd:string'
112
+    'secret_key' => 'xsd:string',
113
+    'course_id_field_name' => 'xsd:string',
114
+    'course_id_value' => 'xsd:string',
115
+    'session_id_field_name' => 'xsd:string',
116
+    'session_id_value' => 'xsd:string'
117 117
     )
118 118
 );
119 119
 
120 120
 $s->register(
121 121
     'WSSession.UnsubscribeCourseFromSession',
122 122
     array(
123
-	'secret_key' => 'xsd:string',
124
-	'course_id_field_name' => 'xsd:string',
125
-	'course_id_value' => 'xsd:string',
126
-	'session_id_field_name' => 'xsd:string',
127
-	'session_id_value' => 'xsd:string'
123
+    'secret_key' => 'xsd:string',
124
+    'course_id_field_name' => 'xsd:string',
125
+    'course_id_value' => 'xsd:string',
126
+    'session_id_field_name' => 'xsd:string',
127
+    'session_id_value' => 'xsd:string'
128 128
     )
129 129
 );
Please login to merge, or discard this patch.
main/mySpace/lp_tracking.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -11,10 +11,10 @@  discard block
 block discarded – undo
11 11
 $from_myspace = false;
12 12
 $from_link = '';
13 13
 if (isset($_GET['from']) && $_GET['from'] == 'myspace') {
14
-	$from_link = '&from=myspace';
15
-	$this_section = SECTION_TRACKING;
14
+    $from_link = '&from=myspace';
15
+    $this_section = SECTION_TRACKING;
16 16
 } else {
17
-	$this_section = SECTION_COURSES;
17
+    $this_section = SECTION_COURSES;
18 18
 }
19 19
 
20 20
 $session_id  = isset($_REQUEST['id_session']) && !empty($_REQUEST['id_session']) ? intval($_REQUEST['id_session']) : api_get_session_id();
@@ -35,19 +35,19 @@  discard block
 block discarded – undo
35 35
 if (!api_is_platform_admin(true) &&
36 36
     !CourseManager :: is_course_teacher(api_get_user_id(), $courseCode) &&
37 37
     !Tracking :: is_allowed_to_coach_student(api_get_user_id(), $user_id) && !api_is_drh() && !api_is_course_tutor()) {
38
-	api_not_allowed();
38
+    api_not_allowed();
39 39
 }
40 40
 
41 41
 if ($origin == 'user_course') {
42
-	$interbreadcrumb[] = array ("url" => api_get_path(WEB_COURSE_PATH).$course_info['directory'], 'name' => $course_info['name']);
43
-	$interbreadcrumb[] = array ("url" => "../user/user.php?cidReq=".$courseCode, "name" => get_lang("Users"));
42
+    $interbreadcrumb[] = array ("url" => api_get_path(WEB_COURSE_PATH).$course_info['directory'], 'name' => $course_info['name']);
43
+    $interbreadcrumb[] = array ("url" => "../user/user.php?cidReq=".$courseCode, "name" => get_lang("Users"));
44 44
 } else if($origin == 'tracking_course') {
45
-	$interbreadcrumb[] = array ("url" => "../tracking/courseLog.php?cidReq=".$courseCode.'&id_session='.$session_id, "name" => get_lang("Tracking"));
45
+    $interbreadcrumb[] = array ("url" => "../tracking/courseLog.php?cidReq=".$courseCode.'&id_session='.$session_id, "name" => get_lang("Tracking"));
46 46
 } else {
47
-	$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
48
-	$interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang("MyStudents"));
49
- 	$interbreadcrumb[] = array ("url" => "myStudents.php?student=".$user_id, "name" => get_lang("StudentDetails"));
50
- 	$nameTools=get_lang("DetailsStudentInCourse");
47
+    $interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
48
+    $interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang("MyStudents"));
49
+        $interbreadcrumb[] = array ("url" => "myStudents.php?student=".$user_id, "name" => get_lang("StudentDetails"));
50
+        $nameTools=get_lang("DetailsStudentInCourse");
51 51
 }
52 52
 
53 53
 $interbreadcrumb[] = array("url" => "myStudents.php?student=".$user_id."&course=".$courseCode."&details=true&origin=".$origin , "name" => get_lang("DetailsStudentInCourse"));
Please login to merge, or discard this patch.
plugin/openmeetings/lib/openmeetings.class.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
             return false;
127 127
         }
128 128
     }
129
-    */
129
+     */
130 130
 
131 131
     /*
132 132
      * Creating a Room for the meeting
@@ -256,10 +256,10 @@  discard block
 block discarded – undo
256 256
         return true;
257 257
     }
258 258
 
259
-     /**
260
-     * Gets the password for a specific meeting for the current user
261
-     * @return string A moderator password if user is teacher, or the course code otherwise
262
-     */
259
+        /**
260
+         * Gets the password for a specific meeting for the current user
261
+         * @return string A moderator password if user is teacher, or the course code otherwise
262
+         */
263 263
     public function getMeetingUserPassword()
264 264
     {
265 265
         if ($this->isTeacher()) {
@@ -538,7 +538,7 @@  discard block
 block discarded – undo
538 538
     //
539 539
     //            }
540 540
     //
541
-                 //$item['created_at'] = api_convert_and_format_date($meetingDb['created_at']);
541
+                    //$item['created_at'] = api_convert_and_format_date($meetingDb['created_at']);
542 542
     //            //created_at
543 543
     //
544 544
     //            $item['publish_url'] = api_get_self().'?action=publish&id='.$meetingDb['id'];
Please login to merge, or discard this patch.
inc/lib/internationalization_database/conversion/character_map_selector.php 1 patch
Indentation   +189 added lines, -189 removed lines patch added patch discarded remove patch
@@ -9,194 +9,194 @@
 block discarded – undo
9 9
 // See http://demo.icu-project.org/icu-bin/convexp
10 10
 return array(
11 11
 
12
-	// UTF-8 multibyte encoding
13
-
14
-	'UTF-8' => 'UTF-8',
15
-	'WINDOWS-65001' => 'UTF-8',
16
-	'CP65001' => 'UTF-8',
17
-	'WIN-65001' => 'UTF-8',
18
-	'WIN65001' => 'UTF-8',
19
-	'65001' => 'UTF-8',
20
-
21
-	// HTML entities
22
-
23
-	'HTML-ENTITIES' => 'HTML-ENTITIES',
24
-
25
-	// Singlebyte encodings
26
-
27
-	'US-ASCII' => 'US-ASCII',
28
-	'US' => 'US-ASCII',
29
-	'ASCII' => 'US-ASCII',
30
-	'CP367' => 'US-ASCII',
31
-	'ISO646-US' => 'US-ASCII',
32
-
33
-	'ISO-8859-1' => '8859-1',
34
-	'ISO8859-1' => '8859-1',
35
-	'8859-1' => '8859-1',
36
-	'LATIN1' => '8859-1',
37
-	'CP819' => '8859-1',
38
-
39
-	'ISO-8859-2' => '8859-2',
40
-	'ISO8859-2' => '8859-2',
41
-	'8859-2' => '8859-2',
42
-	'LATIN2' => '8859-2',
43
-	'CP912' => '8859-2',
44
-
45
-	'ISO-8859-3' => '8859-3',
46
-	'ISO8859-3' => '8859-3',
47
-	'8859-3' => '8859-3',
48
-	'LATIN3' => '8859-3',
49
-	'CP913' => '8859-3',
50
-
51
-	'ISO-8859-4' => '8859-4',
52
-	'ISO8859-4' => '8859-4',
53
-	'8859-4' => '8859-4',
54
-	'LATIN4' => '8859-4',
55
-	'CP914' => '8859-4',
56
-
57
-	'ISO-8859-5' => '8859-5',
58
-	'ISO8859-5' => '8859-5',
59
-	'8859-5' => '8859-5',
60
-	'CYRILLIC' => '8859-5',
61
-	'CP915' => '8859-5',
62
-
63
-	'ISO-8859-6' => '8859-6',
64
-	'ISO8859-6' => '8859-6',
65
-	'8859-6' => '8859-6',
66
-	'ARABIC' => '8859-6',
67
-	'CP1089' => '8859-6',
68
-
69
-	'ISO-8859-7' => '8859-7',
70
-	'ISO8859-7' => '8859-7',
71
-	'8859-7' => '8859-7',
72
-	'GREEK' => '8859-7',
73
-
74
-	'ISO-8859-8' => '8859-8',
75
-	'ISO8859-8' => '8859-8',
76
-	'8859-8' => '8859-8',
77
-	'HEBREW' => '8859-8',
78
-
79
-	'ISO-8859-9' => '8859-9',
80
-	'ISO8859-9' => '8859-9',
81
-	'8859-9' => '8859-9',
82
-	'LATIN5' => '8859-9',
83
-	'TURKISH' => '8859-9',
84
-	'CP920' => '8859-9',
85
-
86
-	'ISO-8859-10' => '8859-10',
87
-	'ISO8859-10' => '8859-10',
88
-	'8859-10' => '8859-10',
89
-	'LATIN6' => '8859-10',
90
-
91
-	'ISO-8859-11' => '8859-11',
92
-	'ISO8859-11' => '8859-11',
93
-	'8859-11' => '8859-11',
94
-	'THAI8' => '8859-11',
95
-
96
-	'ISO-8859-13' => '8859-13',
97
-	'ISO8859-13' => '8859-13',
98
-	'8859-13' => '8859-13',
99
-	'CP921' => '8859-13',
100
-
101
-	'ISO-8859-14' => '8859-14',
102
-	'ISO8859-14' => '8859-14',
103
-	'8859-14' => '8859-14',
104
-	'LATIN8' => '8859-14',
105
-	'ISO-CELTIC' => '8859-14',
106
-
107
-	'ISO-8859-15' => '8859-15',
108
-	'ISO8859-15' => '8859-15',
109
-	'8859-15' => '8859-15',
110
-	'LATIN0' => '8859-15',
111
-	'LATIN-9' => '8859-15',
112
-	'CP923' => '8859-15',
113
-
114
-	'WINDOWS-855' => 'CP855',
115
-	'CP855' => 'CP855',
116
-	'WINDOWS-855' => 'CP855',
117
-	'WIN-855' => 'CP855',
118
-	'WIN855' => 'CP855',
119
-	'855' => 'CP855',
120
-	'IBM-855' => 'CP855',
121
-	'IBM855' => 'CP855',
122
-
123
-	'WINDOWS-866' => 'CP866',
124
-	'CP866' => 'CP866',
125
-	'WINDOWS-866' => 'CP866',
126
-	'WIN-866' => 'CP866',
127
-	'WIN866' => 'CP866',
128
-	'866' => 'CP866',
129
-	'IBM-866' => 'CP866',
130
-	'IBM866' => 'CP866',
131
-
132
-	'WINDOWS-874' => 'CP874',
133
-	'TIS-620' => 'CP874',
134
-	'CP874' => 'CP874',
135
-	'EUCTH' => 'CP874',
136
-	'WIN-874' => 'CP874',
137
-	'WIN874' => 'CP874',
138
-	'874' => 'CP874',
139
-
140
-	'WINDOWS-1250' => 'CP1250',
141
-	'CP1250' => 'CP1250',
142
-	'WIN-1250' => 'CP1250',
143
-	'WIN1250' => 'CP1250',
144
-	'1250' => 'CP1250',
145
-
146
-	'WINDOWS-1251' => 'CP1251',
147
-	'CP1251' => 'CP1251',
148
-	'ANSI1251' => 'CP1251',
149
-	'WIN-1251' => 'CP1251',
150
-	'WIN1251' => 'CP1251',
151
-	'1251' => 'CP1251',
152
-
153
-	'WINDOWS-1252' => 'CP1252',
154
-	'CP1252' => 'CP1252',
155
-	'WIN-1252' => 'CP1252',
156
-	'WIN1252' => 'CP1252',
157
-	'1252' => 'CP1252',
158
-
159
-	'WINDOWS-1253' => 'CP1253',
160
-	'CP1253' => 'CP1253',
161
-	'WIN-1253' => 'CP1253',
162
-	'WIN1253' => 'CP1253',
163
-	'1253' => 'CP1253',
164
-
165
-	'WINDOWS-1254' => 'CP1254',
166
-	'CP1254' => 'CP1254',
167
-	'WIN-1254' => 'CP1254',
168
-	'WIN1254' => 'CP1254',
169
-	'1254' => 'CP1254',
170
-
171
-	'WINDOWS-1255' => 'CP1255',
172
-	'CP1255' => 'CP1255',
173
-	'WIN-1255' => 'CP1255',
174
-	'WIN1255' => 'CP1255',
175
-	'1255' => 'CP1255',
176
-
177
-	'WINDOWS-1256' => 'CP1256',
178
-	'CP1256' => 'CP1256',
179
-	'WIN-1256' => 'CP1256',
180
-	'WIN1256' => 'CP1256',
181
-	'1256' => 'CP1256',
182
-
183
-	'WINDOWS-1257' => 'CP1257',
184
-	'CP1257' => 'CP1257',
185
-	'WIN-1257' => 'CP1257',
186
-	'WIN1257' => 'CP1257',
187
-	'1257' => 'CP1257',
188
-
189
-	'WINDOWS-1258' => 'CP1258',
190
-	'CP1258' => 'CP1258',
191
-	'WIN-1258' => 'CP1258',
192
-	'WIN1258' => 'CP1258',
193
-	'1258' => 'CP1258',
194
-
195
-	'KOI8-R' => 'KOI8-R',
196
-	'CP878' => 'KOI8-R',
197
-	'KOI8R' => 'KOI8-R',
198
-	'KOI8-RU' => 'KOI8-R',
199
-
200
-	'KOI8-U' => 'KOI8-U',
12
+    // UTF-8 multibyte encoding
13
+
14
+    'UTF-8' => 'UTF-8',
15
+    'WINDOWS-65001' => 'UTF-8',
16
+    'CP65001' => 'UTF-8',
17
+    'WIN-65001' => 'UTF-8',
18
+    'WIN65001' => 'UTF-8',
19
+    '65001' => 'UTF-8',
20
+
21
+    // HTML entities
22
+
23
+    'HTML-ENTITIES' => 'HTML-ENTITIES',
24
+
25
+    // Singlebyte encodings
26
+
27
+    'US-ASCII' => 'US-ASCII',
28
+    'US' => 'US-ASCII',
29
+    'ASCII' => 'US-ASCII',
30
+    'CP367' => 'US-ASCII',
31
+    'ISO646-US' => 'US-ASCII',
32
+
33
+    'ISO-8859-1' => '8859-1',
34
+    'ISO8859-1' => '8859-1',
35
+    '8859-1' => '8859-1',
36
+    'LATIN1' => '8859-1',
37
+    'CP819' => '8859-1',
38
+
39
+    'ISO-8859-2' => '8859-2',
40
+    'ISO8859-2' => '8859-2',
41
+    '8859-2' => '8859-2',
42
+    'LATIN2' => '8859-2',
43
+    'CP912' => '8859-2',
44
+
45
+    'ISO-8859-3' => '8859-3',
46
+    'ISO8859-3' => '8859-3',
47
+    '8859-3' => '8859-3',
48
+    'LATIN3' => '8859-3',
49
+    'CP913' => '8859-3',
50
+
51
+    'ISO-8859-4' => '8859-4',
52
+    'ISO8859-4' => '8859-4',
53
+    '8859-4' => '8859-4',
54
+    'LATIN4' => '8859-4',
55
+    'CP914' => '8859-4',
56
+
57
+    'ISO-8859-5' => '8859-5',
58
+    'ISO8859-5' => '8859-5',
59
+    '8859-5' => '8859-5',
60
+    'CYRILLIC' => '8859-5',
61
+    'CP915' => '8859-5',
62
+
63
+    'ISO-8859-6' => '8859-6',
64
+    'ISO8859-6' => '8859-6',
65
+    '8859-6' => '8859-6',
66
+    'ARABIC' => '8859-6',
67
+    'CP1089' => '8859-6',
68
+
69
+    'ISO-8859-7' => '8859-7',
70
+    'ISO8859-7' => '8859-7',
71
+    '8859-7' => '8859-7',
72
+    'GREEK' => '8859-7',
73
+
74
+    'ISO-8859-8' => '8859-8',
75
+    'ISO8859-8' => '8859-8',
76
+    '8859-8' => '8859-8',
77
+    'HEBREW' => '8859-8',
78
+
79
+    'ISO-8859-9' => '8859-9',
80
+    'ISO8859-9' => '8859-9',
81
+    '8859-9' => '8859-9',
82
+    'LATIN5' => '8859-9',
83
+    'TURKISH' => '8859-9',
84
+    'CP920' => '8859-9',
85
+
86
+    'ISO-8859-10' => '8859-10',
87
+    'ISO8859-10' => '8859-10',
88
+    '8859-10' => '8859-10',
89
+    'LATIN6' => '8859-10',
90
+
91
+    'ISO-8859-11' => '8859-11',
92
+    'ISO8859-11' => '8859-11',
93
+    '8859-11' => '8859-11',
94
+    'THAI8' => '8859-11',
95
+
96
+    'ISO-8859-13' => '8859-13',
97
+    'ISO8859-13' => '8859-13',
98
+    '8859-13' => '8859-13',
99
+    'CP921' => '8859-13',
100
+
101
+    'ISO-8859-14' => '8859-14',
102
+    'ISO8859-14' => '8859-14',
103
+    '8859-14' => '8859-14',
104
+    'LATIN8' => '8859-14',
105
+    'ISO-CELTIC' => '8859-14',
106
+
107
+    'ISO-8859-15' => '8859-15',
108
+    'ISO8859-15' => '8859-15',
109
+    '8859-15' => '8859-15',
110
+    'LATIN0' => '8859-15',
111
+    'LATIN-9' => '8859-15',
112
+    'CP923' => '8859-15',
113
+
114
+    'WINDOWS-855' => 'CP855',
115
+    'CP855' => 'CP855',
116
+    'WINDOWS-855' => 'CP855',
117
+    'WIN-855' => 'CP855',
118
+    'WIN855' => 'CP855',
119
+    '855' => 'CP855',
120
+    'IBM-855' => 'CP855',
121
+    'IBM855' => 'CP855',
122
+
123
+    'WINDOWS-866' => 'CP866',
124
+    'CP866' => 'CP866',
125
+    'WINDOWS-866' => 'CP866',
126
+    'WIN-866' => 'CP866',
127
+    'WIN866' => 'CP866',
128
+    '866' => 'CP866',
129
+    'IBM-866' => 'CP866',
130
+    'IBM866' => 'CP866',
131
+
132
+    'WINDOWS-874' => 'CP874',
133
+    'TIS-620' => 'CP874',
134
+    'CP874' => 'CP874',
135
+    'EUCTH' => 'CP874',
136
+    'WIN-874' => 'CP874',
137
+    'WIN874' => 'CP874',
138
+    '874' => 'CP874',
139
+
140
+    'WINDOWS-1250' => 'CP1250',
141
+    'CP1250' => 'CP1250',
142
+    'WIN-1250' => 'CP1250',
143
+    'WIN1250' => 'CP1250',
144
+    '1250' => 'CP1250',
145
+
146
+    'WINDOWS-1251' => 'CP1251',
147
+    'CP1251' => 'CP1251',
148
+    'ANSI1251' => 'CP1251',
149
+    'WIN-1251' => 'CP1251',
150
+    'WIN1251' => 'CP1251',
151
+    '1251' => 'CP1251',
152
+
153
+    'WINDOWS-1252' => 'CP1252',
154
+    'CP1252' => 'CP1252',
155
+    'WIN-1252' => 'CP1252',
156
+    'WIN1252' => 'CP1252',
157
+    '1252' => 'CP1252',
158
+
159
+    'WINDOWS-1253' => 'CP1253',
160
+    'CP1253' => 'CP1253',
161
+    'WIN-1253' => 'CP1253',
162
+    'WIN1253' => 'CP1253',
163
+    '1253' => 'CP1253',
164
+
165
+    'WINDOWS-1254' => 'CP1254',
166
+    'CP1254' => 'CP1254',
167
+    'WIN-1254' => 'CP1254',
168
+    'WIN1254' => 'CP1254',
169
+    '1254' => 'CP1254',
170
+
171
+    'WINDOWS-1255' => 'CP1255',
172
+    'CP1255' => 'CP1255',
173
+    'WIN-1255' => 'CP1255',
174
+    'WIN1255' => 'CP1255',
175
+    '1255' => 'CP1255',
176
+
177
+    'WINDOWS-1256' => 'CP1256',
178
+    'CP1256' => 'CP1256',
179
+    'WIN-1256' => 'CP1256',
180
+    'WIN1256' => 'CP1256',
181
+    '1256' => 'CP1256',
182
+
183
+    'WINDOWS-1257' => 'CP1257',
184
+    'CP1257' => 'CP1257',
185
+    'WIN-1257' => 'CP1257',
186
+    'WIN1257' => 'CP1257',
187
+    '1257' => 'CP1257',
188
+
189
+    'WINDOWS-1258' => 'CP1258',
190
+    'CP1258' => 'CP1258',
191
+    'WIN-1258' => 'CP1258',
192
+    'WIN1258' => 'CP1258',
193
+    '1258' => 'CP1258',
194
+
195
+    'KOI8-R' => 'KOI8-R',
196
+    'CP878' => 'KOI8-R',
197
+    'KOI8R' => 'KOI8-R',
198
+    'KOI8-RU' => 'KOI8-R',
199
+
200
+    'KOI8-U' => 'KOI8-U',
201 201
 
202 202
 );
Please login to merge, or discard this patch.