chamilo / chamilo-lms

main/work/add_document.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 use ChamiloSession as Session;
 
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_STUDENTPUBLICATION;
+$current_course_tool = TOOL_STUDENTPUBLICATION;
 
 api_protect_course_script(true);
 

main/work/download.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 use ChamiloSession as Session;
 
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_STUDENTPUBLICATION;
+$current_course_tool = TOOL_STUDENTPUBLICATION;
 
 api_protect_course_script(true);
 

main/work/upload.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 use ChamiloSession as Session;
 
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_STUDENTPUBLICATION;
+$current_course_tool = TOOL_STUDENTPUBLICATION;
 
 api_protect_course_script(true);
 

main/auth/ldap/newUser.php

Indentation +7 added lines, -7 removed lines

@@ -21,17 +21,17 @@
 
 if ($ldap_login_success)
 {
-	//error_log('Found user '.$login.' on LDAP server',0);
-	/*
+    //error_log('Found user '.$login.' on LDAP server',0);
+    /*
 		In here, we know that
 		- the user does not exist in dokeos
 		- the users login and password are correct
 	*/
-	$info_array = ldap_find_user_info($login);
-	ldap_put_user_info_locally($login, $info_array);
+    $info_array = ldap_find_user_info($login);
+    ldap_put_user_info_locally($login, $info_array);
 } else {
     //error_log('Could not find '.$login.' on LDAP server',0);
-	$loginFailed = true;
-	unset($_user['user_id']);
-	$uidReset = false;
+    $loginFailed = true;
+    unset($_user['user_id']);
+    $uidReset = false;
 }

main/webservices/soap_session.php

Indentation +60 added lines, -60 removed lines

@@ -13,19 +13,19 @@ 
 $s->register(
     'WSSession.CreateSession',
     array(
-	'secret_key' => 'xsd:string',
-	'name' => 'xsd:string',
-	'start_date' => 'xsd:string',
-	'end_date' => 'xsd:string',
-	'nb_days_access_before' => 'xsd:int',
-	'nb_days_access_after' => 'xsd:int',
-	'nolimit' => 'xsd:int',
-	'visibility' => 'xsd:int',
-	'user_id_field_name' => 'xsd:string',
-	'user_id_value' => 'xsd:string',
-	'session_id_field_name' => 'xsd:string',
-	'session_id_value' => 'xsd:string',
-	'extras' => 'tns:extra_field'
+    'secret_key' => 'xsd:string',
+    'name' => 'xsd:string',
+    'start_date' => 'xsd:string',
+    'end_date' => 'xsd:string',
+    'nb_days_access_before' => 'xsd:int',
+    'nb_days_access_after' => 'xsd:int',
+    'nolimit' => 'xsd:int',
+    'visibility' => 'xsd:int',
+    'user_id_field_name' => 'xsd:string',
+    'user_id_value' => 'xsd:string',
+    'session_id_field_name' => 'xsd:string',
+    'session_id_value' => 'xsd:string',
+    'extras' => 'tns:extra_field'
     ),
     array('return' => 'xsd:int')
 );
@@ -33,50 +33,50 @@ 
 $s->register(
     'WSSession.DeleteSession',
     array(
-	'secret_key' => 'xsd:string',
-	'session_id_field_name' => 'xsd:string',
-	'session_id_value' => 'xsd:string'
+    'secret_key' => 'xsd:string',
+    'session_id_field_name' => 'xsd:string',
+    'session_id_value' => 'xsd:string'
     )
 );
 
 $s->register(
     'WSSession.EditSession',
     array(
-	'secret_key' => 'xsd:string',
-	'name' => 'xsd:string',
-	'start_date' => 'xsd:string',
-	'end_date' => 'xsd:string',
-	'nb_days_access_before' => 'xsd:int',
-	'nb_days_access_after' => 'xsd:int',
-	'nolimit' => 'xsd:int',
-	'visibility' => 'xsd:int',
-	'user_id_field_name' => 'xsd:string',
-	'user_id_value' => 'xsd:string',
-	'session_id_field_name' => 'xsd:string',
-	'session_id_value' => 'xsd:string',
-	'extras' => 'tns:extra_field'
+    'secret_key' => 'xsd:string',
+    'name' => 'xsd:string',
+    'start_date' => 'xsd:string',
+    'end_date' => 'xsd:string',
+    'nb_days_access_before' => 'xsd:int',
+    'nb_days_access_after' => 'xsd:int',
+    'nolimit' => 'xsd:int',
+    'visibility' => 'xsd:int',
+    'user_id_field_name' => 'xsd:string',
+    'user_id_value' => 'xsd:string',
+    'session_id_field_name' => 'xsd:string',
+    'session_id_value' => 'xsd:string',
+    'extras' => 'tns:extra_field'
     )
 );
 
 $s->register(
     'WSSession.SubscribeUserToSession',
     array(
-	'secret_key' => 'xsd:string',
-	'user_id_field_name' => 'xsd:string',
-	'user_id_value' => 'xsd:string',
-	'session_id_field_name' => 'xsd:string',
-	'session_id_value' => 'xsd:string'
+    'secret_key' => 'xsd:string',
+    'user_id_field_name' => 'xsd:string',
+    'user_id_value' => 'xsd:string',
+    'session_id_field_name' => 'xsd:string',
+    'session_id_value' => 'xsd:string'
     )
 );
 
 $s->register(
     'WSSession.UnsubscribeUserFromSession',
     array(
-	'secret_key' => 'xsd:string',
-	'user_id_field_name' => 'xsd:string',
-	'user_id_value' => 'xsd:string',
-	'session_id_field_name' => 'xsd:string',
-	'session_id_value' => 'xsd:string'
+    'secret_key' => 'xsd:string',
+    'user_id_field_name' => 'xsd:string',
+    'user_id_value' => 'xsd:string',
+    'session_id_field_name' => 'xsd:string',
+    'session_id_value' => 'xsd:string'
     )
 );
 
@@ -84,46 +84,46 @@ 
     'WSSession.SubscribeTeacherToSessionCourse',
     array(
         'secret_key' => 'xsd:string',
-	'user_id_field_name' => 'xsd:string',
-	'user_id_value' => 'xsd:string',
-	'session_id_field_name' => 'xsd:string',
-	'session_id_value' => 'xsd:string',
+    'user_id_field_name' => 'xsd:string',
+    'user_id_value' => 'xsd:string',
+    'session_id_field_name' => 'xsd:string',
+    'session_id_value' => 'xsd:string',
         'course_id_field_name' => 'xsd:string',
-	'course_id_value' => 'xsd:string'
+    'course_id_value' => 'xsd:string'
     )
 );
 
 $s->register(
     'WSSession.UnsubscribeTeacherFromSessionCourse',
     array(
-	'secret_key' => 'xsd:string',
-	'user_id_field_name' => 'xsd:string',
-	'user_id_value' => 'xsd:string',
-	'session_id_field_name' => 'xsd:string',
-	'session_id_value' => 'xsd:string',
+    'secret_key' => 'xsd:string',
+    'user_id_field_name' => 'xsd:string',
+    'user_id_value' => 'xsd:string',
+    'session_id_field_name' => 'xsd:string',
+    'session_id_value' => 'xsd:string',
         'course_id_field_name' => 'xsd:string',
-	'course_id_value' => 'xsd:string'
+    'course_id_value' => 'xsd:string'
     )
 );
 
 $s->register(
     'WSSession.SubscribeCourseToSession',
     array(
-	'secret_key' => 'xsd:string',
-	'course_id_field_name' => 'xsd:string',
-	'course_id_value' => 'xsd:string',
-	'session_id_field_name' => 'xsd:string',
-	'session_id_value' => 'xsd:string'
+    'secret_key' => 'xsd:string',
+    'course_id_field_name' => 'xsd:string',
+    'course_id_value' => 'xsd:string',
+    'session_id_field_name' => 'xsd:string',
+    'session_id_value' => 'xsd:string'
     )
 );
 
 $s->register(
     'WSSession.UnsubscribeCourseFromSession',
     array(
-	'secret_key' => 'xsd:string',
-	'course_id_field_name' => 'xsd:string',
-	'course_id_value' => 'xsd:string',
-	'session_id_field_name' => 'xsd:string',
-	'session_id_value' => 'xsd:string'
+    'secret_key' => 'xsd:string',
+    'course_id_field_name' => 'xsd:string',
+    'course_id_value' => 'xsd:string',
+    'session_id_field_name' => 'xsd:string',
+    'session_id_value' => 'xsd:string'
     )
 );

main/mySpace/lp_tracking.php

Indentation +11 added lines, -11 removed lines

@@ -11,10 +11,10 @@ 
 $from_myspace = false;
 $from_link = '';
 if (isset($_GET['from']) && $_GET['from'] == 'myspace') {
-	$from_link = '&from=myspace';
-	$this_section = SECTION_TRACKING;
+    $from_link = '&from=myspace';
+    $this_section = SECTION_TRACKING;
 } else {
-	$this_section = SECTION_COURSES;
+    $this_section = SECTION_COURSES;
 }
 
 $session_id  = isset($_REQUEST['id_session']) && !empty($_REQUEST['id_session']) ? intval($_REQUEST['id_session']) : api_get_session_id();
@@ -35,19 +35,19 @@ 
 if (!api_is_platform_admin(true) &&
     !CourseManager :: is_course_teacher(api_get_user_id(), $courseCode) &&
     !Tracking :: is_allowed_to_coach_student(api_get_user_id(), $user_id) && !api_is_drh() && !api_is_course_tutor()) {
-	api_not_allowed();
+    api_not_allowed();
 }
 
 if ($origin == 'user_course') {
-	$interbreadcrumb[] = array ("url" => api_get_path(WEB_COURSE_PATH).$course_info['directory'], 'name' => $course_info['name']);
-	$interbreadcrumb[] = array ("url" => "../user/user.php?cidReq=".$courseCode, "name" => get_lang("Users"));
+    $interbreadcrumb[] = array ("url" => api_get_path(WEB_COURSE_PATH).$course_info['directory'], 'name' => $course_info['name']);
+    $interbreadcrumb[] = array ("url" => "../user/user.php?cidReq=".$courseCode, "name" => get_lang("Users"));
 } else if($origin == 'tracking_course') {
-	$interbreadcrumb[] = array ("url" => "../tracking/courseLog.php?cidReq=".$courseCode.'&id_session='.$session_id, "name" => get_lang("Tracking"));
+    $interbreadcrumb[] = array ("url" => "../tracking/courseLog.php?cidReq=".$courseCode.'&id_session='.$session_id, "name" => get_lang("Tracking"));
 } else {
-	$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
-	$interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang("MyStudents"));
- 	$interbreadcrumb[] = array ("url" => "myStudents.php?student=".$user_id, "name" => get_lang("StudentDetails"));
- 	$nameTools=get_lang("DetailsStudentInCourse");
+    $interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
+    $interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang("MyStudents"));
+        $interbreadcrumb[] = array ("url" => "myStudents.php?student=".$user_id, "name" => get_lang("StudentDetails"));
+        $nameTools=get_lang("DetailsStudentInCourse");
 }
 
 $interbreadcrumb[] = array("url" => "myStudents.php?student=".$user_id."&course=".$courseCode."&details=true&origin=".$origin , "name" => get_lang("DetailsStudentInCourse"));

Spacing +15 added lines, -15 removed lines

@@ -17,7 +17,7 @@ 
 	$this_section = SECTION_COURSES;
 }
 
-$session_id  = isset($_REQUEST['id_session']) && !empty($_REQUEST['id_session']) ? intval($_REQUEST['id_session']) : api_get_session_id();
+$session_id = isset($_REQUEST['id_session']) && !empty($_REQUEST['id_session']) ? intval($_REQUEST['id_session']) : api_get_session_id();
 $export_csv = isset($_GET['export']) && $_GET['export'] == 'csv' ? true : false;
 $user_id = isset($_GET['student_id']) ? intval($_GET['student_id']) : api_get_user_id();
 $courseCode = isset($_GET['course']) ? Security::remove_XSS($_GET['course']) : api_get_course_id();
@@ -39,18 +39,18 @@ 
 }
 
 if ($origin == 'user_course') {
-	$interbreadcrumb[] = array ("url" => api_get_path(WEB_COURSE_PATH).$course_info['directory'], 'name' => $course_info['name']);
-	$interbreadcrumb[] = array ("url" => "../user/user.php?cidReq=".$courseCode, "name" => get_lang("Users"));
-} else if($origin == 'tracking_course') {
-	$interbreadcrumb[] = array ("url" => "../tracking/courseLog.php?cidReq=".$courseCode.'&id_session='.$session_id, "name" => get_lang("Tracking"));
+	$interbreadcrumb[] = array("url" => api_get_path(WEB_COURSE_PATH).$course_info['directory'], 'name' => $course_info['name']);
+	$interbreadcrumb[] = array("url" => "../user/user.php?cidReq=".$courseCode, "name" => get_lang("Users"));
+} else if ($origin == 'tracking_course') {
+	$interbreadcrumb[] = array("url" => "../tracking/courseLog.php?cidReq=".$courseCode.'&id_session='.$session_id, "name" => get_lang("Tracking"));
 } else {
-	$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
-	$interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang("MyStudents"));
- 	$interbreadcrumb[] = array ("url" => "myStudents.php?student=".$user_id, "name" => get_lang("StudentDetails"));
- 	$nameTools=get_lang("DetailsStudentInCourse");
+	$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace'));
+	$interbreadcrumb[] = array("url" => "student.php", "name" => get_lang("MyStudents"));
+ 	$interbreadcrumb[] = array("url" => "myStudents.php?student=".$user_id, "name" => get_lang("StudentDetails"));
+ 	$nameTools = get_lang("DetailsStudentInCourse");
 }
 
-$interbreadcrumb[] = array("url" => "myStudents.php?student=".$user_id."&course=".$courseCode."&details=true&origin=".$origin , "name" => get_lang("DetailsStudentInCourse"));
+$interbreadcrumb[] = array("url" => "myStudents.php?student=".$user_id."&course=".$courseCode."&details=true&origin=".$origin, "name" => get_lang("DetailsStudentInCourse"));
 $nameTools = get_lang('LearningPathDetails');
 $sql = 'SELECT name	FROM '.Database::get_course_table(TABLE_LP_MAIN).' WHERE c_id = '.$course_info['real_id'].' AND id='.$lp_id;
 $rs  = Database::query($sql);
@@ -58,19 +58,19 @@ 
 
 $origin = 'tracking';
 
-$output = require_once api_get_path(SYS_CODE_PATH) . 'lp/lp_stats.php';
+$output = require_once api_get_path(SYS_CODE_PATH).'lp/lp_stats.php';
 
 Display :: display_header($nameTools);
 echo '<div class ="actions">';
-echo '<a href="javascript:history.back();">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
+echo '<a href="javascript:history.back();">'.Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '<a href="javascript: void(0);" onclick="javascript: window.print();">
-        '.Display::return_icon('printer.png',get_lang('Print'),'',ICON_SIZE_MEDIUM).'</a>';
+        '.Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '<a href="'.api_get_self().'?export=csv&'.Security::remove_XSS($_SERVER['QUERY_STRING']).'">
-        '.Display::return_icon('export_csv.png',get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a>';
+        '.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 echo '<div class="clear"></div>';
 $session_name = api_get_session_name($session_id);
-$table_title = ($session_name? Display::return_icon('session.png', get_lang('Session'), array(), ICON_SIZE_SMALL).' '.$session_name.' ':' ').
+$table_title = ($session_name ? Display::return_icon('session.png', get_lang('Session'), array(), ICON_SIZE_SMALL).' '.$session_name.' ' : ' ').
     Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_info['name'].' '.
     Display::return_icon('user.png', get_lang('User'), array(), ICON_SIZE_SMALL).' '.$name;
 echo Display::page_header($table_title);

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

Indentation +189 added lines, -189 removed lines

@@ -9,194 +9,194 @@
 // 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',
 
 );

main/webservices/soap_user.php

Indentation +165 added lines, -165 removed lines

@@ -14,223 +14,223 @@
 $s = WSSoapServer::singleton();
 
 $s->wsdl->addComplexType(
-	'user_id',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'),
-		'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string')
-	)
+    'user_id',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'),
+        'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'user_result',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
-		'result' => array('name' => 'result', 'type' => 'tns:result')
-	)
+    'user_result',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
+        'result' => array('name' => 'result', 'type' => 'tns:result')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'user_result_array',
-	'complexType',
-	'array',
-	'',
-	'SOAP-ENC:Array',
-	array(),
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_result[]')),
-	'tns:user_result'
+    'user_result_array',
+    'complexType',
+    'array',
+    '',
+    'SOAP-ENC:Array',
+    array(),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_result[]')),
+    'tns:user_result'
 );
 
 $s->register(
-	'WSUser.DisableUser',
-	array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string')
+    'WSUser.DisableUser',
+    array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string')
 );
 
 $s->register(
-	'WSUser.DisableUsers',
-	array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'),
-	array('return' => 'tns:user_result_array')
+    'WSUser.DisableUsers',
+    array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'),
+    array('return' => 'tns:user_result_array')
 );
 
 $s->register(
-	'WSUser.EnableUser',
-	array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string')
+    'WSUser.EnableUser',
+    array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string')
 );
 
 $s->register(
-	'WSUser.EnableUsers',
-	array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'),
-	array('return' => 'tns:user_result_array')
+    'WSUser.EnableUsers',
+    array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'),
+    array('return' => 'tns:user_result_array')
 );
 
 $s->register(
-	'WSUser.DeleteUser',
-	array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string')
+    'WSUser.DeleteUser',
+    array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string')
 );
 
 $s->register(
-	'WSUser.DeleteUsers',
-	array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'),
-	array('return' => 'tns:user_result_array')
+    'WSUser.DeleteUsers',
+    array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'),
+    array('return' => 'tns:user_result_array')
 );
 
 $s->register(
-	'WSUser.CreateUser',
-	array(
-		'secret_key' => 'xsd:string',
-		'firstname' => 'xsd:string',
-		'lastname' => 'xsd:string',
-		'status' => 'xsd:int',
-		'loginname' => 'xsd:string',
-		'password' => 'xsd:string',
-		'encrypt_method' => 'xsd:string',
-		'user_id_field_name' => 'xsd:string',
-		'user_id_value' => 'xsd:string',
-		'visibility' => 'xsd:int',
-		'email' => 'xsd:string',
-		'language' => 'xsd:string',
-		'phone' => 'xsd:string',
-		'expiration_date' => 'xsd:string',
-		'extras' => 'tns:extra_field'
-	),
-	array('return' => 'xsd:int')
+    'WSUser.CreateUser',
+    array(
+        'secret_key' => 'xsd:string',
+        'firstname' => 'xsd:string',
+        'lastname' => 'xsd:string',
+        'status' => 'xsd:int',
+        'loginname' => 'xsd:string',
+        'password' => 'xsd:string',
+        'encrypt_method' => 'xsd:string',
+        'user_id_field_name' => 'xsd:string',
+        'user_id_value' => 'xsd:string',
+        'visibility' => 'xsd:int',
+        'email' => 'xsd:string',
+        'language' => 'xsd:string',
+        'phone' => 'xsd:string',
+        'expiration_date' => 'xsd:string',
+        'extras' => 'tns:extra_field'
+    ),
+    array('return' => 'xsd:int')
 );
 
 $s->wsdl->addComplexType(
-	'user_create',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'firstname' => array('name' => 'firstname', 'type' => 'xsd:string'),
-		'lastname' => array('name' => 'lastname', 'type' => 'xsd:string'),
-		'status' => array('name' => 'status', 'type' => 'xsd:int'),
-		'loginname' => array('name' => 'loginname', 'type' => 'xsd:string'),
-		'password' => array('name' => 'password', 'type' => 'xsd:string'),
-		'encrypt_method' => array('name' => 'encrypt_method', 'type' => 'xsd:string'),
-		'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'),
-		'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
-		'visibility' => array('name' => 'visibility', 'type' => 'xsd:int'),
-		'email' => array('name' => 'email', 'type' => 'xsd:string'),
-		'language' => array('name' => 'language', 'type' => 'xsd:string'),
-		'phone' => array('name' => 'phone', 'type' => 'xsd:string'),
-		'expiration_date' => array('name' => 'expiration_date', 'type' => 'xsd:string'),
-		'extras' => array('name' => 'extras', 'type' => 'tns:extra_field')
-	)
+    'user_create',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'firstname' => array('name' => 'firstname', 'type' => 'xsd:string'),
+        'lastname' => array('name' => 'lastname', 'type' => 'xsd:string'),
+        'status' => array('name' => 'status', 'type' => 'xsd:int'),
+        'loginname' => array('name' => 'loginname', 'type' => 'xsd:string'),
+        'password' => array('name' => 'password', 'type' => 'xsd:string'),
+        'encrypt_method' => array('name' => 'encrypt_method', 'type' => 'xsd:string'),
+        'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'),
+        'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
+        'visibility' => array('name' => 'visibility', 'type' => 'xsd:int'),
+        'email' => array('name' => 'email', 'type' => 'xsd:string'),
+        'language' => array('name' => 'language', 'type' => 'xsd:string'),
+        'phone' => array('name' => 'phone', 'type' => 'xsd:string'),
+        'expiration_date' => array('name' => 'expiration_date', 'type' => 'xsd:string'),
+        'extras' => array('name' => 'extras', 'type' => 'tns:extra_field')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'user_create_result',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
-		'user_id_generated' => array('name' => 'user_id_generated', 'type' => 'xsd:int'),
-		'result' => array('name' => 'result', 'type' => 'tns:result')
-	)
+    'user_create_result',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
+        'user_id_generated' => array('name' => 'user_id_generated', 'type' => 'xsd:int'),
+        'result' => array('name' => 'result', 'type' => 'tns:result')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'user_create_result_array',
-	'complexType',
-	'array',
-	'',
-	'SOAP-ENC:Array',
-	array(),
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_create_result[]')),
-	'tns:user_create_result'
+    'user_create_result_array',
+    'complexType',
+    'array',
+    '',
+    'SOAP-ENC:Array',
+    array(),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_create_result[]')),
+    'tns:user_create_result'
 );
 
 $s->register(
-	'WSUser.CreateUsers',
-	array(
-		'secret_key' => 'xsd:string',
-		'users' => 'tns:user_create[]'
-	),
-	array('return' => 'tns:user_create_result_array')
+    'WSUser.CreateUsers',
+    array(
+        'secret_key' => 'xsd:string',
+        'users' => 'tns:user_create[]'
+    ),
+    array('return' => 'tns:user_create_result_array')
 );
 
 $s->register(
-	'WSUser.EditUser',
-	array(
-		'secret_key' => 'xsd:string',
-		'user_id_field_name' => 'xsd:string',
-		'user_id_value' => 'xsd:string',
-		'firstname' => 'xsd:string',
-		'lastname' => 'xsd:string',
-		'status' => 'xsd:int',
-		'loginname' => 'xsd:string',
-		'password' => 'xsd:string',
-		'encrypt_method' => 'xsd:string',
-		'email' => 'xsd:string',
-		'language' => 'xsd:string',
-		'phone' => 'xsd:string',
-		'expiration_date' => 'xsd:string',
-		'extras' => 'tns:extra_field'
-	)
+    'WSUser.EditUser',
+    array(
+        'secret_key' => 'xsd:string',
+        'user_id_field_name' => 'xsd:string',
+        'user_id_value' => 'xsd:string',
+        'firstname' => 'xsd:string',
+        'lastname' => 'xsd:string',
+        'status' => 'xsd:int',
+        'loginname' => 'xsd:string',
+        'password' => 'xsd:string',
+        'encrypt_method' => 'xsd:string',
+        'email' => 'xsd:string',
+        'language' => 'xsd:string',
+        'phone' => 'xsd:string',
+        'expiration_date' => 'xsd:string',
+        'extras' => 'tns:extra_field'
+    )
 );
 
 $s->wsdl->addComplexType(
-	'user_edit',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'),
-		'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
-		'firstname' => array('name' => 'firstname', 'type' => 'xsd:string'),
-		'lastname' => array('name' => 'lastname', 'type' => 'xsd:string'),
-		'status' => array('name' => 'status', 'type' => 'xsd:int'),
-		'loginname' => array('name' => 'loginname', 'type' => 'xsd:string'),
-		'password' => array('name' => 'password', 'type' => 'xsd:string'),
-		'encrypt_method' => array('name' => 'encrypt_method', 'type' => 'xsd:string'),
-		'email' => array('name' => 'email', 'type' => 'xsd:string'),
-		'language' => array('name' => 'language', 'type' => 'xsd:string'),
-		'phone' => array('name' => 'phone', 'type' => 'xsd:string'),
-		'expiration_date' => array('name' => 'expiration_date', 'type' => 'xsd:string'),
-		'extras' => array('name' => 'extras', 'type' => 'tns:extra_field')
-	)
+    'user_edit',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'),
+        'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
+        'firstname' => array('name' => 'firstname', 'type' => 'xsd:string'),
+        'lastname' => array('name' => 'lastname', 'type' => 'xsd:string'),
+        'status' => array('name' => 'status', 'type' => 'xsd:int'),
+        'loginname' => array('name' => 'loginname', 'type' => 'xsd:string'),
+        'password' => array('name' => 'password', 'type' => 'xsd:string'),
+        'encrypt_method' => array('name' => 'encrypt_method', 'type' => 'xsd:string'),
+        'email' => array('name' => 'email', 'type' => 'xsd:string'),
+        'language' => array('name' => 'language', 'type' => 'xsd:string'),
+        'phone' => array('name' => 'phone', 'type' => 'xsd:string'),
+        'expiration_date' => array('name' => 'expiration_date', 'type' => 'xsd:string'),
+        'extras' => array('name' => 'extras', 'type' => 'tns:extra_field')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'user_edit_result',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
-		'result' => array('name' => 'result', 'type' => 'tns:result')
-	)
+    'user_edit_result',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
+        'result' => array('name' => 'result', 'type' => 'tns:result')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'user_edit_result_array',
-	'complexType',
-	'array',
-	'',
-	'SOAP-ENC:Array',
-	array(),
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_edit_result[]')),
-	'tns:user_edit_result'
+    'user_edit_result_array',
+    'complexType',
+    'array',
+    '',
+    'SOAP-ENC:Array',
+    array(),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_edit_result[]')),
+    'tns:user_edit_result'
 );
 
 $s->register(
-	'WSUser.EditUsers',
-	array(
-		'secret_key' => 'xsd:string',
-		'users' => 'tns:user_edit[]'
-	),
-	array('return' => 'tns:user_edit_result_array')
+    'WSUser.EditUsers',
+    array(
+        'secret_key' => 'xsd:string',
+        'users' => 'tns:user_edit[]'
+    ),
+    array('return' => 'tns:user_edit_result_array')
 );

main/inc/lib/search/IndexableChunk.class.php

Doc Comments +2 added lines

@@ -57,6 +57,7 @@ 
      * Add a value to the indexed item
      * @param  string  Key
      * @param  string  Value
+     * @param string $key
      * @return  void
      */
     function addValue($key, $value) {
@@ -109,6 +110,7 @@ 
 
     /**
      * Let add tool id term
+     * @param string $tool_id
      */
     public function addToolId($tool_id)
     {