chamilo / chamilo-lms

main/admin/ldap_import_students.php

Spacing +17 added lines, -17 removed lines

@@ -9,7 +9,7 @@ 
  * Code
  */
 // resetting the course id
-$cidReset=true;
+$cidReset = true;
 require_once('../inc/global.inc.php');
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
@@ -18,11 +18,11 @@ 
 api_protect_admin_script();
 require('../auth/ldap/authldap.php');
 
-$annee_base=date('Y');
+$annee_base = date('Y');
 
 $tool_name = get_lang('LDAPImport');
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 
 $htmlHeadXtra[] = '<script language="JavaScript" type="text/javascript">
 var buttoncheck = 1;
@@ -48,7 +48,7 @@ 
 
 $annee = $_GET['annee'];
 $composante = $_GET['composante'];
-$etape =  $_GET['etape'];
+$etape = $_GET['etape'];
 $course = $_POST['course'];
 
 
@@ -198,7 +198,7 @@ 
 	echo '</div>';
 }
 */
-elseif(!empty($annee) && empty($course))
+elseif (!empty($annee) && empty($course))
 {
 	Display::display_header($tool_name);
 	echo '<div style="align:center">';
@@ -206,7 +206,7 @@ 
 	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)
+	foreach ($courses as $row)
 	{
 		echo '<option value="'.$row['code'].'">'.api_htmlentities($row['title']).'</option>';
 	}
@@ -239,7 +239,7 @@ 
 
 		$info = ldap_get_entries($ds, $sr);
 
-		for ($key = 0; $key < $info["count"]; $key ++) {
+		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];
@@ -259,7 +259,7 @@ 
 		asort($nom_form);
 		reset($nom_form);
 
-		$statut=5;
+		$statut = 5;
 		include ('ldap_form_add_users_group.php');
 	} else {
 		echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
@@ -270,25 +270,25 @@ 
     echo '</div>';
 
 }
-elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
+elseif (!empty($annee) && !empty($course) && ($_POST['confirmed'] == 'yes'))
 {
-	$id=$_POST['username_form'];
-	$UserList=array();
+	$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'])))
+		if (is_array($_POST['checkboxes']) && in_array($form_index, array_values($_POST['checkboxes'])))
 		{
 			$tmp = ldap_add_user($user_id);
-			$UserList[]= $tmp;
+			$UserList[] = $tmp;
 			$userid_match_login[$tmp] = $user_id;
 		}
 	}
 	if (!empty($_POST['course']))
 	{
-		foreach($UserList as $user_id)
+		foreach ($UserList as $user_id)
 		{
-			CourseManager::add_user_to_course($user_id,$_POST['course']);
+			CourseManager::add_user_to_course($user_id, $_POST['course']);
 		}
 		header('Location: course_information.php?code='.Security::remove_XSS($_POST['course']));
 	}
@@ -314,8 +314,8 @@ 
 	else
 	{
 		Display::display_header($tool_name);
-		$message=get_lang('NoUserAdded');
-		Display :: display_normal_message($message,false);
+		$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>';

Braces +1 added lines, -2 removed lines

@@ -269,8 +269,7 @@
     echo '<br /><br />';
     echo '</div>';
 
-}
-elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
+} elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
 {
 	$id=$_POST['username_form'];
 	$UserList=array();

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/access_url_add_usergroup_to_url.php

Indentation +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
                   <?php
                     echo Display::get_alphabet_options($firstLetterUserGroup);
                     echo Display::get_numeric_options(0, 9, $firstLetterUserGroup);
-                  ?>
+                    ?>
             </select>
         </td>
         <td width="20%">&nbsp;</td>

Spacing +4 added lines, -4 removed lines

@@ -30,8 +30,8 @@ 
 $tbl_course = Database:: get_main_table(TABLE_MAIN_COURSE);
 
 $tool_name = get_lang('AddUserGroupToURL');
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
 
 Display::display_header($tool_name);
 
@@ -46,8 +46,8 @@ 
 
 if (isset($_POST['form_sent']) && $_POST['form_sent']) {
     $form_sent = $_POST['form_sent'];
-    $userGroups = is_array($_POST['user_group_list']) ? $_POST['user_group_list'] : array() ;
-    $urlList = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
+    $userGroups = is_array($_POST['user_group_list']) ? $_POST['user_group_list'] : array();
+    $urlList = is_array($_POST['url_list']) ? $_POST['url_list'] : array();
     $firstLetterUserGroup = $_POST['first_letter_user_group'];
 
     if ($form_sent == 1) {

Braces +8 added lines, -2 removed lines

@@ -99,7 +99,10 @@ 
         <td width="40%" align="center">
         <select name="user_group_list[]" multiple="multiple" size="20" style="width:400px;">
 		<?php foreach ($dbUserGroups as $item) { ?>
-			<option value="<?php echo $item['id']; ?>" <?php if (in_array($item['id'], $courses)) echo 'selected="selected"'; ?>><?php echo $item['name']; ?>
+			<option value="<?php echo $item['id']; ?>" <?php if (in_array($item['id'], $courses)) {
+    echo 'selected="selected"';
+}
+?>><?php echo $item['name']; ?>
             </option>
         <?php } ?>
     </select>
@@ -110,7 +113,10 @@ 
    <td width="40%" align="center">
     <select name="url_list[]" multiple="multiple" size="20" style="width:300px;">
 		<?php foreach ($db_urls as $url_obj) { ?>
-        <option value="<?php echo $url_obj['id']; ?>" <?php if (in_array($url_obj['id'], $url_list)) echo 'selected="selected"'; ?>><?php echo $url_obj['url']; ?>
+        <option value="<?php echo $url_obj['id']; ?>" <?php if (in_array($url_obj['id'], $url_list)) {
+    echo 'selected="selected"';
+}
+?>><?php echo $url_obj['url']; ?>
         </option>
 		<?php } ?>
     </select>

main/admin/legal_add.php

Indentation +104 added lines, -104 removed lines

@@ -18,93 +18,93 @@ 
 
 $defaults = array();
 $term_preview = array(
-	'type' => 0,
-	'content' => '',
-	'changes' => '',
+    'type' => 0,
+    'content' => '',
+    'changes' => '',
 );
 if ($form->validate()) {
-	$check = Security::check_token('post');
-	if ($check) {
-		$values  = $form->getSubmitValues();
-		$lang 	 = $values['language'];
-		//language id
-		$lang = api_get_language_id($lang);
-
-		if (isset($values['type'])) {
-			$type 	 = $values['type'];
-		} else {
-			$type = 0;
-		}
-		if (isset($values['content'])) {
-			$content = $values['content'];
-		} else {
-			$content = '';
-		}
-		if (isset($values['changes'])) {
-			$changes = $values['changes'];
-		} else {
-			$changes = '';
-		}
-		$navigator_info = api_get_navigator();
-
-		if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
-			if (isset($values['preview'])) {
-				$submit	='preview';
-			} elseif (isset($values['save'])) {
-				$submit	='save';
-			} elseif (isset($values['back'])) {
-				$submit	='back';
-			}
-		} else {
-			$submit  = $values['send'];
-		}
-
-		$default['content'] = $content;
-		if (isset($values['language'])) {
-			if ($submit == 'back') {
-				header('Location: legal_add.php');
-				exit;
-			} elseif ($submit == 'save') {
-				$insert_result = LegalManager::add($lang, $content, $type, $changes);
-				if ($insert_result ) {
-					$message = get_lang('TermAndConditionSaved');
-				} else {
-					$message = get_lang('TermAndConditionNotSaved');
-				}
-				Security::clear_token();
-				$tok = Security::get_token();
-				header('Location: legal_list.php?action=show_message&message='.urlencode($message).'&sec_token='.$tok);
-				exit();
-			} elseif ($submit=='preview') {
-				$defaults['type'] = $type;
-				$defaults['content'] = $content;
-				$defaults['changes'] = $changes;
-				$term_preview = $defaults;
-				$term_preview['type'] = intval($_POST['type']);
-			} else {
-				$my_lang = $_POST['language'];
-				if (isset($_POST['language'])){
-					$all_langs = api_get_languages();
-					if (in_array($my_lang, $all_langs['folder'])){
-						$language = api_get_language_id($my_lang);
-						$term_preview = LegalManager::get_last_condition($language);
-						$defaults = $term_preview;
-						if (!$term_preview) {
-							// there are not terms and conditions
-							$term_preview['type']=-1;
-							$defaults['type']=0;
-						}
-					}
-				}
-			}
-		}
-	}
+    $check = Security::check_token('post');
+    if ($check) {
+        $values  = $form->getSubmitValues();
+        $lang 	 = $values['language'];
+        //language id
+        $lang = api_get_language_id($lang);
+
+        if (isset($values['type'])) {
+            $type 	 = $values['type'];
+        } else {
+            $type = 0;
+        }
+        if (isset($values['content'])) {
+            $content = $values['content'];
+        } else {
+            $content = '';
+        }
+        if (isset($values['changes'])) {
+            $changes = $values['changes'];
+        } else {
+            $changes = '';
+        }
+        $navigator_info = api_get_navigator();
+
+        if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
+            if (isset($values['preview'])) {
+                $submit	='preview';
+            } elseif (isset($values['save'])) {
+                $submit	='save';
+            } elseif (isset($values['back'])) {
+                $submit	='back';
+            }
+        } else {
+            $submit  = $values['send'];
+        }
+
+        $default['content'] = $content;
+        if (isset($values['language'])) {
+            if ($submit == 'back') {
+                header('Location: legal_add.php');
+                exit;
+            } elseif ($submit == 'save') {
+                $insert_result = LegalManager::add($lang, $content, $type, $changes);
+                if ($insert_result ) {
+                    $message = get_lang('TermAndConditionSaved');
+                } else {
+                    $message = get_lang('TermAndConditionNotSaved');
+                }
+                Security::clear_token();
+                $tok = Security::get_token();
+                header('Location: legal_list.php?action=show_message&message='.urlencode($message).'&sec_token='.$tok);
+                exit();
+            } elseif ($submit=='preview') {
+                $defaults['type'] = $type;
+                $defaults['content'] = $content;
+                $defaults['changes'] = $changes;
+                $term_preview = $defaults;
+                $term_preview['type'] = intval($_POST['type']);
+            } else {
+                $my_lang = $_POST['language'];
+                if (isset($_POST['language'])){
+                    $all_langs = api_get_languages();
+                    if (in_array($my_lang, $all_langs['folder'])){
+                        $language = api_get_language_id($my_lang);
+                        $term_preview = LegalManager::get_last_condition($language);
+                        $defaults = $term_preview;
+                        if (!$term_preview) {
+                            // there are not terms and conditions
+                            $term_preview['type']=-1;
+                            $defaults['type']=0;
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
 
 $form->setDefaults($defaults);
 
 if (isset($_POST['send'])) {
-	Security::clear_token();
+    Security::clear_token();
 }
 $token = Security::get_token();
 
@@ -115,34 +115,34 @@ 
 
 if (isset($_POST['language'])) {
 
-	$form->addElement('static', Security::remove_XSS($_POST['language']));
-	$form->addElement('hidden', 'language',Security::remove_XSS($_POST['language']));
-	$form->addHtmlEditor('content', get_lang('Content'), true, false, array('ToolbarSet' => 'terms_and_conditions', 'Width' => '100%', 'Height' => '250'));
+    $form->addElement('static', Security::remove_XSS($_POST['language']));
+    $form->addElement('hidden', 'language',Security::remove_XSS($_POST['language']));
+    $form->addHtmlEditor('content', get_lang('Content'), true, false, array('ToolbarSet' => 'terms_and_conditions', 'Width' => '100%', 'Height' => '250'));
 
-	$form->addElement('radio', 'type', '', get_lang('HTMLText') ,'0');
-	$form->addElement('radio', 'type', '', get_lang('PageLink') ,'1');
-	$form->addElement('textarea', 'changes', get_lang('ExplainChanges'),array('width'=>'20'));
+    $form->addElement('radio', 'type', '', get_lang('HTMLText') ,'0');
+    $form->addElement('radio', 'type', '', get_lang('PageLink') ,'1');
+    $form->addElement('textarea', 'changes', get_lang('ExplainChanges'),array('width'=>'20'));
 
-	$preview = LegalManager::show_last_condition($term_preview);
+    $preview = LegalManager::show_last_condition($term_preview);
 
-	if ($term_preview['type']!=-1) {
-		$form->addElement('label', get_lang('Preview'),  $preview);
-	}
+    if ($term_preview['type']!=-1) {
+        $form->addElement('label', get_lang('Preview'),  $preview);
+    }
 
-	// Submit & preview button
+    // Submit & preview button
     $navigator_info = api_get_navigator();
 
     //ie6 fix
-	if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
-		$buttons = '<div class="row" align="center">
+    if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
+        $buttons = '<div class="row" align="center">
 				<div class="formw">
 				<input type="submit" name="back"  value="'.get_lang('Back').'"/>
 				<input type="submit" name="preview"  value="'.get_lang('Preview').'"/>
 				<input type="submit" name="save"  value="'.get_lang('Save').'"/>
 				</div>
 			</div>';
-			$form->addElement('html',$buttons);
-	} else {
+            $form->addElement('html',$buttons);
+    } else {
         $buttons = '<div class="row" align="center">
 					<div class="formw">
 					<button type="submit" class="back" 	 name="send" value="back">'.get_lang('Back').'</button>
@@ -150,11 +150,11 @@ 
 					<button type="submit" class="save" 	 name="send" value="save">'.get_lang('Save').'</button>
 					</div>
 				</div>';
-		$form->addElement('html',$buttons);
-	}
+        $form->addElement('html',$buttons);
+    }
 } else {
-	$form->addElement('select_language', 'language', get_lang('Language'),null,array());
-	$form->addElement('button', 'send', get_lang('Load'));
+    $form->addElement('select_language', 'language', get_lang('Language'),null,array());
+    $form->addElement('button', 'send', get_lang('Load'));
 
 }
 
@@ -176,11 +176,11 @@ 
 echo '</div>';
 
 if (isset ($_GET['action'])) {
-	switch ($_GET['action']) {
-		case 'show_message' :
-			Display :: display_normal_message(stripslashes($_GET['message']));
-			break;
-	}
+    switch ($_GET['action']) {
+        case 'show_message' :
+            Display :: display_normal_message(stripslashes($_GET['message']));
+            break;
+    }
 }
 
 $form->setDefaults($defaults);

Spacing +26 added lines, -26 removed lines

@@ -25,13 +25,13 @@ 
 if ($form->validate()) {
 	$check = Security::check_token('post');
 	if ($check) {
-		$values  = $form->getSubmitValues();
-		$lang 	 = $values['language'];
+		$values = $form->getSubmitValues();
+		$lang = $values['language'];
 		//language id
 		$lang = api_get_language_id($lang);
 
 		if (isset($values['type'])) {
-			$type 	 = $values['type'];
+			$type = $values['type'];
 		} else {
 			$type = 0;
 		}
@@ -47,13 +47,13 @@ 
 		}
 		$navigator_info = api_get_navigator();
 
-		if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
+		if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') {
 			if (isset($values['preview'])) {
-				$submit	='preview';
+				$submit	= 'preview';
 			} elseif (isset($values['save'])) {
-				$submit	='save';
+				$submit	= 'save';
 			} elseif (isset($values['back'])) {
-				$submit	='back';
+				$submit	= 'back';
 			}
 		} else {
 			$submit  = $values['send'];
@@ -66,7 +66,7 @@ 
 				exit;
 			} elseif ($submit == 'save') {
 				$insert_result = LegalManager::add($lang, $content, $type, $changes);
-				if ($insert_result ) {
+				if ($insert_result) {
 					$message = get_lang('TermAndConditionSaved');
 				} else {
 					$message = get_lang('TermAndConditionNotSaved');
@@ -75,7 +75,7 @@ 
 				$tok = Security::get_token();
 				header('Location: legal_list.php?action=show_message&message='.urlencode($message).'&sec_token='.$tok);
 				exit();
-			} elseif ($submit=='preview') {
+			} elseif ($submit == 'preview') {
 				$defaults['type'] = $type;
 				$defaults['content'] = $content;
 				$defaults['changes'] = $changes;
@@ -83,16 +83,16 @@ 
 				$term_preview['type'] = intval($_POST['type']);
 			} else {
 				$my_lang = $_POST['language'];
-				if (isset($_POST['language'])){
+				if (isset($_POST['language'])) {
 					$all_langs = api_get_languages();
-					if (in_array($my_lang, $all_langs['folder'])){
+					if (in_array($my_lang, $all_langs['folder'])) {
 						$language = api_get_language_id($my_lang);
 						$term_preview = LegalManager::get_last_condition($language);
 						$defaults = $term_preview;
 						if (!$term_preview) {
 							// there are not terms and conditions
-							$term_preview['type']=-1;
-							$defaults['type']=0;
+							$term_preview['type'] = -1;
+							$defaults['type'] = 0;
 						}
 					}
 				}
@@ -108,7 +108,7 @@ 
 }
 $token = Security::get_token();
 
-$form->addElement('hidden','sec_token');
+$form->addElement('hidden', 'sec_token');
 //$form->setConstants(array('sec_token' => $token));
 $defaults['sec_token'] = $token;
 $form->addElement('header', get_lang('DisplayTermsConditions'));
@@ -116,24 +116,24 @@ 
 if (isset($_POST['language'])) {
 
 	$form->addElement('static', Security::remove_XSS($_POST['language']));
-	$form->addElement('hidden', 'language',Security::remove_XSS($_POST['language']));
+	$form->addElement('hidden', 'language', Security::remove_XSS($_POST['language']));
 	$form->addHtmlEditor('content', get_lang('Content'), true, false, array('ToolbarSet' => 'terms_and_conditions', 'Width' => '100%', 'Height' => '250'));
 
-	$form->addElement('radio', 'type', '', get_lang('HTMLText') ,'0');
-	$form->addElement('radio', 'type', '', get_lang('PageLink') ,'1');
-	$form->addElement('textarea', 'changes', get_lang('ExplainChanges'),array('width'=>'20'));
+	$form->addElement('radio', 'type', '', get_lang('HTMLText'), '0');
+	$form->addElement('radio', 'type', '', get_lang('PageLink'), '1');
+	$form->addElement('textarea', 'changes', get_lang('ExplainChanges'), array('width'=>'20'));
 
 	$preview = LegalManager::show_last_condition($term_preview);
 
-	if ($term_preview['type']!=-1) {
-		$form->addElement('label', get_lang('Preview'),  $preview);
+	if ($term_preview['type'] != -1) {
+		$form->addElement('label', get_lang('Preview'), $preview);
 	}
 
 	// Submit & preview button
     $navigator_info = api_get_navigator();
 
     //ie6 fix
-	if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
+	if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') {
 		$buttons = '<div class="row" align="center">
 				<div class="formw">
 				<input type="submit" name="back"  value="'.get_lang('Back').'"/>
@@ -141,7 +141,7 @@ 
 				<input type="submit" name="save"  value="'.get_lang('Save').'"/>
 				</div>
 			</div>';
-			$form->addElement('html',$buttons);
+			$form->addElement('html', $buttons);
 	} else {
         $buttons = '<div class="row" align="center">
 					<div class="formw">
@@ -150,16 +150,16 @@ 
 					<button type="submit" class="save" 	 name="send" value="save">'.get_lang('Save').'</button>
 					</div>
 				</div>';
-		$form->addElement('html',$buttons);
+		$form->addElement('html', $buttons);
 	}
 } else {
-	$form->addElement('select_language', 'language', get_lang('Language'),null,array());
+	$form->addElement('select_language', 'language', get_lang('Language'), null, array());
 	$form->addElement('button', 'send', get_lang('Load'));
 
 }
 
 $tool_name = get_lang('AddTermsAndConditions');
-$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
 Display :: display_header($tool_name);
 
 echo '<script>
@@ -172,7 +172,7 @@ 
 
 // action menu
 echo '<div class="actions">';
-echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/legal_list.php">'.Display::return_icon('search.gif',get_lang('EditTermsAndConditions'),'').get_lang('AllVersions').'</a>';
+echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/legal_list.php">'.Display::return_icon('search.gif', get_lang('EditTermsAndConditions'), '').get_lang('AllVersions').'</a>';
 echo '</div>';
 
 if (isset ($_GET['action'])) {

main/admin/configure_plugin.php

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
 $message = null;
 $content = null;
 
-$currentUrl = api_get_self() . "?name=$pluginName";
+$currentUrl = api_get_self()."?name=$pluginName";
 
 if (isset($pluginInfo['settings_form'])) {
     $form = $pluginInfo['settings_form'];
@@ -64,7 +64,7 @@ 
 
         foreach ($values as $key => $value) {
             api_add_setting(
-                $value, Database::escape_string($pluginName . '_' . $key),
+                $value, Database::escape_string($pluginName.'_'.$key),
                 $pluginName,
                 'setting',
                 'Plugins',
@@ -99,11 +99,11 @@ 
 }
 
 $interbreadcrumb[] = array(
-    'url' => api_get_path(WEB_CODE_PATH) . 'admin/index.php',
+    'url' => api_get_path(WEB_CODE_PATH).'admin/index.php',
     'name' => get_lang('PlatformAdmin')
 );
 $interbreadcrumb[] = array(
-    'url' => api_get_path(WEB_CODE_PATH) . 'admin/settings.php?category=Plugins',
+    'url' => api_get_path(WEB_CODE_PATH).'admin/settings.php?category=Plugins',
     'name' => get_lang('Plugins')
 );
 

main/admin/course_request_rejected.php

Spacing +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
     $from = intval($from);
     $number_of_items = intval($number_of_items);
     $column = intval($column);
-    $direction = !in_array(strtolower(trim($direction)), ['asc','desc']) ? 'asc' : $direction;
+    $direction = !in_array(strtolower(trim($direction)), ['asc', 'desc']) ? 'asc' : $direction;
 
     $sql = "SELECT
                 id AS col0,

main/admin/sub_language_ajax.inc.php

Spacing +7 added lines, -7 removed lines

@@ -9,9 +9,9 @@ 
 
 api_protect_admin_script();
 
-$new_language        = Security::remove_XSS($_REQUEST['new_language']);
-$language_variable    = Security::remove_XSS($_REQUEST['variable_language']);
-$file_id            = intval($_REQUEST['file_id']);
+$new_language = Security::remove_XSS($_REQUEST['new_language']);
+$language_variable = Security::remove_XSS($_REQUEST['variable_language']);
+$file_id = intval($_REQUEST['file_id']);
 /**
  * Code
  */
@@ -27,10 +27,10 @@ 
 
     //update variable language
     // Replace double quotes to avoid parse errors
-    $new_language = str_replace('"', '\"',$new_language);
+    $new_language = str_replace('"', '\"', $new_language);
     // Replace new line signs to avoid parse errors - see #6773
-    $new_language = str_replace("\n","\\n",$new_language);
-    $all_file_of_directory[$language_variable]="\"".$new_language."\";";
+    $new_language = str_replace("\n", "\\n", $new_language);
+    $all_file_of_directory[$language_variable] = "\"".$new_language."\";";
     $result_array = array();
 
     foreach ($all_file_of_directory as $key_value=>$value_info) {
@@ -40,7 +40,7 @@ 
     if (!empty($result_array)) {
         foreach ($result_array as $key => $result) {
             if ($result == false) {
-                $variables_with_problems .=$key.' <br />';
+                $variables_with_problems .= $key.' <br />';
             }
         }
     }

main/admin/subscribe_class2course.php

Indentation +4 added lines, -4 removed lines

@@ -90,8 +90,8 @@ 
     <select name="firstLetterClass" onchange="javascript:document.formulaire.formSent.value='2'; document.formulaire.submit();">
      <option value="">--</option>
      <?php
-     echo Display::get_alphabet_options($first_letter_class);
-     ?>
+        echo Display::get_alphabet_options($first_letter_class);
+        ?>
     </select>
    </td>
    <td width="20%">&nbsp;</td>
@@ -102,8 +102,8 @@ 
     <select name="firstLetterCourse" onchange="javascript:document.formulaire.formSent.value='2'; document.formulaire.submit();">
      <option value="">--</option>
      <?php
-     echo Display::get_alphabet_options($first_letter_course);
-     ?>
+        echo Display::get_alphabet_options($first_letter_course);
+        ?>
     </select>
    </td>
   </tr>

Spacing +7 added lines, -7 removed lines

@@ -9,7 +9,7 @@ 
 $cidReset = true;
 
 require_once '../inc/global.inc.php';
-$this_section=SECTION_PLATFORM_ADMIN;
+$this_section = SECTION_PLATFORM_ADMIN;
 
 api_protect_admin_script();
 
@@ -18,7 +18,7 @@ 
 $error_message = '';
 $first_letter_class = '';
 $first_letter_course = '';
-$courses = array ();
+$courses = array();
 $classes = array();
 
 $tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE);
@@ -26,7 +26,7 @@ 
 
 $tool_name = get_lang('AddClassesToACourse');
 
-$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
 
 Display :: display_header($tool_name);
 
@@ -68,10 +68,10 @@ 
     }
 }
 
-$sql = "SELECT id,name FROM $tbl_class WHERE name LIKE '".$first_letter_class."%' ORDER BY ". (count($classes) > 0 ? "(id IN('".implode("','", $classes)."')) DESC," : "")." name";
+$sql = "SELECT id,name FROM $tbl_class WHERE name LIKE '".$first_letter_class."%' ORDER BY ".(count($classes) > 0 ? "(id IN('".implode("','", $classes)."')) DESC," : "")." name";
 $result = Database::query($sql);
 $db_classes = Database::store_result($result);
-$sql = "SELECT code,visual_code,title FROM $tbl_course WHERE visual_code LIKE '".$first_letter_course."%' ORDER BY ". (count($courses) > 0 ? "(code IN('".implode("','", $courses)."')) DESC," : "")." visual_code";
+$sql = "SELECT code,visual_code,title FROM $tbl_course WHERE visual_code LIKE '".$first_letter_course."%' ORDER BY ".(count($courses) > 0 ? "(code IN('".implode("','", $courses)."')) DESC," : "")." visual_code";
 $result = Database::query($sql);
 $db_courses = Database::store_result($result);
 if (!empty ($error_message))
@@ -114,7 +114,7 @@ 
 foreach ($db_classes as $class)
 {
 ?>
-    <option value="<?php echo $class['id']; ?>" <?php if(in_array($class['id'],$classes)) echo 'selected="selected"'; ?>><?php echo $class['name']; ?></option>
+    <option value="<?php echo $class['id']; ?>" <?php if (in_array($class['id'], $classes)) echo 'selected="selected"'; ?>><?php echo $class['name']; ?></option>
 <?php
 }
 ?>
@@ -131,7 +131,7 @@ 
 foreach ($db_courses as $course)
 {
 ?>
-    <option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) echo 'selected="selected"'; ?>><?php echo '('.$course['visual_code'].') '.$course['title']; ?></option>
+    <option value="<?php echo $course['code']; ?>" <?php if (in_array($course['code'], $courses)) echo 'selected="selected"'; ?>><?php echo '('.$course['visual_code'].') '.$course['title']; ?></option>
 <?php
 }
 ?>

Braces +11 added lines, -4 removed lines

@@ -46,14 +46,15 @@ 
         if (count($classes) == 0 || count($courses) == 0)
         {
             Display::display_error_message(get_lang('AtLeastOneClassAndOneCourse'));
-        }
-        elseif (api_substr($_POST['formSubmit'], -2) == '>>') // add classes to courses
+        } elseif (api_substr($_POST['formSubmit'], -2) == '>>') {
+            // add classes to courses
         {
             foreach ($courses as $course_code)
             {
                 foreach ($classes as $class_id)
                 {
                     ClassManager :: subscribe_to_course($class_id, $course_code);
+        }
                 }
             }
             Display::display_normal_message(get_lang('ClassesSubscribed'));
@@ -114,7 +115,10 @@ 
 foreach ($db_classes as $class)
 {
 ?>
-    <option value="<?php echo $class['id']; ?>" <?php if(in_array($class['id'],$classes)) echo 'selected="selected"'; ?>><?php echo $class['name']; ?></option>
+    <option value="<?php echo $class['id']; ?>" <?php if(in_array($class['id'],$classes)) {
+    echo 'selected="selected"';
+}
+?>><?php echo $class['name']; ?></option>
 <?php
 }
 ?>
@@ -131,7 +135,10 @@ 
 foreach ($db_courses as $course)
 {
 ?>
-    <option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) echo 'selected="selected"'; ?>><?php echo '('.$course['visual_code'].') '.$course['title']; ?></option>
+    <option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) {
+    echo 'selected="selected"';
+}
+?>><?php echo '('.$course['visual_code'].') '.$course['title']; ?></option>
 <?php
 }
 ?>

main/admin/event_controller.php

Spacing +6 added lines, -6 removed lines

@@ -67,12 +67,12 @@ 
 
 //Column config
 $column_model   = array(
-                        array('name'=>'subject',        'index'=>'subject',        'width'=>'80',   'align'=>'left'),
+                        array('name'=>'subject', 'index'=>'subject', 'width'=>'80', 'align'=>'left'),
 //                        array('name'=>'message',        'index'=>'message', 'width'=>'500',  'align'=>'left','sortable'=>'false'),
-                        array('name'=>'event_type_name',        'index'=>'event_type_name',        'width'=>'80',   'align'=>'left'),
-                        array('name'=>'language_id',        'index'=>'language_id',        'width'=>'80',   'align'=>'left'),
-                        array('name'=>'activated',        'index'=>'activated',        'width'=>'80',   'align'=>'left'),
-                        array('name'=>'actions',        'index'=>'actions',     'width'=>'100')
+                        array('name'=>'event_type_name', 'index'=>'event_type_name', 'width'=>'80', 'align'=>'left'),
+                        array('name'=>'language_id', 'index'=>'language_id', 'width'=>'80', 'align'=>'left'),
+                        array('name'=>'activated', 'index'=>'activated', 'width'=>'80', 'align'=>'left'),
+                        array('name'=>'actions', 'index'=>'actions', 'width'=>'100')
                        );
 //Autowidth
 $extra_params['autowidth'] = 'true';
@@ -82,7 +82,7 @@ 
 $htmlHeadXtra[] = api_get_jqgrid_js();
 $htmlHeadXtra[] = '<script>
 $(function() {
-    '.Display::grid_js('event_email_template',  $url,$columns,$column_model,$extra_params, array(), $action_links,true).'
+    '.Display::grid_js('event_email_template', $url, $columns, $column_model, $extra_params, array(), $action_links, true).'
 });
 </script>';
 

Indentation +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     }
 
     public function deleteAction($id) {
-         $event_email_template = new EventEmailTemplate();
+            $event_email_template = new EventEmailTemplate();
         return $event_email_template->delete($id);
     }
 }
@@ -73,7 +73,7 @@ 
                         array('name'=>'language_id',        'index'=>'language_id',        'width'=>'80',   'align'=>'left'),
                         array('name'=>'activated',        'index'=>'activated',        'width'=>'80',   'align'=>'left'),
                         array('name'=>'actions',        'index'=>'actions',     'width'=>'100')
-                       );
+                        );
 //Autowidth
 $extra_params['autowidth'] = 'true';
 //height auto

main/admin/course_intro_pdf_import.php

Spacing +5 added lines, -5 removed lines

@@ -90,26 +90,26 @@
 {
     $baseDir = api_get_path(SYS_ARCHIVE_PATH);
     $uploadPath = 'pdfimport/';
-    $errors = array ();
+    $errors = array();
     if (!is_dir($baseDir.$uploadPath)) {
         @mkdir($baseDir.$uploadPath);
     }
-    if (!unzip_uploaded_file($_FILES['import_file'], $uploadPath, $baseDir, 1024*1024*1024)) {
+    if (!unzip_uploaded_file($_FILES['import_file'], $uploadPath, $baseDir, 1024 * 1024 * 1024)) {
         error_log('Could not unzip uploaded file in '.__FILE__.', line '.__LINE__);
         return $errors;
     }
     $list = scandir($baseDir.$uploadPath);
     $i = 0;
     foreach ($list as $file) {
-        if (substr($file,0,1) == '.' or !is_file($baseDir.$uploadPath.$file)) {
+        if (substr($file, 0, 1) == '.' or !is_file($baseDir.$uploadPath.$file)) {
             continue;
         }
-        $parts = preg_split('/_/',$file);
+        $parts = preg_split('/_/', $file);
         $course = api_get_course_info($parts[0]);
         if (count($course) > 0) {
             // Build file info because handle_uploaded_document() needs it (name, type, size, tmp_name)
             $fileSize = filesize($baseDir.$uploadPath.$file);
-            $docId = add_document($course, $subDir.'/'.$file, 'file', $fileSize, $parts[1].' '.substr($parts[2],0,-4));
+            $docId = add_document($course, $subDir.'/'.$file, 'file', $fileSize, $parts[1].' '.substr($parts[2], 0, -4));
             if ($docId > 0) {
                 if (!is_file($baseDir.$uploadPath.$file)) {
                     error_log($baseDir.$uploadPath.$file.' does not exists in '.__FILE__);