chamilo / chamilo-lms

main/admin/user_update_import.php

Indentation +6 added lines, -6 removed lines

@@ -60,8 +60,8 @@ 
                     $user['error'] = get_lang('UserNameNotAvailable');
                     $errors[] = $user;
                 }
-             }
-          }
+                }
+            }
 
         // 3. Check status.
         if (isset($user['Status']) && !api_status_exists($user['Status'])) {
@@ -242,10 +242,10 @@ 
     return $users;
 }
 /**
- * XML-parser: handle start of element
- * @param   string  $parser Deprecated?
- * @param   string  $data The data to be parsed
- */
+     * XML-parser: handle start of element
+     * @param   string  $parser Deprecated?
+     * @param   string  $data The data to be parsed
+     */
 function element_start($parser, $data)
 {
     $data = api_utf8_decode($data);

main/inc/lib/banner.lib.php

Indentation +24 added lines, -24 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * Code
- * @todo use globals or parameters or add this file in the template
- * @package chamilo.include
- */
+     * Code
+     * @todo use globals or parameters or add this file in the template
+     * @package chamilo.include
+     */
 
 /**
  * Determines the possible tabs (=sections) that are available.
@@ -42,20 +42,20 @@ 
     $navigation['myprofile']['url'] = api_get_path(WEB_CODE_PATH).'auth/profile.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&amp;courseCode='.$_course['official_code'] : '' );
     $navigation['myprofile']['title'] = get_lang('ModifyProfile');
     $navigation['myprofile']['key'] = 'profile';
-	// Link to my agenda
+    // Link to my agenda
     $navigation['myagenda']['url'] = api_get_path(WEB_CODE_PATH).'calendar/agenda_js.php?type=personal';
     $navigation['myagenda']['title'] = get_lang('MyAgenda');
     $navigation['myagenda']['key'] = 'agenda';
 
-	// Gradebook
-	if (api_get_setting('gradebook_enable') == 'true') {
+    // Gradebook
+    if (api_get_setting('gradebook_enable') == 'true') {
         $navigation['mygradebook']['url'] = api_get_path(WEB_CODE_PATH).'gradebook/gradebook.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&amp;courseCode='.$_course['official_code'] : '' );
         $navigation['mygradebook']['title'] = get_lang('MyGradebook');
         $navigation['mygradebook']['key'] = 'gradebook';
-	}
+    }
 
-	// Reporting
-	if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) {
+    // Reporting
+    if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) {
         // Link to my space
         $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/'.(api_is_drh()?'session.php':'');
         $navigation['session_my_space']['title'] = get_lang('MySpace');
@@ -79,21 +79,21 @@ 
         $navigation['session_my_progress']['key'] = 'my-progress';
     }
 
-	// Social
-	if (api_get_setting('allow_social_tool')=='true') {
+    // Social
+    if (api_get_setting('allow_social_tool')=='true') {
         $navigation['social']['url'] = api_get_path(WEB_CODE_PATH).'social/home.php';
         $navigation['social']['title'] = get_lang('SocialNetwork');
         $navigation['social']['key'] = 'social-network';
-	}
+    }
 
-	// Dashboard
-	if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) {
+    // Dashboard
+    if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) {
         $navigation['dashboard']['url'] = api_get_path(WEB_CODE_PATH).'dashboard/index.php';
         $navigation['dashboard']['title'] = get_lang('Dashboard');
         $navigation['dashboard']['key'] = 'dashboard';
-	}
+    }
 
-	// Reports
+    // Reports
     /*
 	if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) {
         $navigation['reports']['url'] = api_get_path(WEB_CODE_PATH).'reports/index.php';
@@ -116,14 +116,14 @@ 
     }
     // End Custom Tabs
 
-	// Platform administration
-	if (api_is_platform_admin(true)) {
+    // Platform administration
+    if (api_is_platform_admin(true)) {
         $navigation['platform_admin']['url'] = api_get_path(WEB_CODE_PATH).'admin/';
         $navigation['platform_admin']['title'] = get_lang('PlatformAdmin');
         $navigation['platform_admin']['key'] = 'admin';
-	}
+    }
 
-	return $navigation;
+    return $navigation;
 }
 
 /**
@@ -351,7 +351,7 @@ 
             }
         }
 
-		// Reports
+        // Reports
         if (!empty($possible_tabs['reports'])) {
             if (api_get_setting('show_tabs', 'reports') == 'true') {
                 if ((api_is_platform_admin() || api_is_drh() || api_is_session_admin()) && Rights::hasRight('show_tabs:reports')) {
@@ -492,7 +492,7 @@ 
 
     $menu = null;
     if (!empty($lis)) {
-         $menu .= $lis;
+            $menu .= $lis;
     }
     return $menu;
 }
@@ -548,7 +548,7 @@ 
         $navigation_item_my_courses['title'] = get_lang('MyCourses');
         $navigation_item_my_courses['url'] = api_get_path(WEB_PATH).'user_portal.php';
         $navigation[] = $navigation_item_my_courses;
-        */
+         */
         $navigation[] = $navigation_item;
     }
 

Spacing +38 added lines, -38 removed lines

@@ -39,7 +39,7 @@ 
     $navigation['mycourses']['key'] = 'my-course';
 
     // My Profile
-    $navigation['myprofile']['url'] = api_get_path(WEB_CODE_PATH).'auth/profile.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' );
+    $navigation['myprofile']['url'] = api_get_path(WEB_CODE_PATH).'auth/profile.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '');
     $navigation['myprofile']['title'] = get_lang('ModifyProfile');
     $navigation['myprofile']['key'] = 'profile';
 	// Link to my agenda
@@ -49,7 +49,7 @@ 
 
 	// Gradebook
 	if (api_get_setting('gradebook_enable') == 'true') {
-        $navigation['mygradebook']['url'] = api_get_path(WEB_CODE_PATH).'gradebook/gradebook.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' );
+        $navigation['mygradebook']['url'] = api_get_path(WEB_CODE_PATH).'gradebook/gradebook.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '');
         $navigation['mygradebook']['title'] = get_lang('MyGradebook');
         $navigation['mygradebook']['key'] = 'gradebook';
 	}
@@ -57,11 +57,11 @@ 
 	// Reporting
 	if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) {
         // Link to my space
-        $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/'.(api_is_drh()?'session.php':'');
+        $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/'.(api_is_drh() ? 'session.php' : '');
         $navigation['session_my_space']['title'] = get_lang('MySpace');
         $navigation['session_my_space']['key'] = 'my-space';
     } else if (api_is_student_boss()) {
-        $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH) . 'mySpace/student.php';
+        $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/student.php';
         $navigation['session_my_space']['title'] = get_lang('MySpace');
         $navigation['session_my_space']['key'] = 'my-space';
     } else {
@@ -80,7 +80,7 @@ 
     }
 
 	// Social
-	if (api_get_setting('allow_social_tool')=='true') {
+	if (api_get_setting('allow_social_tool') == 'true') {
         $navigation['social']['url'] = api_get_path(WEB_CODE_PATH).'social/home.php';
         $navigation['social']['title'] = get_lang('SocialNetwork');
         $navigation['social']['key'] = 'social-network';
@@ -161,14 +161,14 @@ 
         'id' => 'header-logo'
     );
     $testServer = api_get_setting('server_type');
-    if ($testServer == 'test' && is_file($logoBase . 'svg')) {
-        $logo = $logoBase . 'svg';
+    if ($testServer == 'test' && is_file($logoBase.'svg')) {
+        $logo = $logoBase.'svg';
         $attributes['width'] = '245';
         $attributes['height'] = '68';
         $imageUrl = api_get_path(WEB_CSS_PATH).'themes/'.$theme.'/images/header-logo.svg';
     } else {
-        $logo = $logoBase . 'png';
-        $customLogo = $customLogoBase . 'png';
+        $logo = $logoBase.'png';
+        $customLogo = $customLogoBase.'png';
         $imageUrl = api_get_path(WEB_CSS_PATH).'themes/'.$theme.'/images/header-logo.png';
         $customImageUrl = api_get_path(WEB_CSS_PATH).'themes/'.$theme.'/images/header-logo-custom.png';
     }
@@ -218,7 +218,7 @@ 
     $_course = api_get_course_info();
     $course_id = 0;
     if (!empty($_course)) {
-        $course_id  = $_course['code'];
+        $course_id = $_course['code'];
     }
 
     $user_id = api_get_user_id();
@@ -315,7 +315,7 @@ 
         if (api_get_setting('gradebook_enable') == 'true') {
             if (api_get_setting('show_tabs', 'my_gradebook') == 'true') {
                 $navigation['mygradebook'] = $possible_tabs['mygradebook'];
-            } else{
+            } else {
                 $menu_navigation['mygradebook'] = $possible_tabs['mygradebook'];
             }
         }
@@ -340,7 +340,7 @@ 
             if (api_get_setting('allow_social_tool') == 'true') {
                 $navigation['social'] = isset($possible_tabs['social']) ? $possible_tabs['social'] : null;
             }
-        } else{
+        } else {
             $menu_navigation['social'] = isset($possible_tabs['social']) ? $possible_tabs['social'] : null;
         }
 
@@ -349,7 +349,7 @@ 
             if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) {
                 $navigation['dashboard'] = isset($possible_tabs['dashboard']) ? $possible_tabs['dashboard'] : null;
             }
-        } else{
+        } else {
             $menu_navigation['dashboard'] = isset($possible_tabs['dashboard']) ? $possible_tabs['dashboard'] : null;
         }
 
@@ -440,32 +440,32 @@ 
     $home_top = '';
 
     if (is_file($homep.$menutabs.'_'.$lang.$ext) && is_readable($homep.$menutabs.'_'.$lang.$ext)) {
-        $home_top = @(string)file_get_contents($homep.$menutabs.'_'.$lang.$ext);
+        $home_top = @(string) file_get_contents($homep.$menutabs.'_'.$lang.$ext);
     } elseif (is_file($homep.$menutabs.$lang.$ext) && is_readable($homep.$menutabs.$lang.$ext)) {
-        $home_top = @(string)file_get_contents($homep.$menutabs.$lang.$ext);
+        $home_top = @(string) file_get_contents($homep.$menutabs.$lang.$ext);
     } else {
         //$errorMsg = get_lang('HomePageFilesNotReadable');
     }
 
     $home_top = api_to_system_encoding($home_top, api_detect_encoding(strip_tags($home_top)));
 
-    $open = str_replace('{rel_path}',api_get_path(REL_PATH), $home_top);
+    $open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top);
     $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
 
     $open_mtloggedin = '';
     if (api_get_user_id() && !api_is_anonymous()) {
         if (is_file($homep.$mtloggedin.'_'.$lang.$ext) && is_readable($homep.$mtloggedin.'_'.$lang.$ext)) {
-            $home_top = @(string)file_get_contents($homep.$mtloggedin.'_'.$lang.$ext);
+            $home_top = @(string) file_get_contents($homep.$mtloggedin.'_'.$lang.$ext);
             $home_top = str_replace('::private', '', $home_top);
         } elseif (is_file($homep.$mtloggedin.$lang.$ext) && is_readable($homep.$mtloggedin.$lang.$ext)) {
-            $home_top = @(string)file_get_contents($homep.$mtloggedin.$lang.$ext);
+            $home_top = @(string) file_get_contents($homep.$mtloggedin.$lang.$ext);
             $home_top = str_replace('::private', '', $home_top);
         } else {
             //$errorMsg = get_lang('HomePageFilesNotReadable');
         }
 
         $home_top = api_to_system_encoding($home_top, api_detect_encoding(strip_tags($home_top)));
-        $open_mtloggedin = str_replace('{rel_path}',api_get_path(REL_PATH), $home_top);
+        $open_mtloggedin = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top);
         $open_mtloggedin = api_to_system_encoding($open_mtloggedin, api_detect_encoding(strip_tags($open_mtloggedin)));
     }
 
@@ -474,7 +474,7 @@ 
     if (!empty($open) OR !empty($open_mtloggedin)) {
         if (strpos($open.$open_mtloggedin, 'show_menu') === false) {
             if (api_is_anonymous()) {
-                $navigation[SECTION_CAMPUS]  = null;
+                $navigation[SECTION_CAMPUS] = null;
             }
         } else {
             if (api_get_user_id() && !api_is_anonymous()) {
@@ -488,7 +488,7 @@ 
     if (count($navigation) > 0 || !empty($lis)) {
         $pre_lis = '';
         foreach ($navigation as $section => $navigation_info) {
-            $key = (!empty($navigation_info['key'])?'tab-'.$navigation_info['key']:'');
+            $key = (!empty($navigation_info['key']) ? 'tab-'.$navigation_info['key'] : '');
             if (isset($GLOBALS['this_section'])) {
                 $current = $section == $GLOBALS['this_section'] ? ' id="current" class="active '.$key.'" ' : ' class="'.$key.'"';
             } else {
@@ -532,7 +532,7 @@ 
 
     if (!empty($_course) && !isset($_GET['hide_course_breadcrumb'])) {
 
-        $navigation_item['url'] = $web_course_path . $_course['path'].'/index.php'.(!empty($session_id) ? '?id_session='.$session_id : '');
+        $navigation_item['url'] = $web_course_path.$_course['path'].'/index.php'.(!empty($session_id) ? '?id_session='.$session_id : '');
         $_course['name'] = api_htmlentities($_course['name']);
         $course_title = cut($_course['name'], MAX_LENGTH_BREADCRUMB);
 
@@ -547,7 +547,7 @@ 
                 $navigation_item['title'] = Display::img(api_get_path(WEB_IMG_PATH).'home.png', $_course['name'].$my_session_name).' '.$course_title.$my_session_name;
                 break;
             default:
-                if (api_get_session_id() != -1 ) {
+                if (api_get_session_id() != -1) {
                     $navigation_item['title'] = Display::img(api_get_path(WEB_IMG_PATH).'home.png', $_course['name'].$my_session_name).' '.$course_title.$my_session_name;
                 } else {
                     $navigation_item['title'] = Display::img(api_get_path(WEB_IMG_PATH).'home.png', $_course['name']).' '.$course_title;
@@ -581,22 +581,22 @@ 
             // titles for shared folders
             if ($breadcrumb_step['name'] == 'shared_folder') {
                 $navigation_item['title'] = get_lang('UserFolders');
-            } elseif(strstr($breadcrumb_step['name'], 'shared_folder_session_')) {
+            } elseif (strstr($breadcrumb_step['name'], 'shared_folder_session_')) {
                 $navigation_item['title'] = get_lang('UserFolders');
-            } elseif(strstr($breadcrumb_step['name'], 'sf_user_')) {
+            } elseif (strstr($breadcrumb_step['name'], 'sf_user_')) {
                 $userinfo = api_get_user_info(substr($breadcrumb_step['name'], 8));
                 $navigation_item['title'] = $userinfo['complete_name'];
-            } elseif($breadcrumb_step['name'] == 'chat_files') {
+            } elseif ($breadcrumb_step['name'] == 'chat_files') {
                 $navigation_item['title'] = get_lang('ChatFiles');
-            } elseif($breadcrumb_step['name'] == 'images') {
+            } elseif ($breadcrumb_step['name'] == 'images') {
                 $navigation_item['title'] = get_lang('Images');
-            } elseif($breadcrumb_step['name'] == 'video') {
+            } elseif ($breadcrumb_step['name'] == 'video') {
                 $navigation_item['title'] = get_lang('Video');
-            } elseif($breadcrumb_step['name'] == 'audio') {
+            } elseif ($breadcrumb_step['name'] == 'audio') {
                 $navigation_item['title'] = get_lang('Audio');
-            } elseif($breadcrumb_step['name'] == 'flash') {
+            } elseif ($breadcrumb_step['name'] == 'flash') {
                 $navigation_item['title'] = get_lang('Flash');
-            } elseif($breadcrumb_step['name'] == 'gallery') {
+            } elseif ($breadcrumb_step['name'] == 'gallery') {
                 $navigation_item['title'] = get_lang('Gallery');
             }
             // Fixes breadcrumb title now we applied the Security::remove_XSS and
@@ -663,35 +663,35 @@ 
         if (!empty($final_navigation)) {
             // $home_link.= '<span class="divider">/</span>';
             if (!empty($home_link)) {
-                $lis.= Display::tag('li', $home_link);
+                $lis .= Display::tag('li', $home_link);
             }
 
             foreach ($final_navigation as $bread) {
                 $bread_check = trim(strip_tags($bread));
                 if (!empty($bread_check)) {
-                    if ($final_navigation_count-1 > $i) {
+                    if ($final_navigation_count - 1 > $i) {
                         $bread .= '';
                     }
-                    $lis.= Display::tag('li', $bread,array('class'=>'active'));
+                    $lis .= Display::tag('li', $bread, array('class'=>'active'));
                     $i++;
                 }
             }
         } else {
             if (!empty($home_link)) {
-                $lis.= Display::tag('li', $home_link);
+                $lis .= Display::tag('li', $home_link);
             }
         }
 
         // View as student/teacher link
         $view = null;
         if (!empty($view_as_student_link)) {
-            $view .= Display::tag('div', $view_as_student_link, array('id' => 'view_as_link','class' => 'pull-right'));
+            $view .= Display::tag('div', $view_as_student_link, array('id' => 'view_as_link', 'class' => 'pull-right'));
         }
 
         if (!empty($navigation_right)) {
-            foreach($navigation_right as $item){
+            foreach ($navigation_right as $item) {
                 $extra_class = isset($item['class']) ? $item['class'] : null;
-                $lis.= Display::tag('li', $item['title'], array('class' => $extra_class.' pull-right'));
+                $lis .= Display::tag('li', $item['title'], array('class' => $extra_class.' pull-right'));
             }
         }
 

main/admin/ldap_import_students_to_session.php

Indentation +111 added lines, -111 removed lines

@@ -53,93 +53,93 @@ 
 //if ($annee == "" && $composante == "" && $etape == "") {
 if (empty($annee) && empty($id_session))
 {
-		Display::display_header($tool_name);
-		echo '<div style="align:center">';
-		echo Display::return_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU')).' '.get_lang('LDAPSelectFilterOnUsersOU');
-		echo '<form method="get" action="'.api_get_self().'"><br />';
-		echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> ';
-		echo '<input  type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"> ';
-		echo '<input type="submit" value="'.get_lang('Submit').'">';
-		echo '</form>';
-		echo '</div>';
+        Display::display_header($tool_name);
+        echo '<div style="align:center">';
+        echo Display::return_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU')).' '.get_lang('LDAPSelectFilterOnUsersOU');
+        echo '<form method="get" action="'.api_get_self().'"><br />';
+        echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> ';
+        echo '<input  type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"> ';
+        echo '<input type="submit" value="'.get_lang('Submit').'">';
+        echo '</form>';
+        echo '</div>';
 
 }
 elseif(!empty($annee) && empty($id_session))
 {
-	Display::display_header($tool_name);
-	echo '<div style="align:center">';
-	echo Display::return_icon(
-			'course.png',
-			get_lang('SelectSessionToImportUsersTo')).' '.get_lang('SelectSessionToImportUsersTo').'<br />';
-	echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
-	echo '<select name="id_session">';
-
-	$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
-	$sql = "SELECT id,name,nbr_courses,access_start_date,access_end_date " .
-		" FROM $tbl_session ".
-		" ORDER BY name";
-	$result = Database::query($sql);
-
-	$sessions=Database::store_result($result);
-	$nbr_results=count($sessions);
-	foreach($sessions as $row) {
-		echo '<option value="'.$row['id'].'">'.api_htmlentities($row['name']).' ('.$row['access_start_date'].' - '.$row['access_end_date'].')</option>';
-	}
-	echo '</select>';
-	echo '<input type="submit" value="'.get_lang('Submit').'">';
-	echo '</form>';
-	echo '</div>';
+    Display::display_header($tool_name);
+    echo '<div style="align:center">';
+    echo Display::return_icon(
+            'course.png',
+            get_lang('SelectSessionToImportUsersTo')).' '.get_lang('SelectSessionToImportUsersTo').'<br />';
+    echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
+    echo '<select name="id_session">';
+
+    $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
+    $sql = "SELECT id,name,nbr_courses,access_start_date,access_end_date " .
+        " FROM $tbl_session ".
+        " ORDER BY name";
+    $result = Database::query($sql);
+
+    $sessions=Database::store_result($result);
+    $nbr_results=count($sessions);
+    foreach($sessions as $row) {
+        echo '<option value="'.$row['id'].'">'.api_htmlentities($row['name']).' ('.$row['access_start_date'].' - '.$row['access_end_date'].')</option>';
+    }
+    echo '</select>';
+    echo '<input type="submit" value="'.get_lang('Submit').'">';
+    echo '</form>';
+    echo '</div>';
 }
 // form4  annee != 0; composante != 0 etape != 0
 //elseif ($annee <> "" && $composante <> "" && $etape <> "" && $listeok != 'yes') {
 elseif (!empty($annee) && !empty($id_session) && empty($_POST['confirmed']))
 {
-	Display::display_header($tool_name);
-	echo '<div style="align: center;">';
-	echo '<br />';
-	echo '<br />';
-	echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>';
-	//echo "Connection ...";
-	$ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
-	ldap_set_version($ds);
-
-	if ($ds) {
-
-		$r = false;
-		$res = ldap_handle_bind($ds, $r);
-
-		//$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))");
-		//echo "(ou=*$annee,ou=$composante)";
-		$sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)");
-
-		$info = ldap_get_entries($ds, $sr);
-
-		for ($key = 0; $key < $info["count"]; $key ++) {
-			$nom_form[] = $info[$key]["sn"][0];
-			$prenom_form[] = $info[$key]["givenname"][0];
-			$email_form[] = $info[$key]["mail"][0];
-			// Get uid from dn
-			//$dn_array=ldap_explode_dn($info[$key]["dn"],1);
-			//$username_form[] = $dn_array[0]; // uid is first key
-			$username_form[] = $info[$key]['uid'][0];
-			$outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student"
-			//$val = ldap_get_values_len($ds, $entry, "userPassword");
-			//$password_form[] = $val[0];
-			$password_form[] = $info[$key]['userPassword'][0];
-		}
-		ldap_unbind($ds);
-
-		/*-----------------------------------------------*/
-
-		asort($nom_form);
-		reset($nom_form);
-
-		$statut=5;
-		include ('ldap_form_add_users_group.php');
-	} else {
-		echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
-	}
-	echo '<br /><br />';
+    Display::display_header($tool_name);
+    echo '<div style="align: center;">';
+    echo '<br />';
+    echo '<br />';
+    echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>';
+    //echo "Connection ...";
+    $ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
+    ldap_set_version($ds);
+
+    if ($ds) {
+
+        $r = false;
+        $res = ldap_handle_bind($ds, $r);
+
+        //$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))");
+        //echo "(ou=*$annee,ou=$composante)";
+        $sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)");
+
+        $info = ldap_get_entries($ds, $sr);
+
+        for ($key = 0; $key < $info["count"]; $key ++) {
+            $nom_form[] = $info[$key]["sn"][0];
+            $prenom_form[] = $info[$key]["givenname"][0];
+            $email_form[] = $info[$key]["mail"][0];
+            // Get uid from dn
+            //$dn_array=ldap_explode_dn($info[$key]["dn"],1);
+            //$username_form[] = $dn_array[0]; // uid is first key
+            $username_form[] = $info[$key]['uid'][0];
+            $outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student"
+            //$val = ldap_get_values_len($ds, $entry, "userPassword");
+            //$password_form[] = $val[0];
+            $password_form[] = $info[$key]['userPassword'][0];
+        }
+        ldap_unbind($ds);
+
+        /*-----------------------------------------------*/
+
+        asort($nom_form);
+        reset($nom_form);
+
+        $statut=5;
+        include ('ldap_form_add_users_group.php');
+    } else {
+        echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
+    }
+    echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=">'.get_lang('BackToNewSearch').'</a>';
     echo '<br /><br />';
     echo '</div>';
@@ -147,23 +147,23 @@ 
 }
 elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed']=='yes'))
 {
-	$id=$_POST['username_form'];
-	$UserList=array();
-	$userid_match_login = array();
-	foreach ($id as $form_index=>$user_id)
-	{
-		if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
-		{
-			$tmp = ldap_add_user($user_id);
-			$UserList[]= $tmp;
-			$userid_match_login[$tmp] = $user_id;
-		}
-	}
-	if (!empty($_POST['id_session'])) {
-		$num = 0;
-		$tbl_session_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
-		$tbl_session	  = Database::get_main_table(TABLE_MAIN_SESSION);
-		foreach ($UserList as $user_id) {
+    $id=$_POST['username_form'];
+    $UserList=array();
+    $userid_match_login = array();
+    foreach ($id as $form_index=>$user_id)
+    {
+        if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
+        {
+            $tmp = ldap_add_user($user_id);
+            $UserList[]= $tmp;
+            $userid_match_login[$tmp] = $user_id;
+        }
+    }
+    if (!empty($_POST['id_session'])) {
+        $num = 0;
+        $tbl_session_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
+        $tbl_session	  = Database::get_main_table(TABLE_MAIN_SESSION);
+        foreach ($UserList as $user_id) {
                     $res_user = Database::insert(
                         $tbl_session_user,
                         [
@@ -175,15 +175,15 @@ 
                     if ($res_user !== false) {
                         $num++;
                     }
-		}
-
-		if($num>0) {
-			$sql = 'UPDATE '.$tbl_session.' SET nbr_users = (nbr_users + '.$num.') WHERE id = '.intval($id_session);
-			$res = Database::query($sql);
-		}
-		header('Location: resume_session.php?id_session='.Security::remove_XSS($_POST['id_session']));
-	}
-	/*
+        }
+
+        if($num>0) {
+            $sql = 'UPDATE '.$tbl_session.' SET nbr_users = (nbr_users + '.$num.') WHERE id = '.intval($id_session);
+            $res = Database::query($sql);
+        }
+        header('Location: resume_session.php?id_session='.Security::remove_XSS($_POST['id_session']));
+    }
+    /*
 	else
 	{
 		Display :: display_header($tool_name);
@@ -202,13 +202,13 @@ 
 		Display :: display_normal_message($message,false);
 	}
 	*/
-	else
-	{
-		Display::display_header($tool_name);
-		$message=get_lang('NoUserAdded');
-		Display :: display_normal_message($message,false);
-	}
-	echo '<br /><br />';
+    else
+    {
+        Display::display_header($tool_name);
+        $message=get_lang('NoUserAdded');
+        Display :: display_normal_message($message,false);
+    }
+    echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';
     echo '<br /><br />';
 }

main/admin/ldap_import_students.php

Indentation +101 added lines, -101 removed lines

@@ -56,19 +56,19 @@ 
 //if ($annee == "" && $composante == "" && $etape == "") {
 if (empty($annee) && empty($course))
 {
-		Display::display_header($tool_name);
-		echo '<div style="align:center">';
-		Display::display_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU'));
-		echo get_lang('LDAPSelectFilterOnUsersOU');
-		//echo '<em>'.get_lang('ToDoThisYouMustEnterYearComponentAndComponentStep').'</em><br />';
-		///echo get_lang('FollowEachOfTheseStepsStepByStep').'<br />';
-
-		echo '<form method="get" action="'.api_get_self().'"><br />';
-		echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> ';
-		echo '<input  type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"><br />';
-		echo '<input type="submit" value="'.get_lang('Submit').'">';
-		echo '</form>';
-		echo '</div>';
+        Display::display_header($tool_name);
+        echo '<div style="align:center">';
+        Display::display_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU'));
+        echo get_lang('LDAPSelectFilterOnUsersOU');
+        //echo '<em>'.get_lang('ToDoThisYouMustEnterYearComponentAndComponentStep').'</em><br />';
+        ///echo get_lang('FollowEachOfTheseStepsStepByStep').'<br />';
+
+        echo '<form method="get" action="'.api_get_self().'"><br />';
+        echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> ';
+        echo '<input  type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"><br />';
+        echo '<input type="submit" value="'.get_lang('Submit').'">';
+        echo '</form>';
+        echo '</div>';
 
 }
 /*
@@ -200,71 +200,71 @@ 
 */
 elseif(!empty($annee) && empty($course))
 {
-	Display::display_header($tool_name);
-	echo '<div style="align:center">';
-	echo Display::return_icon('course.png', get_lang('SelectCourseToImportUsersTo')).' '.get_lang('SelectCourseToImportUsersTo').'<br />';
-	echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
-	echo '<select name="course">';
-	$courses = CourseManager::get_courses_list();
-	foreach($courses as $row)
-	{
-		echo '<option value="'.$row['code'].'">'.api_htmlentities($row['title']).'</option>';
-	}
-	echo '</select>';
-	echo '<input type="submit" value="'.get_lang('Submit').'">';
-	echo '</form>';
-	echo '</div>';
+    Display::display_header($tool_name);
+    echo '<div style="align:center">';
+    echo Display::return_icon('course.png', get_lang('SelectCourseToImportUsersTo')).' '.get_lang('SelectCourseToImportUsersTo').'<br />';
+    echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
+    echo '<select name="course">';
+    $courses = CourseManager::get_courses_list();
+    foreach($courses as $row)
+    {
+        echo '<option value="'.$row['code'].'">'.api_htmlentities($row['title']).'</option>';
+    }
+    echo '</select>';
+    echo '<input type="submit" value="'.get_lang('Submit').'">';
+    echo '</form>';
+    echo '</div>';
 }
 // form4  annee != 0; composante != 0 etape != 0
 //elseif ($annee <> "" && $composante <> "" && $etape <> "" && $listeok != 'yes') {
 elseif (!empty($annee) && !empty($course) && empty($_POST['confirmed']))
 {
-	Display::display_header($tool_name);
-	echo '<div style="align: center;">';
-	echo '<br />';
-	echo '<br />';
-	echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>';
-	//echo "Connection ...";
-	$ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
-	ldap_set_version($ds);
-
-	if ($ds) {
-
-		$r = false;
-		$res = ldap_handle_bind($ds, $r);
-
-		//$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))");
-		//echo "(ou=*$annee,ou=$composante)";
-		$sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)");
-
-		$info = ldap_get_entries($ds, $sr);
-
-		for ($key = 0; $key < $info["count"]; $key ++) {
-			$nom_form[] = $info[$key]["sn"][0];
-			$prenom_form[] = $info[$key]["givenname"][0];
-			$email_form[] = $info[$key]["mail"][0];
-			// Get uid from dn
-			//$dn_array=ldap_explode_dn($info[$key]["dn"],1);
-			//$username_form[] = $dn_array[0]; // uid is first key
-			$username_form[] = $info[$key]['uid'][0];
-			$outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student"
-			//$val = ldap_get_values_len($ds, $entry, "userPassword");
-			//$password_form[] = $val[0];
-			$password_form[] = $info[$key]['userPassword'][0];
-		}
-		ldap_unbind($ds);
-
-		/*-----------------------------------------------*/
-
-		asort($nom_form);
-		reset($nom_form);
-
-		$statut=5;
-		include ('ldap_form_add_users_group.php');
-	} else {
-		echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
-	}
-	echo '<br /><br />';
+    Display::display_header($tool_name);
+    echo '<div style="align: center;">';
+    echo '<br />';
+    echo '<br />';
+    echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>';
+    //echo "Connection ...";
+    $ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
+    ldap_set_version($ds);
+
+    if ($ds) {
+
+        $r = false;
+        $res = ldap_handle_bind($ds, $r);
+
+        //$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))");
+        //echo "(ou=*$annee,ou=$composante)";
+        $sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)");
+
+        $info = ldap_get_entries($ds, $sr);
+
+        for ($key = 0; $key < $info["count"]; $key ++) {
+            $nom_form[] = $info[$key]["sn"][0];
+            $prenom_form[] = $info[$key]["givenname"][0];
+            $email_form[] = $info[$key]["mail"][0];
+            // Get uid from dn
+            //$dn_array=ldap_explode_dn($info[$key]["dn"],1);
+            //$username_form[] = $dn_array[0]; // uid is first key
+            $username_form[] = $info[$key]['uid'][0];
+            $outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student"
+            //$val = ldap_get_values_len($ds, $entry, "userPassword");
+            //$password_form[] = $val[0];
+            $password_form[] = $info[$key]['userPassword'][0];
+        }
+        ldap_unbind($ds);
+
+        /*-----------------------------------------------*/
+
+        asort($nom_form);
+        reset($nom_form);
+
+        $statut=5;
+        include ('ldap_form_add_users_group.php');
+    } else {
+        echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
+    }
+    echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';
     echo '<br /><br />';
     echo '</div>';
@@ -272,27 +272,27 @@ 
 }
 elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
 {
-	$id=$_POST['username_form'];
-	$UserList=array();
-	$userid_match_login = array();
-	foreach ($id as $form_index=>$user_id)
-	{
-		if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
-		{
-			$tmp = ldap_add_user($user_id);
-			$UserList[]= $tmp;
-			$userid_match_login[$tmp] = $user_id;
-		}
-	}
-	if (!empty($_POST['course']))
-	{
-		foreach($UserList as $user_id)
-		{
-			CourseManager::add_user_to_course($user_id,$_POST['course']);
-		}
-		header('Location: course_information.php?code='.Security::remove_XSS($_POST['course']));
-	}
-	/*
+    $id=$_POST['username_form'];
+    $UserList=array();
+    $userid_match_login = array();
+    foreach ($id as $form_index=>$user_id)
+    {
+        if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
+        {
+            $tmp = ldap_add_user($user_id);
+            $UserList[]= $tmp;
+            $userid_match_login[$tmp] = $user_id;
+        }
+    }
+    if (!empty($_POST['course']))
+    {
+        foreach($UserList as $user_id)
+        {
+            CourseManager::add_user_to_course($user_id,$_POST['course']);
+        }
+        header('Location: course_information.php?code='.Security::remove_XSS($_POST['course']));
+    }
+    /*
 	else
 	{
 		Display :: display_header($tool_name);
@@ -311,13 +311,13 @@ 
 		Display :: display_normal_message($message,false);
 	}
 	*/
-	else
-	{
-		Display::display_header($tool_name);
-		$message=get_lang('NoUserAdded');
-		Display :: display_normal_message($message,false);
-	}
-	echo '<br /><br />';
+    else
+    {
+        Display::display_header($tool_name);
+        $message=get_lang('NoUserAdded');
+        Display :: display_normal_message($message,false);
+    }
+    echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';
     echo '<br /><br />';
 }

main/admin/skills_import.php

Indentation +118 added lines, -118 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * This tool allows platform admins to add skills by uploading a CSV or XML file
- * @package chamilo.admin
- * @documentation Some interesting basic skills can be found in the "Skills"
- * section here: http://en.wikipedia.org/wiki/Personal_knowledge_management
- */
+                         * This tool allows platform admins to add skills by uploading a CSV or XML file
+                         * @package chamilo.admin
+                         * @documentation Some interesting basic skills can be found in the "Skills"
+                         * section here: http://en.wikipedia.org/wiki/Personal_knowledge_management
+                         */
 
 $cidReset = true;
 require_once '../inc/global.inc.php';
@@ -70,7 +70,7 @@ 
             $oskill = new Skill();
             $skill_id = $oskill->add($skill);
             $parents[$saved_id] = $skill_id;
-		}
+        }
     }
 }
 
@@ -81,12 +81,12 @@ 
  */
 function parse_csv_data($file)
 {
-	$skills = Import :: csvToArray($file);
-	foreach ($skills as $index => $skill) {
-		$skills[$index] = $skill;
-	}
+    $skills = Import :: csvToArray($file);
+    foreach ($skills as $index => $skill) {
+        $skills[$index] = $skill;
+    }
 
-	return $skills;
+    return $skills;
 }
 
 /**
@@ -94,16 +94,16 @@ 
  */
 function element_start($parser, $data)
 {
-	$data = api_utf8_decode($data);
-	global $skill;
-	global $current_tag;
-	switch ($data) {
-		case 'Skill' :
-			$skill = array ();
-			break;
-		default :
-			$current_tag = $data;
-	}
+    $data = api_utf8_decode($data);
+    global $skill;
+    global $current_tag;
+    switch ($data) {
+        case 'Skill' :
+            $skill = array ();
+            break;
+        default :
+            $current_tag = $data;
+    }
 }
 
 /**
@@ -111,18 +111,18 @@ 
  */
 function element_end($parser, $data)
 {
-	$data = api_utf8_decode($data);
-	global $skill;
-	global $skills;
-	global $current_value;
-	switch ($data) {
-		case 'Skill' :
-			$skills[] = $skill;
-			break;
-		default :
-			$skill[$data] = $current_value;
-			break;
-	}
+    $data = api_utf8_decode($data);
+    global $skill;
+    global $skills;
+    global $current_value;
+    switch ($data) {
+        case 'Skill' :
+            $skills[] = $skill;
+            break;
+        default :
+            $skill[$data] = $current_value;
+            break;
+    }
 }
 
 /**
@@ -130,9 +130,9 @@ 
  */
 function character_data($parser, $data)
 {
-	$data = trim(api_utf8_decode($data));
-	global $current_value;
-	$current_value = $data;
+    $data = trim(api_utf8_decode($data));
+    global $current_value;
+    $current_value = $data;
 }
 
 /**
@@ -142,19 +142,19 @@ 
  */
 function parse_xml_data($file)
 {
-	global $current_tag;
-	global $current_value;
-	global $skill;
-	global $skills;
-	$skills = array();
-	$parser = xml_parser_create('UTF-8');
-	xml_set_element_handler($parser, 'element_start', 'element_end');
-	xml_set_character_data_handler($parser, 'character_data');
-	xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, false);
-	xml_parse($parser, api_utf8_encode_xml(file_get_contents($file)));
-	xml_parser_free($parser);
+    global $current_tag;
+    global $current_value;
+    global $skill;
+    global $skills;
+    $skills = array();
+    $parser = xml_parser_create('UTF-8');
+    xml_set_element_handler($parser, 'element_start', 'element_end');
+    xml_set_character_data_handler($parser, 'character_data');
+    xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, false);
+    xml_parse($parser, api_utf8_encode_xml(file_get_contents($file)));
+    xml_parser_free($parser);
 
-	return $skills;
+    return $skills;
 }
 
 $this_section = SECTION_PLATFORM_ADMIN;
@@ -169,81 +169,81 @@ 
 $error_message = '';
 
 if (!empty($_POST['formSent']) && $_FILES['import_file']['size'] !== 0) {
-	$file_type = $_POST['file_type'];
-	Security::clear_token();
-	$tok = Security::get_token();
-	$allowed_file_mimetype = array('csv','xml');
-	$error_kind_file = false;
+    $file_type = $_POST['file_type'];
+    Security::clear_token();
+    $tok = Security::get_token();
+    $allowed_file_mimetype = array('csv','xml');
+    $error_kind_file = false;
     $error_message = '';
 
-	$ext_import_file = substr($_FILES['import_file']['name'], (strrpos($_FILES['import_file']['name'],'.')+1));
+    $ext_import_file = substr($_FILES['import_file']['name'], (strrpos($_FILES['import_file']['name'],'.')+1));
 
-	if (in_array($ext_import_file,$allowed_file_mimetype)) {
-		if (strcmp($file_type, 'csv') === 0 && $ext_import_file == $allowed_file_mimetype[0]) {
-			$skills	= parse_csv_data($_FILES['import_file']['tmp_name']);
-			$errors = validate_data($skills);
-			$error_kind_file = false;
-		} elseif (strcmp($file_type, 'xml') === 0 && $ext_import_file == $allowed_file_mimetype[1]) {
-			$skills = parse_xml_data($_FILES['import_file']['tmp_name']);
-			$errors = validate_data($skills);
-			$error_kind_file = false;
-		} else {
-			$error_kind_file = true;
-		}
-	} else {
-		$error_kind_file = true;
-	}
+    if (in_array($ext_import_file,$allowed_file_mimetype)) {
+        if (strcmp($file_type, 'csv') === 0 && $ext_import_file == $allowed_file_mimetype[0]) {
+            $skills	= parse_csv_data($_FILES['import_file']['tmp_name']);
+            $errors = validate_data($skills);
+            $error_kind_file = false;
+        } elseif (strcmp($file_type, 'xml') === 0 && $ext_import_file == $allowed_file_mimetype[1]) {
+            $skills = parse_xml_data($_FILES['import_file']['tmp_name']);
+            $errors = validate_data($skills);
+            $error_kind_file = false;
+        } else {
+            $error_kind_file = true;
+        }
+    } else {
+        $error_kind_file = true;
+    }
 
-	// List skill id with error.
-	$skills_to_insert = $skill_id_error = array();
-	if (is_array($errors)) {
-		foreach ($errors as $my_errors) {
-			$skill_id_error[] = $my_errors['SkillName'];
-		}
-	}
-	if (is_array($skills)) {
-		foreach ($skills as $my_skill) {
-			if (isset($my_skill['name']) && !in_array($my_skill['name'], $skill_id_error)) {
-				$skills_to_insert[] = $my_skill;
-			}
-		}
-	}
+    // List skill id with error.
+    $skills_to_insert = $skill_id_error = array();
+    if (is_array($errors)) {
+        foreach ($errors as $my_errors) {
+            $skill_id_error[] = $my_errors['SkillName'];
+        }
+    }
+    if (is_array($skills)) {
+        foreach ($skills as $my_skill) {
+            if (isset($my_skill['name']) && !in_array($my_skill['name'], $skill_id_error)) {
+                $skills_to_insert[] = $my_skill;
+            }
+        }
+    }
 
-	if (strcmp($file_type, 'csv') === 0) {
-		save_data($skills_to_insert);
-	} elseif (strcmp($file_type, 'xml') === 0) {
-		save_data($skills_to_insert);
-	} else {
-		$error_message = get_lang('YouMustImportAFileAccordingToSelectedOption');
-	}
+    if (strcmp($file_type, 'csv') === 0) {
+        save_data($skills_to_insert);
+    } elseif (strcmp($file_type, 'xml') === 0) {
+        save_data($skills_to_insert);
+    } else {
+        $error_message = get_lang('YouMustImportAFileAccordingToSelectedOption');
+    }
 
-	if (count($errors) > 0) {
-		$see_message_import = get_lang('FileImportedJustSkillsThatAreNotRegistered');
-	} else {
-		$see_message_import = get_lang('FileImported');
-	}
+    if (count($errors) > 0) {
+        $see_message_import = get_lang('FileImportedJustSkillsThatAreNotRegistered');
+    } else {
+        $see_message_import = get_lang('FileImported');
+    }
 
-	if (count($errors) != 0) {
-		$warning_message = '<ul>';
-		foreach ($errors as $index => $error_skill) {
-			$warning_message .= '<li><b>'.$error_skill['error'].'</b>: ';
-			$warning_message .= '<strong>'.$error_skill['SkillName'].'</strong>&nbsp;('.$error_skill['SkillName'].')';
-			$warning_message .= '</li>';
-		}
-		$warning_message .= '</ul>';
-	}
+    if (count($errors) != 0) {
+        $warning_message = '<ul>';
+        foreach ($errors as $index => $error_skill) {
+            $warning_message .= '<li><b>'.$error_skill['error'].'</b>: ';
+            $warning_message .= '<strong>'.$error_skill['SkillName'].'</strong>&nbsp;('.$error_skill['SkillName'].')';
+            $warning_message .= '</li>';
+        }
+        $warning_message .= '</ul>';
+    }
 
     if ($error_kind_file) {
-		$error_message = get_lang('YouMustImportAFileAccordingToSelectedOption');
-	}
+        $error_message = get_lang('YouMustImportAFileAccordingToSelectedOption');
+    }
 }
 Display :: display_header($tool_name);
 
 if (!empty($error_message)) {
-	Display::display_error_message($error_message);
+    Display::display_error_message($error_message);
 }
 if (!empty($see_message_import)) {
-	Display::display_normal_message($see_message_import);
+    Display::display_normal_message($see_message_import);
 }
 
 $form = new FormValidator('user_import','post','skills_import.php');
@@ -266,16 +266,16 @@ 
 $i = 0;
 $count_fields = count($extra_fields);
 if ($count_fields > 0) {
-	foreach ($extra_fields as $extra) {
-		$list[] = $extra[1];
-		$list_reponse[] = 'xxx';
-		$spaces = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		$result_xml .= $spaces.'&lt;'.$extra[1].'&gt;xxx&lt;/'.$extra[1].'&gt;';
-		if ($i != $count_fields - 1) {
-			$result_xml .= '<br/>';
-		}
-		$i++;
-	}
+    foreach ($extra_fields as $extra) {
+        $list[] = $extra[1];
+        $list_reponse[] = 'xxx';
+        $spaces = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+        $result_xml .= $spaces.'&lt;'.$extra[1].'&gt;xxx&lt;/'.$extra[1].'&gt;';
+        if ($i != $count_fields - 1) {
+            $result_xml .= '<br/>';
+        }
+        $i++;
+    }
 }
 ?>
 <p><?php echo get_lang('CSVMustLookLike').' ('.get_lang('MandatoryFields').')'; ?> :</p>

main/document/edit_paint.php

Indentation +35 added lines, -35 removed lines

@@ -61,44 +61,44 @@ 
 /* Please, do not modify this dirname formatting */
 
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 //groups //TODO:clean
 if (!empty($groupId)) {
-	$interbreadcrumb[] = array(
-		'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(),
-		'name' => get_lang('GroupSpace'),
-	);
-	$group_document = true;
-	$noPHP_SELF = true;
+    $interbreadcrumb[] = array(
+        'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(),
+        'name' => get_lang('GroupSpace'),
+    );
+    $group_document = true;
+    $noPHP_SELF = true;
 }
 
 $is_certificate_mode = DocumentManager::is_certificate_mode($dir);
 
 if (!$is_certificate_mode)
-	$interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents'));
+    $interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents'));
 else
-	$interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
+    $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
 
 // Interbreadcrumb for the current directory root path
 if (empty($document_data['parents'])) {
@@ -113,10 +113,10 @@ 
 }
 
 $is_allowedToEdit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights'] ||
-	DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id);
+    DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id);
 
 if (!$is_allowedToEdit) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 Event::event_access_tool(TOOL_DOCUMENT);
@@ -148,21 +148,21 @@ 
 $locktitle="false";
 
 if ($_SERVER['HTTP_HOST']=="localhost") {
-	$path_and_file= api_get_path(SYS_SERVER_ROOT_PATH).'/crossdomain.xml';
-	if (!file_exists($path_and_file)) {
-		$crossdomain='<?xml version="1.0"?>
+    $path_and_file= api_get_path(SYS_SERVER_ROOT_PATH).'/crossdomain.xml';
+    if (!file_exists($path_and_file)) {
+        $crossdomain='<?xml version="1.0"?>
 			<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
 			<cross-domain-policy>
 				<allow-access-from domain="cdn.pixlr.com" />
 				<site-control permitted-cross-domain-policies="master-only"/>
 				<allow-http-request-headers-from domain="cnd.pixlr.com" headers="*" secure="true"/>
 			</cross-domain-policy>';//more open domain="*"
-		@file_put_contents($path_and_file, $crossdomain);
-	}
-	$credentials="true";
+        @file_put_contents($path_and_file, $crossdomain);
+    }
+    $credentials="true";
 }
 else {
-	$credentials="false";
+    $credentials="false";
 }
 
 //make temp images
@@ -175,23 +175,23 @@ 
 $htaccess=api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess';
 if (!file_exists($htaccess)) {
 
-	$htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes";
+    $htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes";
 
-	$fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess', 'w');
-	if ($fp) {
-		fwrite($fp, $htaccess_content);
-		fclose($fp);
-	}
+    $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess', 'w');
+    if ($fp) {
+        fwrite($fp, $htaccess_content);
+        fclose($fp);
+    }
 }
 
 $html_index=api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html';
 if (!file_exists($html_index)) {
-	$html_index_content="<html><head></head><body></body></html>";
-	$fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html', 'w');
-	if ($fp) {
-		fwrite($fp, $html_index_content);
-		fclose($fp);
-	}
+    $html_index_content="<html><head></head><body></body></html>";
+    $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html', 'w');
+    if ($fp) {
+        fwrite($fp, $html_index_content);
+        fclose($fp);
+    }
 }
 
 //encript temp name file

main/document/slideshow.php

Indentation +253 added lines, -253 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * @author Patrick Cool patrick.cool@UGent.be Ghent University Mai 2004
- * @author Julio Montoya Lots of improvements, cleaning, adding security
- * @author Juan Carlos Raña Trabado herodoto@telefonica.net	January 2008
- * @package chamilo.document
- */
+     * @author Patrick Cool patrick.cool@UGent.be Ghent University Mai 2004
+     * @author Julio Montoya Lots of improvements, cleaning, adding security
+     * @author Juan Carlos Raña Trabado herodoto@telefonica.net	January 2008
+     * @package chamilo.document
+     */
 require_once '../inc/global.inc.php';
 api_protect_course_script();
 
@@ -15,15 +15,15 @@ 
 $slide_id = isset($_GET['slide_id']) ? Security::remove_XSS($_GET['slide_id']) : null;
 
 if (empty($slide_id)) {
-	$edit_slide_id = 1;
+    $edit_slide_id = 1;
 } else {
-	$edit_slide_id = $slide_id;
+    $edit_slide_id = $slide_id;
 }
 
 if ($path != '/') {
-	$folder = $path.'/';
+    $folder = $path.'/';
 } else {
-	$folder = '/';
+    $folder = '/';
 }
 $sys_course_path = api_get_path(SYS_COURSE_PATH);
 
@@ -41,15 +41,15 @@ 
 
 // Loading the slides from the session
 if (isset($_SESSION['image_files_only'])) {
-	$image_files_only = $_SESSION['image_files_only'];
+    $image_files_only = $_SESSION['image_files_only'];
 }
 
 // Calculating the current slide, next slide, previous slide and the number of slides
 $slide = null;
 if ($slide_id != 'all') {
-	$slide = $slide_id ? $slide_id : 0;
-	$previous_slide = $slide - 1;
-	$next_slide = $slide + 1;
+    $slide = $slide_id ? $slide_id : 0;
+    $previous_slide = $slide - 1;
+    $next_slide = $slide + 1;
 }
 $total_slides = count($image_files_only);
 ?>
@@ -62,62 +62,62 @@ 
 <?php
 
 if ($slide_id != 'all') {
-	$image = null;
-	if (isset($image_files_only[$slide])) {
-		$image = $sys_course_path . $_course['path'] . '/document' . $folder . $image_files_only[$slide];
-	}
-	if (file_exists($image)) {
-		echo '<div class="actions-pagination">';
-
-		// Back forward buttons
-		if ($slide == 0) {
-			$imgp = 'action_prev_na.png';
-			$first = Display::return_icon('action_first_na.png');
-		} else {
-			$imgp = 'action_prev.png';
-			$first = '<a href="slideshow.php?slide_id=0&curdirpath='.$pathurl.'">
+    $image = null;
+    if (isset($image_files_only[$slide])) {
+        $image = $sys_course_path . $_course['path'] . '/document' . $folder . $image_files_only[$slide];
+    }
+    if (file_exists($image)) {
+        echo '<div class="actions-pagination">';
+
+        // Back forward buttons
+        if ($slide == 0) {
+            $imgp = 'action_prev_na.png';
+            $first = Display::return_icon('action_first_na.png');
+        } else {
+            $imgp = 'action_prev.png';
+            $first = '<a href="slideshow.php?slide_id=0&curdirpath='.$pathurl.'">
 			          '.Display::return_icon('action_first.png', get_lang('FirstSlide')).'
 			          </a>';
-		}
+        }
 
-		// First slide
-		echo $first;
+        // First slide
+        echo $first;
 
-		// Previous slide
-		if ($slide > 0) {
-			echo '<a href="slideshow.php?slide_id='.$previous_slide.'&curdirpath='.$pathurl.'">';
-		}
+        // Previous slide
+        if ($slide > 0) {
+            echo '<a href="slideshow.php?slide_id='.$previous_slide.'&curdirpath='.$pathurl.'">';
+        }
 
         echo Display::return_icon($imgp, get_lang('Previous'));
-		if ($slide > 0) {
-			echo '</a>';
-		}
-
-		// Divider
-		echo ' [ '.$next_slide.'/'.$total_slides.' ] ';
-
-		// Next slide
-		if ($slide < $total_slides - 1) {
-			echo '<a href="slideshow.php?slide_id='.$next_slide.'&curdirpath='.$pathurl.'">';
-		}
-		if ($slide == $total_slides - 1) {
-			$imgn = 'action_next_na.png';
+        if ($slide > 0) {
+            echo '</a>';
+        }
+
+        // Divider
+        echo ' [ '.$next_slide.'/'.$total_slides.' ] ';
+
+        // Next slide
+        if ($slide < $total_slides - 1) {
+            echo '<a href="slideshow.php?slide_id='.$next_slide.'&curdirpath='.$pathurl.'">';
+        }
+        if ($slide == $total_slides - 1) {
+            $imgn = 'action_next_na.png';
             $last = Display::return_icon('action_last_na.png', get_lang('LastSlide'));
-		} else {
-			$imgn = 'action_next.png';
-			$last = '<a href="slideshow.php?slide_id='.($total_slides-1).'&curdirpath='.$pathurl.'">
+        } else {
+            $imgn = 'action_next.png';
+            $last = '<a href="slideshow.php?slide_id='.($total_slides-1).'&curdirpath='.$pathurl.'">
 			        '.Display::return_icon('action_last.png', get_lang('LastSlide')).'
                 </a>';
-		}
+        }
         echo Display::return_icon($imgn, get_lang('Next'));
-		if ($slide > 0) {
-			echo '</a>';
-		}
-
-		// Last slide
-		echo $last;
-		echo '</div>';
-	}
+        if ($slide > 0) {
+            echo '</a>';
+        }
+
+        // Last slide
+        echo $last;
+        echo '</div>';
+    }
 }
 
 // Exit the slideshow
@@ -126,10 +126,10 @@ 
 
 // Show thumbnails
 if ($slide_id != 'all') {
-	echo '<a href="slideshow.php?slide_id=all&curdirpath='.$pathurl.'&'.api_get_cidreq().'">'.
+    echo '<a href="slideshow.php?slide_id=all&curdirpath='.$pathurl.'&'.api_get_cidreq().'">'.
         Display::return_icon('thumbnails.png',get_lang('ShowThumbnails'),'',ICON_SIZE_MEDIUM).'</a>';
 } else {
-	echo Display::return_icon('thumbnails_na.png',get_lang('ShowThumbnails'),'',ICON_SIZE_MEDIUM);
+    echo Display::return_icon('thumbnails_na.png',get_lang('ShowThumbnails'),'',ICON_SIZE_MEDIUM);
 }
 // Slideshow options
 echo '<a href="slideshowoptions.php?curdirpath='.$pathurl.'&'.api_get_cidreq().'">'.
@@ -142,24 +142,24 @@ 
 
 // If we come from slideshowoptions.php we sessionize (new word !!! ;-) the options
 if (isset($_POST['Submit'])) {
-	// We come from slideshowoptions.php
-	//$_SESSION["auto_image_resizing"]=Security::remove_XSS($_POST['auto_radio_resizing']);
-	$_SESSION["image_resizing"] = Security::remove_XSS($_POST['radio_resizing']);
-	if ($_POST['radio_resizing'] == "resizing" && $_POST['width'] != '' && $_POST['height'] != '') {
-		//echo "resizing";
-		$_SESSION["image_resizing_width"] = Security::remove_XSS($_POST['width']);
-		$_SESSION["image_resizing_height"] = Security::remove_XSS($_POST['height']);
-	} else {
-		//echo "unsetting the session heighte and width";
-		$_SESSION["image_resizing_width"] = null;
-		$_SESSION["image_resizing_height"] = null;
-	}
+    // We come from slideshowoptions.php
+    //$_SESSION["auto_image_resizing"]=Security::remove_XSS($_POST['auto_radio_resizing']);
+    $_SESSION["image_resizing"] = Security::remove_XSS($_POST['radio_resizing']);
+    if ($_POST['radio_resizing'] == "resizing" && $_POST['width'] != '' && $_POST['height'] != '') {
+        //echo "resizing";
+        $_SESSION["image_resizing_width"] = Security::remove_XSS($_POST['width']);
+        $_SESSION["image_resizing_height"] = Security::remove_XSS($_POST['height']);
+    } else {
+        //echo "unsetting the session heighte and width";
+        $_SESSION["image_resizing_width"] = null;
+        $_SESSION["image_resizing_height"] = null;
+    }
 }
 $target_width = $target_height = null;
 // The target height and width depends if we choose resizing or no resizing
 if (isset($_SESSION["image_resizing"]) &&  $_SESSION["image_resizing"] == "resizing") {
-	$target_width = $_SESSION["image_resizing_width"];
-	$target_height = $_SESSION["image_resizing_height"];
+    $target_width = $_SESSION["image_resizing_width"];
+    $target_height = $_SESSION["image_resizing_height"];
 }
 
 /*	THUMBNAIL VIEW */
@@ -169,59 +169,59 @@ 
 $html = '';
 if ($slide_id == 'all') {
 
-	// Config for make thumbnails
+    // Config for make thumbnails
     $allowed_thumbnail_types = array('jpg', 'jpeg', 'gif', 'png');
-	$max_thumbnail_width     = 250;
-	$max_thumbnail_height    = 250;
-	$png_compression	     = 0; // 0(none)-9
-	$jpg_quality  	         = 75; // from 0 to 100 (default is 75). More quality less compression
+    $max_thumbnail_width     = 250;
+    $max_thumbnail_height    = 250;
+    $png_compression	     = 0; // 0(none)-9
+    $jpg_quality  	         = 75; // from 0 to 100 (default is 75). More quality less compression
 
-	$directory_thumbnails = $sys_course_path.$_course['path'].'/document'.$folder.'.thumbs/';
+    $directory_thumbnails = $sys_course_path.$_course['path'].'/document'.$folder.'.thumbs/';
 
-	//Other parameters only for show tumbnails
-	$row_items 			     = 4;//only in slideshow.php
-	$number_image 			 = 7;//num icons cols to show
-	$thumbnail_width_frame = $max_thumbnail_width;//optional $max_thumbnail_width+x
-	$thumbnail_height_frame = $max_thumbnail_height;
+    //Other parameters only for show tumbnails
+    $row_items 			     = 4;//only in slideshow.php
+    $number_image 			 = 7;//num icons cols to show
+    $thumbnail_width_frame = $max_thumbnail_width;//optional $max_thumbnail_width+x
+    $thumbnail_height_frame = $max_thumbnail_height;
 
-	// Create the template_thumbnails folder (if no exist)
+    // Create the template_thumbnails folder (if no exist)
 
-	if (!file_exists($directory_thumbnails)) {
-		@mkdir($directory_thumbnails, api_get_permissions_for_new_directories());
+    if (!file_exists($directory_thumbnails)) {
+        @mkdir($directory_thumbnails, api_get_permissions_for_new_directories());
     }
 
-	// check files and thumbnails
-	if (is_array($image_files_only)) {
+    // check files and thumbnails
+    if (is_array($image_files_only)) {
 
-		foreach ($image_files_only as $one_image_file) {
-			$image = $sys_course_path.$_course['path'].'/document'.$folder.$one_image_file;
-			$image_thumbnail= $directory_thumbnails.'.'.$one_image_file;
+        foreach ($image_files_only as $one_image_file) {
+            $image = $sys_course_path.$_course['path'].'/document'.$folder.$one_image_file;
+            $image_thumbnail= $directory_thumbnails.'.'.$one_image_file;
 
-			if (file_exists($image)) {
-				//check thumbnail
-				$imagetype = explode(".", $image);
+            if (file_exists($image)) {
+                //check thumbnail
+                $imagetype = explode(".", $image);
                 //or check $imagetype = image_type_to_extension(exif_imagetype($image), false);
-				$imagetype = strtolower($imagetype[count($imagetype)-1]);
+                $imagetype = strtolower($imagetype[count($imagetype)-1]);
 
-				if (in_array($imagetype,$allowed_thumbnail_types)) {
-					if (!file_exists($image_thumbnail)){
+                if (in_array($imagetype,$allowed_thumbnail_types)) {
+                    if (!file_exists($image_thumbnail)){
                         //run each once we view thumbnails is too heavy, then need move into  !file_exists($image_thumbnail, and only run when haven't the thumbnail
-						$original_image_size = api_getimagesize($image);
-
-						switch($imagetype) {
-							case 'gif':
-								$source_img = imagecreatefromgif($image);
-								break;
-							case 'jpg':
-								$source_img = imagecreatefromjpeg($image);
-								break;
-							case 'jpeg':
-								$source_img = imagecreatefromjpeg($image);
-								break;
-							case 'png':
-								$source_img = imagecreatefrompng($image);
-								break;
-						}
+                        $original_image_size = api_getimagesize($image);
+
+                        switch($imagetype) {
+                            case 'gif':
+                                $source_img = imagecreatefromgif($image);
+                                break;
+                            case 'jpg':
+                                $source_img = imagecreatefromjpeg($image);
+                                break;
+                            case 'jpeg':
+                                $source_img = imagecreatefromjpeg($image);
+                                break;
+                            case 'png':
+                                $source_img = imagecreatefrompng($image);
+                                break;
+                        }
 
                         $new_thumbnail_size = api_calculate_image_size(
                             $original_image_size['width'],
@@ -229,33 +229,33 @@ 
                             $max_thumbnail_width,
                             $max_thumbnail_height
                         );
-						if ($max_thumbnail_width>$original_image_size['width'] && $max_thumbnail_height>$original_image_size['height']){
-							$new_thumbnail_size['width']=$original_image_size['width'];
-							$new_thumbnail_size['height']=$original_image_size['height'];
-						}
-
-						$crop = imagecreatetruecolor($new_thumbnail_size['width'], $new_thumbnail_size['height']);
-
-						// preserve transparency
-						if ($imagetype == "png"){
-							imagesavealpha($crop, true);
-							$color = imagecolorallocatealpha($crop,0x00,0x00,0x00,127);
-							imagefill($crop, 0, 0, $color);
-						}
-
-						if ($imagetype == "gif") {
-							$transindex = imagecolortransparent($source_img);
+                        if ($max_thumbnail_width>$original_image_size['width'] && $max_thumbnail_height>$original_image_size['height']){
+                            $new_thumbnail_size['width']=$original_image_size['width'];
+                            $new_thumbnail_size['height']=$original_image_size['height'];
+                        }
+
+                        $crop = imagecreatetruecolor($new_thumbnail_size['width'], $new_thumbnail_size['height']);
+
+                        // preserve transparency
+                        if ($imagetype == "png"){
+                            imagesavealpha($crop, true);
+                            $color = imagecolorallocatealpha($crop,0x00,0x00,0x00,127);
+                            imagefill($crop, 0, 0, $color);
+                        }
+
+                        if ($imagetype == "gif") {
+                            $transindex = imagecolortransparent($source_img);
                             $palletsize = imagecolorstotal($source_img);
-							 //GIF89a for transparent and anim (first clip), either GIF87a
-							 if ($transindex >= 0 && $transindex < $palletsize){
-								 $transcol = imagecolorsforindex($source_img, $transindex);
-								 $transindex = imagecolorallocatealpha($crop, $transcol['red'], $transcol['green'], $transcol['blue'], 127);
-								 imagefill($crop, 0, 0, $transindex);
-								 imagecolortransparent($crop, $transindex);
-							 }
-						}
-
-						//resampled image
+                                //GIF89a for transparent and anim (first clip), either GIF87a
+                                if ($transindex >= 0 && $transindex < $palletsize){
+                                    $transcol = imagecolorsforindex($source_img, $transindex);
+                                    $transindex = imagecolorallocatealpha($crop, $transcol['red'], $transcol['green'], $transcol['blue'], 127);
+                                    imagefill($crop, 0, 0, $transindex);
+                                    imagecolortransparent($crop, $transindex);
+                                }
+                        }
+
+                        //resampled image
                         imagecopyresampled(
                             $crop,
                             $source_img,
@@ -269,69 +269,69 @@ 
                             $original_image_size['height']
                         );
 
-						switch ($imagetype) {
-							case 'gif':
-								imagegif($crop,$image_thumbnail);
-								break;
-							case 'jpg':
-								imagejpeg($crop,$image_thumbnail,$jpg_quality);
-								break;
-							case 'jpeg':
-								imagejpeg($crop,$image_thumbnail,$jpg_quality);
-								break;
-							case 'png':
-								imagepng($crop,$image_thumbnail,$png_compression);
-								break;
-						}
-
-						//clean memory
-						imagedestroy($crop);
-					}//end !exist thumbnail
-
-					//show thumbnail and link
-
-					$one_image_thumbnail_file='.thumbs/.'.$one_image_file;//get path thumbnail
-					$doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_thumbnail_file : $path.$one_image_thumbnail_file;
-					$image_tag[] = '<img class="img-gallery" src="download.php?doc_url='.$doc_url.'" border="0" title="'.$one_image_file.'">';
-				} else {
-					//if images aren't support by gd (not gif, jpg, jpeg, png)
-					if ($imagetype=="bmp") {
+                        switch ($imagetype) {
+                            case 'gif':
+                                imagegif($crop,$image_thumbnail);
+                                break;
+                            case 'jpg':
+                                imagejpeg($crop,$image_thumbnail,$jpg_quality);
+                                break;
+                            case 'jpeg':
+                                imagejpeg($crop,$image_thumbnail,$jpg_quality);
+                                break;
+                            case 'png':
+                                imagepng($crop,$image_thumbnail,$png_compression);
+                                break;
+                        }
+
+                        //clean memory
+                        imagedestroy($crop);
+                    }//end !exist thumbnail
+
+                    //show thumbnail and link
+
+                    $one_image_thumbnail_file='.thumbs/.'.$one_image_file;//get path thumbnail
+                    $doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_thumbnail_file : $path.$one_image_thumbnail_file;
+                    $image_tag[] = '<img class="img-gallery" src="download.php?doc_url='.$doc_url.'" border="0" title="'.$one_image_file.'">';
+                } else {
+                    //if images aren't support by gd (not gif, jpg, jpeg, png)
+                    if ($imagetype=="bmp") {
                         // use getimagesize instead api_getimagesize($image); becasuse api_getimagesize doesn't support bmp files. Put here for each show, only for a few bmp files isn't heavy
-						$original_image_size = getimagesize($image);
-						if ($max_thumbnail_width<$original_image_size[0] || $max_thumbnail_height<$original_image_size[1]){
-							$thumbnail_size=api_calculate_image_size($original_image_size[0], $original_image_size[1], $max_thumbnail_width, $max_thumbnail_height);//don't use resize_image because doesn't run with bmp files
-							$image_height = $thumbnail_size['height'];
-							$image_width  = $thumbnail_size['width'];
-						} else {
-							$image_height=$original_image_size[0];
-							$image_width=$original_image_size[1];
-						}
-					} else {
-						//example for svg files,...
-						$image_width=$max_thumbnail_width;
-						$image_height=$max_thumbnail_height;
-					}
-
-					$doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_file : $path.$one_image_file;
-					$image_tag[] = '<img src="download.php?doc_url='.$doc_url.'" border="0" width="'.$image_width.'" height="'.$image_height.'" title="'.$one_image_file.'">';
-
-				}//end allowed image types
-			}//end if exist file image
-		}//end foreach
-	}//end image files only
-
-	// Creating the table
-	$html_table = '';
-
-	$i = 0;
-	$count_image = count($image_tag);
-	$number_iteration = ceil($count_image/$number_image);
-	$p = 0;
+                        $original_image_size = getimagesize($image);
+                        if ($max_thumbnail_width<$original_image_size[0] || $max_thumbnail_height<$original_image_size[1]){
+                            $thumbnail_size=api_calculate_image_size($original_image_size[0], $original_image_size[1], $max_thumbnail_width, $max_thumbnail_height);//don't use resize_image because doesn't run with bmp files
+                            $image_height = $thumbnail_size['height'];
+                            $image_width  = $thumbnail_size['width'];
+                        } else {
+                            $image_height=$original_image_size[0];
+                            $image_width=$original_image_size[1];
+                        }
+                    } else {
+                        //example for svg files,...
+                        $image_width=$max_thumbnail_width;
+                        $image_height=$max_thumbnail_height;
+                    }
+
+                    $doc_url = ($path && $path !== '/') ? $path.'/'.$one_image_file : $path.$one_image_file;
+                    $image_tag[] = '<img src="download.php?doc_url='.$doc_url.'" border="0" width="'.$image_width.'" height="'.$image_height.'" title="'.$one_image_file.'">';
+
+                }//end allowed image types
+            }//end if exist file image
+        }//end foreach
+    }//end image files only
+
+    // Creating the table
+    $html_table = '';
+
+    $i = 0;
+    $count_image = count($image_tag);
+    $number_iteration = ceil($count_image/$number_image);
+    $p = 0;
     $html = '';
     $html .= '<div class="gallery">';
-	for ($k = 0; $k < $number_iteration; $k++) {
-		for ($i = 0; $i < $number_image; $i++) {
-			if (isset($image_tag[$p])) {
+    for ($k = 0; $k < $number_iteration; $k++) {
+        for ($i = 0; $i < $number_image; $i++) {
+            if (isset($image_tag[$p])) {
                             $html .= '<div class="col-xs-6 col-sm-3 col-md-2">';
                             $html .= '<div class="canvas-one">';
                             $html .= '<a class="canvas-two" href="slideshow.php?slide_id='.$p.'&curdirpath='.$pathurl.'">';
@@ -343,10 +343,10 @@ 
                             $html .= '</a>';
                             $html .= '</div>';
                             $html .= '</div>';
-			}
-			$p++;
-		}
-	}
+            }
+            $p++;
+        }
+    }
     $html .= '</div>';
 
 }//end slide==all
@@ -357,43 +357,43 @@ 
 // This is for viewing all the images in the slideshow one at a time.
 
 if ($slide_id != 'all' && !empty($image_files_only)) {
-	if (file_exists($image) && is_file($image)) {
-		$image_height_width = resize_image($image, $target_width, $target_height);
-
-		$image_height = $image_height_width[0];
-		$image_width = $image_height_width[1];
-
-		$height_width_tags = null;
-		if (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') {
-			$height_width_tags = 'width="'.$image_width.'" height="'.$image_height.'"';
-		}
-
-		// This is done really quickly and should be cleaned up a little bit using the API functions
-		$tbl_documents = Database::get_course_table(TABLE_DOCUMENT);
-		if ($path == '/') {
-			$pathpart = '/';
-		} else {
-			$pathpart = $path.'/';
-		}
-		$sql = "SELECT * FROM $tbl_documents
+    if (file_exists($image) && is_file($image)) {
+        $image_height_width = resize_image($image, $target_width, $target_height);
+
+        $image_height = $image_height_width[0];
+        $image_width = $image_height_width[1];
+
+        $height_width_tags = null;
+        if (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') {
+            $height_width_tags = 'width="'.$image_width.'" height="'.$image_height.'"';
+        }
+
+        // This is done really quickly and should be cleaned up a little bit using the API functions
+        $tbl_documents = Database::get_course_table(TABLE_DOCUMENT);
+        if ($path == '/') {
+            $pathpart = '/';
+        } else {
+            $pathpart = $path.'/';
+        }
+        $sql = "SELECT * FROM $tbl_documents
 		        WHERE c_id = $course_id AND path='".Database::escape_string($pathpart.$image_files_only[$slide])."'";
-		$result = Database::query($sql);
-		$row = Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
 
         echo '<div class="thumbnail">';
-		if ($slide < $total_slides - 1 && $slide_id != 'all') {
-			echo "<a href='slideshow.php?slide_id=".$next_slide."&curdirpath=$pathurl'>";
-		} else {
-			echo "<a href='slideshow.php?slide_id=0&curdirpath=$pathurl'>";
-		}
+        if ($slide < $total_slides - 1 && $slide_id != 'all') {
+            echo "<a href='slideshow.php?slide_id=".$next_slide."&curdirpath=$pathurl'>";
+        } else {
+            echo "<a href='slideshow.php?slide_id=0&curdirpath=$pathurl'>";
+        }
         if ($path == '/') {
-        	$path = '';
+            $path = '';
         }
 
-		list($width, $height) = getimagesize($image);
-		// Auto resize
-		if (isset($_SESSION["image_resizing"]) &&  $_SESSION["image_resizing"] == 'resizing') {
-		?>
+        list($width, $height) = getimagesize($image);
+        // Auto resize
+        if (isset($_SESSION["image_resizing"]) &&  $_SESSION["image_resizing"] == 'resizing') {
+        ?>
 
 		<script type="text/javascript">
 			var initial_width='<?php echo $width; ?>';
@@ -446,21 +446,21 @@ 
 
 		</script>
     <?php
-		} else {
-			echo "<img class=\"img-responsive\" src='download.php?doc_url=$path/".$image_files_only[$slide]."' alt='".$image_files_only[$slide]."' border='0'".$height_width_tags.">";
-		}
+        } else {
+            echo "<img class=\"img-responsive\" src='download.php?doc_url=$path/".$image_files_only[$slide]."' alt='".$image_files_only[$slide]."' border='0'".$height_width_tags.">";
+        }
 
-		echo '</a>';
+        echo '</a>';
         echo '<div class="caption text-center">';
         echo Display::tag('h3', $row['title']);
         echo '<p>' . $row['comment'] . '</p>';
         echo '</div>';
         echo '</div>';
 
-		if (api_is_allowed_to_edit(null, true)) {
+        if (api_is_allowed_to_edit(null, true)) {
             echo '<ul class="list-unstyled">';
-			$aux = explode('.', htmlspecialchars($image_files_only[$slide]));
-			$ext = $aux[count($aux) - 1];
+            $aux = explode('.', htmlspecialchars($image_files_only[$slide]));
+            $ext = $aux[count($aux) - 1];
 
             if (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') {
                 $resize_info = get_lang('Resizing').'<br />';
@@ -472,8 +472,8 @@ 
                 $resize_height = get_lang('Auto');
             } else {
                 $resize_info = get_lang('NoResizing').'<br />';
-				$resize_width = '';
-				$resize_height = '';
+                $resize_width = '';
+                $resize_height = '';
             }
 
             echo '<li class="text-center">';
@@ -493,16 +493,16 @@ 
             );
             echo '</li>';
             echo '<li class="text-center">' . $width.' x '.$height . '</li>';
-			echo '<li class="text-center">' . round((filesize($image) / 1024), 2) . ' KB - ' . $ext . '</li>';
+            echo '<li class="text-center">' . round((filesize($image) / 1024), 2) . ' KB - ' . $ext . '</li>';
             echo '<li class="text-center">' . $resize_info . '</li>';
-			echo '<li class="text-center">' . $resize_width . '</li>';
-			echo '<li class="text-center">' . $resize_height . '</li>';
+            echo '<li class="text-center">' . $resize_width . '</li>';
+            echo '<li class="text-center">' . $resize_height . '</li>';
             echo '</ul>';
-		}
+        }
 
-	} else {
-		Display::display_warning_message(get_lang('FileNotFound'));
-	}
+    } else {
+        Display::display_warning_message(get_lang('FileNotFound'));
+    }
 } else {
     if ($slide_id != 'all') {
         Display::display_warning_message(get_lang('NoDataAvailable'));

main/admin/settings.lib.php

Spacing +43 added lines, -43 removed lines

@@ -129,7 +129,7 @@ 
 
     //Plugins NOT installed
     echo Display::page_subheader(get_lang('Plugins'));
-    echo '<form class="form-horizontal" name="plugins" method="post" action="'.api_get_self().'?category='.Security::remove_XSS($_GET['category']).'&sec_token=' . $token . '">';
+    echo '<form class="form-horizontal" name="plugins" method="post" action="'.api_get_self().'?category='.Security::remove_XSS($_GET['category']).'&sec_token='.$token.'">';
     echo '<table class="data_table">';
     echo '<tr>';
     echo '<th width="20px">';
@@ -141,7 +141,7 @@ 
 
     $plugin_list = array();
     $my_plugin_list = $plugin_obj->get_plugin_regions();
-    foreach($my_plugin_list as $plugin_item) {
+    foreach ($my_plugin_list as $plugin_item) {
         $plugin_list[$plugin_item] = $plugin_item;
     }
 
@@ -180,7 +180,7 @@ 
             if (file_exists(api_get_path(SYS_PLUGIN_PATH).$plugin.'/readme.txt')) {
                 echo Display::url(
                     "<em class='fa fa-file-text-o'></em> readme.txt",
-                    api_get_path(WEB_PLUGIN_PATH) . $plugin . "/readme.txt",
+                    api_get_path(WEB_PLUGIN_PATH).$plugin."/readme.txt",
                     [
                         'class' => 'btn btn-default ajax',
                         'data-title' => $plugin_info['title'],
@@ -322,7 +322,7 @@ 
                     $show_name = ucwords(str_replace('_', ' ', $style_dir));
 
                     if ($is_style_changeable) {
-                        $list_of_names[$style_dir]  = $show_name;
+                        $list_of_names[$style_dir] = $show_name;
                     }
                     $counter++;
                 }
@@ -353,9 +353,9 @@ 
             if (is_dir($dir)) {
                 $zip = new PclZip($arch);
                 // Remove path prefix except the style name and put file on disk
-                $zip->create($dir, PCLZIP_OPT_REMOVE_PATH, substr($dir,0,-strlen($safe_style_dir)));
+                $zip->create($dir, PCLZIP_OPT_REMOVE_PATH, substr($dir, 0, -strlen($safe_style_dir)));
                 //@TODO: use more generic script to download.
-                $str = '<a class="btn btn-primary btn-large" href="' . api_get_path(WEB_CODE_PATH) . 'course_info/download.php?archive=' . str_replace(api_get_path(SYS_ARCHIVE_PATH), '', $arch) . '">'.get_lang('ClickHereToDownloadTheFile').'</a>';
+                $str = '<a class="btn btn-primary btn-large" href="'.api_get_path(WEB_CODE_PATH).'course_info/download.php?archive='.str_replace(api_get_path(SYS_ARCHIVE_PATH), '', $arch).'">'.get_lang('ClickHereToDownloadTheFile').'</a>';
                 Display::display_normal_message($str, false);
             } else {
                 Display::addFlash(Display::return_message(get_lang('FileNotFound'), 'warning'));
@@ -371,15 +371,15 @@ 
     
     $logoForm->addHtml(Display::return_message(sprintf(get_lang('TheLogoMustBeSizeXAndFormatY'), '250 x 70', 'PNG'), 'info'));
     
-    $dir = api_get_path(SYS_PUBLIC_PATH).'css/themes/' . $selected . '/images/';
-    $url = api_get_path(WEB_CSS_PATH).'themes/' . $selected . '/images/';
+    $dir = api_get_path(SYS_PUBLIC_PATH).'css/themes/'.$selected.'/images/';
+    $url = api_get_path(WEB_CSS_PATH).'themes/'.$selected.'/images/';
     $logoFileName = 'header-logo.png';
     $newLogoFileName = 'header-logo-custom.png';
     
     if (is_file($dir.$newLogoFileName)) {
-        $logoForm->addLabel(get_lang('CurrentLogo'), '<img id="header-logo-custom" src="'. $url . $newLogoFileName .'?'. time() . '">'); 
+        $logoForm->addLabel(get_lang('CurrentLogo'), '<img id="header-logo-custom" src="'.$url.$newLogoFileName.'?'.time().'">'); 
     } else {
-        $logoForm->addLabel(get_lang('CurrentLogo'), '<img id="header-logo-custom" src="'. $url . $logoFileName .'?'. time() . '">');
+        $logoForm->addLabel(get_lang('CurrentLogo'), '<img id="header-logo-custom" src="'.$url.$logoFileName.'?'.time().'">');
     }
     
     $logoForm->addFile('new_logo', get_lang('UpdateLogo'));
@@ -403,7 +403,7 @@ 
             $imageInfo = getimagesize($_FILES['new_logo']['tmp_name']);
             $width = $imageInfo[0];
             $height = $imageInfo[1];
-            if ($width <= 250 && $height <= 70 ) {
+            if ($width <= 250 && $height <= 70) {
                 if (is_file($dir.$newLogoFileName)) {
                     unlink($dir.$newLogoFileName);
                 }
@@ -447,7 +447,7 @@ 
             });
             </script>';
             echo Display::tabs(
-                array(get_lang('Update'),get_lang('UpdateLogo'), get_lang('UploadNewStylesheet')),
+                array(get_lang('Update'), get_lang('UpdateLogo'), get_lang('UploadNewStylesheet')),
                 array($form_change->return_form(), $logoForm->return_form(), $form->return_form())
             );
         } else {
@@ -622,7 +622,7 @@ 
             if (!empty($areas_to_installed)) {
                 $plugin_obj->remove_all_regions($plugin);
                 foreach ($areas_to_installed as $region) {
-                    if (!empty($region) && $region != '-1' ) {
+                    if (!empty($region) && $region != '-1') {
                         $plugin_obj->add_to_region($plugin, $region);
                     }
                 }
@@ -714,7 +714,7 @@ 
     $values = api_get_settings_options('search_enabled');
     $form->addElement('header', null, get_lang('SearchEnabledTitle'));
 
-    $group = array ();
+    $group = array();
     if (is_array($values)) {
         foreach ($values as $key => $value) {
             $element = & $form->createElement('radio', 'search_enabled', '', get_lang($value['display_text']), $value['value']);
@@ -740,12 +740,12 @@ 
 
     if ($search_enabled == 'true') {
         $values = api_get_settings_options('search_show_unlinked_results');
-        $group = array ();
+        $group = array();
         foreach ($values as $key => $value) {
             $element = & $form->createElement('radio', 'search_show_unlinked_results', '', get_lang($value['display_text']), $value['value']);
             $group[] = $element;
         }
-        $form->addGroup($group, 'search_show_unlinked_results', array(get_lang('SearchShowUnlinkedResultsTitle'),get_lang('SearchShowUnlinkedResultsComment')), '', false);
+        $form->addGroup($group, 'search_show_unlinked_results', array(get_lang('SearchShowUnlinkedResultsTitle'), get_lang('SearchShowUnlinkedResultsComment')), '', false);
         $default_values['search_show_unlinked_results'] = api_get_setting('search_show_unlinked_results');
 
         $sf_values = array();
@@ -753,7 +753,7 @@ 
             $sf_values[$sf['code']] = $sf['name'];
         }
         $group = array();
-        $url =  Display::div(Display::url(get_lang('AddSpecificSearchField'), 'specific_fields.php'), array('class'=>'sectioncomment'));
+        $url = Display::div(Display::url(get_lang('AddSpecificSearchField'), 'specific_fields.php'), array('class'=>'sectioncomment'));
         if (empty($sf_values)) {
             $form->addElement('html', get_lang('SearchPrefilterPrefix').$url);
         } else {
@@ -820,10 +820,10 @@ 
             $dir_is_writable = Display::return_icon('bullet_red.png', get_lang('Error'));
         }
 
-        $data[] = array(get_lang('XapianModuleInstalled'),$xapian_loaded);
-        $data[] = array(get_lang('DirectoryExists').' - '.$xapian_path,$dir_exists);
-        $data[] = array(get_lang('IsWritable').' - '.$xapian_path,$dir_is_writable);
-        $data[] = array(get_lang('SpecificSearchFieldsAvailable') ,$specific_fields_exists);
+        $data[] = array(get_lang('XapianModuleInstalled'), $xapian_loaded);
+        $data[] = array(get_lang('DirectoryExists').' - '.$xapian_path, $dir_exists);
+        $data[] = array(get_lang('IsWritable').' - '.$xapian_path, $dir_is_writable);
+        $data[] = array(get_lang('SpecificSearchFieldsAvailable'), $specific_fields_exists);
 
         echo Display::tag('h3', get_lang('Settings'));
         $table = new SortableTableFromArray($data);
@@ -833,16 +833,16 @@ 
 
         //@todo windows support
         if (api_is_windows_os() == false) {
-            $list_of_programs = array('pdftotext','ps2pdf', 'catdoc','html2text','unrtf', 'catppt', 'xls2csv');
+            $list_of_programs = array('pdftotext', 'ps2pdf', 'catdoc', 'html2text', 'unrtf', 'catppt', 'xls2csv');
 
-            foreach($list_of_programs as $program) {
+            foreach ($list_of_programs as $program) {
                 $output = $ret_val = null;
                 exec("which $program", $output, $ret_val);
                 $icon = Display::return_icon('bullet_red.png', get_lang('NotInstalled'));
                 if (!empty($output[0])) {
                     $icon = Display::return_icon('bullet_green.png', get_lang('Installed'));
                 }
-                $data2[]= array($program, $output[0], $icon);
+                $data2[] = array($program, $output[0], $icon);
             }
             echo Display::tag('h3', get_lang('ProgramsNeededToConvertFiles'));
             $table = new SortableTableFromArray($data2);
@@ -874,7 +874,7 @@ 
     if ($action != 'add') {
         echo '<div class="actions" style="margin-left: 1px;">';
         echo '<a href="settings.php?category=Templates&action=add">'.
-                Display::return_icon('new_template.png', get_lang('AddTemplate'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_template.png', get_lang('AddTemplate'), '', ICON_SIZE_MEDIUM).'</a>';
         echo '</div>';
     }
 
@@ -993,8 +993,8 @@ 
  * @since Dokeos 1.8.6
  */
 function actions_filter($id) {
-    $return = '<a href="settings.php?category=Templates&action=edit&id='.Security::remove_XSS($id).'">'.Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
-    $return .= '<a href="settings.php?category=Templates&action=delete&id='.Security::remove_XSS($id).'" onClick="javascript:if(!confirm('."'".get_lang('ConfirmYourChoice')."'".')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
+    $return = '<a href="settings.php?category=Templates&action=edit&id='.Security::remove_XSS($id).'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
+    $return .= '<a href="settings.php?category=Templates&action=delete&id='.Security::remove_XSS($id).'" onClick="javascript:if(!confirm('."'".get_lang('ConfirmYourChoice')."'".')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
     return $return;
 }
 
@@ -1044,7 +1044,7 @@ 
     $form->addElement('html_editor', 'template_text', get_lang('Text'), null, array('ToolbarSet' => 'AdminTemplates', 'Width' => '100%', 'Height' => '400'));
 
     // Setting the form elements: the form to upload an image to be used with the template.
-    $form->addElement('file','template_image',get_lang('Image'),'');
+    $form->addElement('file', 'template_image', get_lang('Image'), '');
 
     // Setting the form elements: a little bit information about the template image.
     $form->addElement('static', 'file_comment', '', get_lang('TemplateImageComment100x70'));
@@ -1122,7 +1122,7 @@ 
             // Store the information in the database (as insert or as update).
             $table_system_template = Database :: get_main_table('system_template');
             if ($_GET['action'] == 'add') {
-                $content_template =  Security::remove_XSS($values['template_text'], COURSEMANAGERLOWSECURITY);
+                $content_template = Security::remove_XSS($values['template_text'], COURSEMANAGERLOWSECURITY);
                 $params = [
                     'title' =>  $values['title'],
                     'content' => $content_template,
@@ -1132,7 +1132,7 @@ 
 
                 // Display a feedback message.
                 Display::display_confirmation_message(get_lang('TemplateAdded'));
-                echo '<a href="settings.php?category=Templates&action=add">'.Display::return_icon('new_template.png', get_lang('AddTemplate'),'',ICON_SIZE_MEDIUM).'</a>';
+                echo '<a href="settings.php?category=Templates&action=add">'.Display::return_icon('new_template.png', get_lang('AddTemplate'), '', ICON_SIZE_MEDIUM).'</a>';
             } else {
                 $content_template = '<head>{CSS}<style type="text/css">.text{font-weight: normal;}</style></head><body>'.Database::escape_string($values['template_text']).'</body>';
                 $sql = "UPDATE $table_system_template set title = '".Database::escape_string($values['title'])."', content = '".$content_template."'";
@@ -1150,7 +1150,7 @@ 
         display_templates();
     } else {
         $token = Security::get_token();
-        $form->addElement('hidden','sec_token');
+        $form->addElement('hidden', 'sec_token');
         $form->setConstants(array('sec_token' => $token));
         // Display the form.
         $form->display();
@@ -1250,7 +1250,7 @@ 
 
     $form = new FormValidator('settings', 'post', 'settings.php?category='.Security::remove_XSS($_GET['category']));
 
-    $form->addElement('hidden', 'search_field', (!empty($_GET['search_field'])?Security::remove_XSS($_GET['search_field']):null));
+    $form->addElement('hidden', 'search_field', (!empty($_GET['search_field']) ? Security::remove_XSS($_GET['search_field']) : null));
 
     $url_id = api_get_current_access_url_id();
 
@@ -1317,9 +1317,9 @@ 
                 if (empty($row['category']))
                     $row['category'] = 0;
 
-                if (is_array($settings_by_access_list[ $row['variable'] ] [ $row['subkey'] ] [ $row['category'] ])) {
+                if (is_array($settings_by_access_list[$row['variable']] [$row['subkey']] [$row['category']])) {
                     // We are sure that the other site have a selected value.
-                    if ($settings_by_access_list[ $row['variable'] ] [ $row['subkey'] ] [ $row['category'] ]['selected_value'] != '')
+                    if ($settings_by_access_list[$row['variable']] [$row['subkey']] [$row['category']]['selected_value'] != '')
                         $row['selected_value'] = $settings_by_access_list[$row['variable']] [$row['subkey']] [$row['category']]['selected_value'];
                 }
                 // There is no else{} statement because we load the default $row['selected_value'] of the main Chamilo site.
@@ -1340,7 +1340,7 @@ 
                         array('maxlength' => '8')
                     );
                     $form->applyFilter($row['variable'], 'html_filter');
-                    $default_values[$row['variable']] = round($row['selected_value']/1024/1024, 1);
+                    $default_values[$row['variable']] = round($row['selected_value'] / 1024 / 1024, 1);
                 } elseif ($row['variable'] == 'account_valid_duration') {
                     $form->addElement(
                         'text',
@@ -1368,7 +1368,7 @@ 
                         ),
                         $hideme
                     );
-                    $form->applyFilter($row['variable'],'html_filter');
+                    $form->applyFilter($row['variable'], 'html_filter');
                     $default_values[$row['variable']] = $row['selected_value'];
                 }
                 break;
@@ -1379,7 +1379,7 @@ 
                     if (file_exists($file)) {
                         $value = file_get_contents($file);
                     }
-                    $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])) , array('rows'=>'10'), $hideme);
+                    $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])), array('rows'=>'10'), $hideme);
                     $default_values[$row['variable']] = $value;
                 } elseif ($row['variable'] == 'footer_extra_content') {
                     $file = api_get_path(SYS_PATH).api_get_home_path().'footer_extra_content.txt';
@@ -1387,16 +1387,16 @@ 
                     if (file_exists($file)) {
                         $value = file_get_contents($file);
                     }
-                    $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])) , array('rows'=>'10'), $hideme);
+                    $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])), array('rows'=>'10'), $hideme);
                     $default_values[$row['variable']] = $value;
                 } else {
-                    $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])) , array('rows'=>'10'), $hideme);
+                    $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])), array('rows'=>'10'), $hideme);
                     $default_values[$row['variable']] = $row['selected_value'];
                 }
                 break;
             case 'radio':
                 $values = api_get_settings_options($row['variable']);
-                $group = array ();
+                $group = array();
                 if (is_array($values)) {
                     foreach ($values as $key => $value) {
                         $element = &$form->createElement(
@@ -1427,7 +1427,7 @@ 
                         WHERE variable='".$row['variable']."' AND access_url =  1";
 
                 $result = Database::query($sql);
-                $group = array ();
+                $group = array();
                 while ($rowkeys = Database::fetch_array($result)) {
                     // Profile tab option should be hidden when the social tool is enabled.
                     if (api_get_setting('allow_social_tool') == 'true') {
@@ -1499,10 +1499,10 @@ 
 
         switch ($row['variable']) {
             case 'pdf_export_watermark_enable':
-                $url =  PDF::get_watermark(null);
+                $url = PDF::get_watermark(null);
 
                 if ($url != false) {
-                    $delete_url = '<a href="?delete_watermark">'.get_lang('DelImage').' '.Display::return_icon('delete.png',get_lang('DelImage')).'</a>';
+                    $delete_url = '<a href="?delete_watermark">'.get_lang('DelImage').' '.Display::return_icon('delete.png', get_lang('DelImage')).'</a>';
                     $form->addElement('html', '<div style="max-height:100px; max-width:100px; margin-left:162px; margin-bottom:10px; clear:both;"><img src="'.$url.'" style="margin-bottom:10px;" />'.$delete_url.'</div>');
                 }
 

main/admin/index.php

Indentation +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * Index page of the admin tools
- * @package chamilo.admin
- */
+             * Index page of the admin tools
+             * @package chamilo.admin
+             */
 // Resetting the course id.
 $cidReset = true;