chamilo / chamilo-lms

main/admin/promotions.php

Indentation +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 <script>
 $(function() {
 <?php
-     echo Display::grid_js('promotions', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
+        echo Display::grid_js('promotions', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
 ?>
 });
 </script>

main/admin/access_url_add_courses_to_url.php

Indentation +1 added lines, -1 removed lines

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

main/admin/access_url_add_users_to_url.php

Indentation +30 added lines, -30 removed lines

@@ -13,8 +13,8 @@ 
 
 api_protect_global_admin_script();
 if (!api_get_multiple_access_url()) {
-	header('Location: index.php');
-	exit;
+    header('Location: index.php');
+    exit;
 }
 
 $form_sent = 0;
@@ -44,36 +44,36 @@ 
 api_display_tool_title($tool_name);
 
 if ($_POST['form_sent']) {
-	$form_sent = $_POST['form_sent'];
-	$users = is_array($_POST['user_list']) ? $_POST['user_list'] : array() ;
-	$url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
-	$first_letter_user = $_POST['first_letter_user'];
+    $form_sent = $_POST['form_sent'];
+    $users = is_array($_POST['user_list']) ? $_POST['user_list'] : array() ;
+    $url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
+    $first_letter_user = $_POST['first_letter_user'];
 
-	foreach($users as $key => $value) {
-		$users[$key] = intval($value);
-	}
+    foreach($users as $key => $value) {
+        $users[$key] = intval($value);
+    }
 
-	if ($form_sent == 1) {
-		if (count($users) == 0 || count($url_list) == 0) {
-			Display :: display_error_message(get_lang('AtLeastOneUserAndOneURL'));
-		} else {
-			UrlManager::add_users_to_urls($users,$url_list);
-			Display :: display_confirmation_message(get_lang('UsersBelongURL'));
-		}
-	}
+    if ($form_sent == 1) {
+        if (count($users) == 0 || count($url_list) == 0) {
+            Display :: display_error_message(get_lang('AtLeastOneUserAndOneURL'));
+        } else {
+            UrlManager::add_users_to_urls($users,$url_list);
+            Display :: display_confirmation_message(get_lang('UsersBelongURL'));
+        }
+    }
 }
 
 /*	Display GUI	*/
 if (empty($first_letter_user)) {
-	$sql = "SELECT count(*) as nb_users FROM $tbl_user";
-	$result = Database::query($sql);
-	$num_row = Database::fetch_array($result);
+    $sql = "SELECT count(*) as nb_users FROM $tbl_user";
+    $result = Database::query($sql);
+    $num_row = Database::fetch_array($result);
     if ($num_row['nb_users']>1000) {
         //if there are too much users to gracefully handle with the HTML select list,
         // assign a default filter on users names
         $first_letter_user = 'A';
     }
-	unset($result);
+    unset($result);
 }
 $first_letter_user_lower = Database::escape_string(api_strtolower($first_letter_user));
 
@@ -104,7 +104,7 @@ 
       <option value="">--</option>
       <?php
         echo Display :: get_alphabet_options($first_letter_user);
-      ?>
+        ?>
      </select>
     </td>
         <td width="20%">&nbsp;</td>
@@ -116,14 +116,14 @@ 
     <td width="40%" align="center">
      <select name="user_list[]" multiple="multiple" size="20" style="width:380px;">
 		<?php
-		foreach ($db_users as $user) {
-		?>
+        foreach ($db_users as $user) {
+        ?>
             <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'], $users)) echo 'selected="selected"'; ?>>
                 <?php echo api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; ?>
             </option>
 		<?php
-		}
-		?>
+        }
+        ?>
     </select>
    </td>
    <td width="20%" valign="middle" align="center">
@@ -132,14 +132,14 @@ 
    <td width="40%" align="center">
     <select name="url_list[]" multiple="multiple" size="20" style="width:230px;">
 		<?php
-		foreach ($db_urls as $url_obj) {
-			?>
+        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>
 			<?php
-		}
-		?>
+        }
+        ?>
     </select>
    </td>
   </tr>

main/admin/ldap_synchro.php

Indentation +102 added lines, -102 removed lines

@@ -44,121 +44,121 @@
 $users=Database::store_result($result);
 
 foreach($Sessions as $session){
-	$id_session = $session['id'];
-	$name_session = $session['name'];
-	$UserList=array();
-	$UserUpdate=array();
-	$UserAdd=array();
+    $id_session = $session['id'];
+    $name_session = $session['name'];
+    $UserList=array();
+    $UserUpdate=array();
+    $UserAdd=array();
 
-	// Parse des code etape de la session
-	/*
+    // Parse des code etape de la session
+    /*
 	$sql = "SELECT  id_session, code_etape, etape_description, code_ufr, annee
 		FROM $tbl_session_rel_etape
 		WHERE id_session='$id_session'
 		ORDER BY code_ufr, code_etape";
 	$result = Database::query($sql);
 	*/
-	$ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
-	ldap_set_version($ds);
-	// Import des utilisateurs des etapes dans la session
-	if ($ds)
-	{
-		$r = false;
-		$res = ldap_handle_bind($ds, $r);
-		$UserList=array();
-		if($result !== false)
-		{
-			//while($row = Database::fetch_array($result))
-			//{
-				/*
+    $ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
+    ldap_set_version($ds);
+    // Import des utilisateurs des etapes dans la session
+    if ($ds)
+    {
+        $r = false;
+        $res = ldap_handle_bind($ds, $r);
+        $UserList=array();
+        if($result !== false)
+        {
+            //while($row = Database::fetch_array($result))
+            //{
+                /*
 				$annee = $row['annee'];
 				$code_ufr = $row['code_ufr'];
 				$etape = $row['code_etape'];
 				*/
-				// LDAP Query
-				// edupersonorgunitdn=ou=12CI1,ou=2006,ou=diploma,o=Paris1,dc=univ-paris1,dc=fr
-				//etapescommented
-				//$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "edupersonorgunitdn=ou=$etape,ou=$annee,ou=diploma,$LDAPbasedn");
-				$sr = @ ldap_search($ds, $ldap_basedn, '(uid=*)');
-				$info = ldap_get_entries($ds, $sr);
-				for ($key = 0; $key < $info["count"]; $key ++)
-				{
-					echo "<pre>";
-					print_r($info[$key]);
-					echo "</pre>";
-					$lastname = api_utf8_decode($info[$key]["sn"][0]);
-					$firstname = api_utf8_decode($info[$key]["givenname"][0]);
-					$email = $info[$key]["mail"][0];
-					// Get uid from dn
-					$dn_array=ldap_explode_dn($info[$key]["dn"],1);
-					$username = $dn_array[0]; // uid is first key
-					$outab[] = $info[$key]["edupersonprimaryaffiliation"][0]; // Ici "student"
-					$val = ldap_get_values_len($ds, $sr, "userPassword");
-					$password = $val[0];
-					// Pour faciliter la gestion on ajoute le code "etape-annee"
-					$official_code=$etape."-".$annee;
-					$auth_source="ldap";
-					// Pas de date d'expiration d'etudiant (a recuperer par rapport au shadow expire LDAP)
-					$expiration_date='0000-00-00 00:00:00';
-					$active=1;
-					// Ajout de l'utilisateur
-					if (UserManager::is_username_available($username)) {
-						$user_id = UserManager::create_user($firstname,$lastname,$status,$email,$username,$password,$official_code,api_get_setting('platformLanguage'),$phone,$picture_uri,$auth_source,$expiration_date,$active);
-						$UserAdd[]=$user_id;
-					} else {
-						$user = api_get_user_info_from_username($username);
-						$user_id=$user['user_id'];
-						UserManager::update_user($user_id, $firstname, $lastname, $username, null, null, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active);
-						$UserUpdate[]=$user_id;
-					}
-					$UserList[]=$user_id;
-				}
-			//}
-		}
-		if (isset($included) && ($included))
-		{
-			$message .= "> $name_session: ".count($UserAdd)." ".get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified').'<br/>';
-		}
-		else
-		{
-			print "> $name_session: ".count($UserAdd).get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified')."\n";
-		}
+                // LDAP Query
+                // edupersonorgunitdn=ou=12CI1,ou=2006,ou=diploma,o=Paris1,dc=univ-paris1,dc=fr
+                //etapescommented
+                //$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "edupersonorgunitdn=ou=$etape,ou=$annee,ou=diploma,$LDAPbasedn");
+                $sr = @ ldap_search($ds, $ldap_basedn, '(uid=*)');
+                $info = ldap_get_entries($ds, $sr);
+                for ($key = 0; $key < $info["count"]; $key ++)
+                {
+                    echo "<pre>";
+                    print_r($info[$key]);
+                    echo "</pre>";
+                    $lastname = api_utf8_decode($info[$key]["sn"][0]);
+                    $firstname = api_utf8_decode($info[$key]["givenname"][0]);
+                    $email = $info[$key]["mail"][0];
+                    // Get uid from dn
+                    $dn_array=ldap_explode_dn($info[$key]["dn"],1);
+                    $username = $dn_array[0]; // uid is first key
+                    $outab[] = $info[$key]["edupersonprimaryaffiliation"][0]; // Ici "student"
+                    $val = ldap_get_values_len($ds, $sr, "userPassword");
+                    $password = $val[0];
+                    // Pour faciliter la gestion on ajoute le code "etape-annee"
+                    $official_code=$etape."-".$annee;
+                    $auth_source="ldap";
+                    // Pas de date d'expiration d'etudiant (a recuperer par rapport au shadow expire LDAP)
+                    $expiration_date='0000-00-00 00:00:00';
+                    $active=1;
+                    // Ajout de l'utilisateur
+                    if (UserManager::is_username_available($username)) {
+                        $user_id = UserManager::create_user($firstname,$lastname,$status,$email,$username,$password,$official_code,api_get_setting('platformLanguage'),$phone,$picture_uri,$auth_source,$expiration_date,$active);
+                        $UserAdd[]=$user_id;
+                    } else {
+                        $user = api_get_user_info_from_username($username);
+                        $user_id=$user['user_id'];
+                        UserManager::update_user($user_id, $firstname, $lastname, $username, null, null, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active);
+                        $UserUpdate[]=$user_id;
+                    }
+                    $UserList[]=$user_id;
+                }
+            //}
+        }
+        if (isset($included) && ($included))
+        {
+            $message .= "> $name_session: ".count($UserAdd)." ".get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified').'<br/>';
+        }
+        else
+        {
+            print "> $name_session: ".count($UserAdd).get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified')."\n";
+        }
 
-		// Une fois les utilisateurs importer dans la base des utilisateurs, on peux les affecter la session
-		$result=Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id='$id_session'");
-		$CourseList=array();
-		while($row=Database::fetch_array($result)) {
-			$CourseList[]= $row['c_id'];
-		}
+        // Une fois les utilisateurs importer dans la base des utilisateurs, on peux les affecter la session
+        $result=Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id='$id_session'");
+        $CourseList=array();
+        while($row=Database::fetch_array($result)) {
+            $CourseList[]= $row['c_id'];
+        }
 
-		foreach ($CourseList as $enreg_course) {
-			// On ajoute la relation entre l'utilisateur et le cours
-			foreach ($UserList as $enreg_user) {
-				$sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(session_id,c_id,user_id)
+        foreach ($CourseList as $enreg_course) {
+            // On ajoute la relation entre l'utilisateur et le cours
+            foreach ($UserList as $enreg_user) {
+                $sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(session_id,c_id,user_id)
 						VALUES('$id_session','$enreg_course','$enreg_user')";
-				Database::query($sql);
-			}
-			$sql = "SELECT COUNT(user_id) as nbUsers " .
-					"FROM $tbl_session_rel_course_rel_user " .
-					"WHERE session_id='$id_session' AND c_id='$enreg_course'";
-			$rs = Database::query($sql);
-			list($nbr_users) = Database::fetch_array($rs);
-			$sql = "UPDATE $tbl_session_rel_course SET nbr_users=$nbr_users
+                Database::query($sql);
+            }
+            $sql = "SELECT COUNT(user_id) as nbUsers " .
+                    "FROM $tbl_session_rel_course_rel_user " .
+                    "WHERE session_id='$id_session' AND c_id='$enreg_course'";
+            $rs = Database::query($sql);
+            list($nbr_users) = Database::fetch_array($rs);
+            $sql = "UPDATE $tbl_session_rel_course SET nbr_users=$nbr_users
 					WHERE session_id='$id_session' AND c_id = '$enreg_course'";
-			Database::query($sql);
-		}
-		// On ajoute la relation entre l'utilisateur et la session
-		foreach($UserList as $enreg_user){
-			$sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) " .
-					"VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')";
-			Database::query($sql);
-		}
-		$sql = "SELECT COUNT(user_id) as nbUsers " .
-				"FROM $tbl_session_rel_user " .
-				"WHERE session_id='$id_session' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
-		$rs = Database::query($sql);
-		list($nbr_users) = Database::fetch_array($rs);
-		$sql = "UPDATE $tbl_session SET nbr_users=$nbr_users WHERE id='$id_session'";
-		Database::query($sql);
-	}
+            Database::query($sql);
+        }
+        // On ajoute la relation entre l'utilisateur et la session
+        foreach($UserList as $enreg_user){
+            $sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) " .
+                    "VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')";
+            Database::query($sql);
+        }
+        $sql = "SELECT COUNT(user_id) as nbUsers " .
+                "FROM $tbl_session_rel_user " .
+                "WHERE session_id='$id_session' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
+        $rs = Database::query($sql);
+        list($nbr_users) = Database::fetch_array($rs);
+        $sql = "UPDATE $tbl_session SET nbr_users=$nbr_users WHERE id='$id_session'";
+        Database::query($sql);
+    }
 }

main/admin/filler.php

Indentation +4 added lines, -4 removed lines

@@ -30,8 +30,8 @@ 
 $output = array();
 if (!empty($_GET['fill'])) {
     switch ($_GET['fill']) {
-    	case 'users':
-        	require api_get_path(SYS_TEST_PATH).'datafiller/fill_users.php';
+        case 'users':
+            require api_get_path(SYS_TEST_PATH).'datafiller/fill_users.php';
             $output = fill_users();
             break;
         case 'courses':
@@ -53,8 +53,8 @@ 
     $result .= '<table>';
     foreach ($output as $line) {
         $result .= '<tr>';
-	    $result .= '<td class="filler-report-data-init">'.$line['line-init'].' </td><td class="filler-report-data">'.$line['line-info'].'</td>';
-	    $result .= '</tr>';
+        $result .= '<td class="filler-report-data-init">'.$line['line-init'].' </td><td class="filler-report-data">'.$line['line-info'].'</td>';
+        $result .= '</tr>';
     }
     $result .= '</table>';
     $result .= '</div>';

main/admin/access_url_edit_course_category_to_url.php

Indentation +21 added lines, -21 removed lines

@@ -124,11 +124,11 @@ 
 }
 
 if ($add_type == 'multiple') {
-	$link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeUnique').'</a>';
-	$link_add_type_multiple = get_lang('SessionAddTypeMultiple');
+    $link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeUnique').'</a>';
+    $link_add_type_multiple = get_lang('SessionAddTypeMultiple');
 } else {
-	$link_add_type_unique = get_lang('SessionAddTypeUnique');
-	$link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeMultiple').'</a>';
+    $link_add_type_unique = get_lang('SessionAddTypeUnique');
+    $link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeMultiple').'</a>';
 }
 
 $url_list = UrlManager::get_url_data();
@@ -192,34 +192,34 @@ 
     <?php } else { ?>
 	  <select id="origin_users" name="no_course_list[]" multiple="multiple" size="15" style="width:380px;">
 		<?php
-		foreach ($noUserGroupList as $noItem) {
-		?>
+        foreach ($noUserGroupList as $noItem) {
+        ?>
 			<option value="<?php echo $noItem['id']; ?>">
                 <?php echo $noItem['name']; ?>
             </option>
 		<?php
-		}
-		?>
+        }
+        ?>
 	  </select>
 	<?php
-  	  }
-  	 ?>
+        }
+        ?>
   </div>
   </td>
   <td width="10%" valign="middle" align="center">
   <?php
-  if ($ajax_search) {
-	?>
+    if ($ajax_search) {
+    ?>
 	<button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('destination_users'))" ></button>
   	<?php
-  } else {
-  	?>
+    } else {
+        ?>
 	<button class="arrowr" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" ></button>
 	<br /><br />
 	<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" ></button>
 	<?php
-  }
-  ?>
+    }
+    ?>
 	<br /><br /><br /><br /><br /><br />
   </td>
   <td align="center">
@@ -240,11 +240,11 @@ 
 	<td colspan="3" align="center">
 		<br />
 		<?php
-		if(isset($_GET['add']))
-			echo '<button class="save" onclick="valide()" >'.get_lang('Add').'</button>';
-		else
-			echo '<button class="save" onclick="valide()" >'.get_lang('Edit').'</button>';
-		?>
+        if(isset($_GET['add']))
+            echo '<button class="save" onclick="valide()" >'.get_lang('Add').'</button>';
+        else
+            echo '<button class="save" onclick="valide()" >'.get_lang('Edit').'</button>';
+        ?>
 	</td>
 </tr>
 </table>

main/admin/add_users_to_group.php

Indentation +25 added lines, -25 removed lines

@@ -401,7 +401,7 @@ 
               <?php
                 $selected_letter = isset($_POST['firstLetterUser']) ? $_POST['firstLetterUser'] : null;
                 echo Display :: get_alphabet_options($selected_letter);
-              ?>
+                ?>
 	     </select>
     </div>
 </td>
@@ -412,59 +412,59 @@ 
   <td align="center">
   <div id="content_source">
   	  <?php
-  	  if (!($add_type=='multiple')) {
-  	  	?>
+        if (!($add_type=='multiple')) {
+            ?>
 		<input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single',document.getElementById('relation').value)" />
 		<div id="ajax_list_users_single"></div>
 		<?php
-  	  } else {
-  	  ?>
+        } else {
+        ?>
   	  <div id="ajax_origin_list_multiple">
 	  <select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">
 		<?php
-		if (!empty($nosessionUsersList)) {
-			foreach($nosessionUsersList as $enreg) {
-			?>
+        if (!empty($nosessionUsersList)) {
+            foreach($nosessionUsersList as $enreg) {
+            ?>
 				<option value="<?php echo $enreg['user_id']; ?>"  > <?php echo $enreg['firstname'].' '.$enreg['lastname'].' ('.$enreg['username'].')'; ?></option>
 			<?php
-			}
-		}
-		?>
+            }
+        }
+        ?>
 	  </select>
 	  </div>
 	<?php
-  	  }
-  	  unset($nosessionUsersList);
-  	 ?>
+        }
+        unset($nosessionUsersList);
+        ?>
   </div>
   </td>
   <td width="10%" valign="middle" align="center">
   <?php
-  if ($ajax_search) {
-  ?>
+    if ($ajax_search) {
+    ?>
     <button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('destination_users'))" ><em class="fa fa-arrow-left"></em></button>
   <?php
-  } else {
-  ?>
+    } else {
+    ?>
   	<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))"><em class="fa fa-arrow-right"></em></button>
 	<br /><br />
 	<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))"><em class="fa fa-arrow-left"></em></button>
 	<?php
-  }
-  ?>
+    }
+    ?>
 	<br /><br /><br /><br /><br />
   </td>
   <td align="center">
   <div id="ajax_destination_list">
   <select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" style="width:360px;">
 	<?php
-	if (!empty($sessionUsersList)) {
-		foreach($sessionUsersList as $enreg) { ?>
+    if (!empty($sessionUsersList)) {
+        foreach($sessionUsersList as $enreg) { ?>
 			<option value="<?php echo $enreg['user_id']; ?>">
                 <?php echo $enreg['firstname'].' '.$enreg['lastname'].' ('.$enreg['username'].')'; ?>
             </option>
 	<?php }
-	} unset($sessionUsersList);
+    } unset($sessionUsersList);
     ?>
   </select>
   </div>
@@ -474,8 +474,8 @@ 
 	<td colspan="3" align="center">
 		<br />
 		<?php
-		echo '<button class="btn btn-success" type="button" value="" onclick="valide()" ><em class="fa fa-floppy-o"></em> '.get_lang('SubscribeUsersToGroup').'</button>';
-		?>
+        echo '<button class="btn btn-success" type="button" value="" onclick="valide()" ><em class="fa fa-floppy-o"></em> '.get_lang('SubscribeUsersToGroup').'</button>';
+        ?>
 	</td>
 </tr>
 </table>

main/admin/specific_fields.php

Indentation +7 added lines, -7 removed lines

@@ -43,15 +43,15 @@ 
 $table->set_column_filter(3, 'edit_filter');
 
 function edit_filter($id,$url_params,$row) {
-	global $charset;
-	$return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif',get_lang('Edit')).'</a>';
-	$return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.Display::return_icon('delete.gif',get_lang('Delete')).'</a>';
-	return $return;
+    global $charset;
+    $return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif',get_lang('Edit')).'</a>';
+    $return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.Display::return_icon('delete.gif',get_lang('Delete')).'</a>';
+    return $return;
 }
 
 if ($_REQUEST['action'] == 'delete') {
-	delete_specific_field($_REQUEST['field_id']);
-	header('Location: specific_fields.php?message='.get_lang('FieldRemoved'));
+    delete_specific_field($_REQUEST['field_id']);
+    header('Location: specific_fields.php?message='.get_lang('FieldRemoved'));
 }
 
 // Start output
@@ -61,7 +61,7 @@ 
 echo Display::display_normal_message(get_lang('SpecificSearchFieldsIntro'));
 
 if(!empty($_GET['message'])) {
-  Display::display_confirmation_message($_GET['message']);
+    Display::display_confirmation_message($_GET['message']);
 }
 
 echo '<div class="actions">';

main/admin/configure_extensions.php

Indentation +115 added lines, -115 removed lines

@@ -14,24 +14,24 @@ 
 $message = '';
 
 if (isset($_POST['activeExtension'])) {
-	switch ($_POST['extension_code']) {
-		case 'visio' :
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+    switch ($_POST['extension_code']) {
+        case 'visio' :
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="true"
 					WHERE variable="service_visio"
 					AND subkey="active"';
-			$rs = Database::query($sql);
-			if (Database::affected_rows($rs)>0) {
-				// select all the courses and insert the tool inside
-				$sql = 'SELECT id FROM '.Database::get_main_table(TABLE_MAIN_COURSE);
-				$rs = Database::query($sql);
-				while($row = Database::fetch_array($rs)){
-					if(!empty($_POST['visio_host'])) {
-						$tool_table = Database::get_course_table(TABLE_TOOL_LIST);
-						$select = "SELECT id FROM $tool_table WHERE c_id =".$row['id']." AND name='".TOOL_VISIO_CONFERENCE."'";
-						$selectres = Database::query($select);
-						if (Database::num_rows($selectres)<1) {
-							$sql = 'INSERT INTO '.$tool_table.' SET
+            $rs = Database::query($sql);
+            if (Database::affected_rows($rs)>0) {
+                // select all the courses and insert the tool inside
+                $sql = 'SELECT id FROM '.Database::get_main_table(TABLE_MAIN_COURSE);
+                $rs = Database::query($sql);
+                while($row = Database::fetch_array($rs)){
+                    if(!empty($_POST['visio_host'])) {
+                        $tool_table = Database::get_course_table(TABLE_TOOL_LIST);
+                        $select = "SELECT id FROM $tool_table WHERE c_id =".$row['id']." AND name='".TOOL_VISIO_CONFERENCE."'";
+                        $selectres = Database::query($select);
+                        if (Database::num_rows($selectres)<1) {
+                            $sql = 'INSERT INTO '.$tool_table.' SET
 							        c_id =  '.$row['id'].',
 									name="'.TOOL_VISIO_CONFERENCE.'",
 									link="conference/index.php?type=conference",
@@ -41,12 +41,12 @@ 
 									address="squaregrey.gif",
 									target="_self",
 									category="interaction"';
-							Database::query($sql);
-						}
-						$select = "SELECT id FROM $tool_table WHERE c_id =".$row['id']." AND name='".TOOL_VISIO_CLASSROOM."'";
-						$selectres = Database::query($select);
-						if(Database::num_rows($selectres)<1) {
-							$sql = 'INSERT INTO '.$tool_table.' SET
+                            Database::query($sql);
+                        }
+                        $select = "SELECT id FROM $tool_table WHERE c_id =".$row['id']." AND name='".TOOL_VISIO_CLASSROOM."'";
+                        $selectres = Database::query($select);
+                        if(Database::num_rows($selectres)<1) {
+                            $sql = 'INSERT INTO '.$tool_table.' SET
 							        c_id =  '.$row['id'].',
 									name="'.TOOL_VISIO_CLASSROOM.'",
 									link="conference/index.php?type=classroom",
@@ -56,92 +56,92 @@ 
 									address="squaregrey.gif",
 									target="_self",
 									category="authoring"';
-							Database::query($sql);
-						}
-					}
-				}
-				$message = get_lang('ServiceActivated');
-
-			}
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+                            Database::query($sql);
+                        }
+                    }
+                }
+                $message = get_lang('ServiceActivated');
+
+            }
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.Database::escape_string($_POST['visio_host']).'"
 					WHERE variable="service_visio"
 					AND subkey="visio_host"';
-			$rs = Database::query($sql);
+            $rs = Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.Database::escape_string($_POST['visio_port']).'"
 					WHERE variable="service_visio"
 					AND subkey="visio_port"';
-			$rs = Database::query($sql);
+            $rs = Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.Database::escape_string($_POST['visio_pass']).'"
 					WHERE variable="service_visio"
 					AND subkey="visio_pass"';
-			$rs = Database::query($sql);
+            $rs = Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.($_POST['visio_use_rtmpt']=='true'?'true':'false').'"
 					WHERE variable="service_visio"
 					AND subkey="visio_use_rtmpt"';
-			$rs = Database::query($sql);
+            $rs = Database::query($sql);
 
-			if(empty($message)) {
-				$message = get_lang('ServiceReconfigured');
-			}
-			break;
+            if(empty($message)) {
+                $message = get_lang('ServiceReconfigured');
+            }
+            break;
 
-		case 'ppt2lp' :
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+        case 'ppt2lp' :
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="true"
 					WHERE variable="service_ppt2lp"
 					AND subkey="active"';
 
-			$rs = Database::query($sql);
+            $rs = Database::query($sql);
 
-			if (Database::affected_rows($rs)>0){
-				$message = get_lang('ServiceActivated');
-			}
+            if (Database::affected_rows($rs)>0){
+                $message = get_lang('ServiceActivated');
+            }
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.addslashes($_POST['host']).'"
 					WHERE variable="service_ppt2lp"
 					AND subkey="host"';
-			Database::query($sql);
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.addslashes($_POST['port']).'"
 					WHERE variable="service_ppt2lp"
 					AND subkey="port"';
-			Database::query($sql);
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.addslashes($_POST['ftp_password']).'"
 					WHERE variable="service_ppt2lp"
 					AND subkey="ftp_password"';
-			Database::query($sql);
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.addslashes($_POST['user']).'"
 					WHERE variable="service_ppt2lp"
 					AND subkey="user"';
-			Database::query($sql);
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.addslashes($_POST['path_to_lzx']).'"
 					WHERE variable="service_ppt2lp"
 					AND subkey="path_to_lzx"';
-			Database::query($sql);
+            Database::query($sql);
 
-			$sql = 'UPDATE '.$tbl_settings_current.' SET
+            $sql = 'UPDATE '.$tbl_settings_current.' SET
 					selected_value="'.addslashes($_POST['size']).'"
 					WHERE variable="service_ppt2lp"
 					AND subkey="size"';
-			Database::query($sql);
+            Database::query($sql);
 
-			break;
-	}
+            break;
+    }
 
 }
 
@@ -154,14 +154,14 @@ 
 
 $rs = Database::query($sql);
 while($row = Database::fetch_array($rs)){
-	$listActiveServices[] = $row['variable'];
+    $listActiveServices[] = $row['variable'];
 }
 
 // javascript to handle accordion behaviour
 $javascript_message = '';
 if(!empty($message)){
-	$javascript_message =
-	'
+    $javascript_message =
+    '
 	document.getElementById("message").style.display = "block";
 	var timer = setTimeout(hideMessage,5000);
 	';
@@ -215,9 +215,9 @@ 
 ?>
 <div id="message" style="display: none">
 	<?php
-	if(!empty($message))
-		Display::display_normal_message($message)
-	?>
+    if(!empty($message))
+        Display::display_normal_message($message)
+    ?>
 </div>
 
 <div id="content" align="center">
@@ -303,63 +303,63 @@ 
                     <form method="POST" class="form-horizontal" action="<?php echo api_get_self(); ?>">
 						<?php
 
-						$form = new FormValidator('ppt2lp');
-						$form -> addElement('text', 'host', get_lang('Host'));
-						//$form -> addElement('html','<br /><br />');
-						$form -> addElement('text', 'port', get_lang('Port'));
-						//$form -> addElement('html','<br /><br />');
-						$form -> addElement('text', 'user', get_lang('UserOnHost'));
-						//$form -> addElement('html','<br /><br />');
-						$form -> addElement('text', 'ftp_password', get_lang('FtpPassword'));
-						//$form -> addElement('html','<br /><br />');
-						$form -> addElement('text', 'path_to_lzx', get_lang('PathToLzx'));
-						//$form -> addElement('html','<br /><br />');
-						$options = array(
-									'540x405'=>'540x405',
-									'640x480'=>'640x480',
-									'720x540'=>'720x540',
-									'800x600'=>'800x600',
-									'1000x750'=>'1000x750'
-									);
-						$form -> addElement('select', 'size', get_lang('SlideSize'), $options);
-
-
-						$form -> addElement('hidden', 'extension_code', 'ppt2lp');
-
-						$defaults = array();
-						$renderer = $form -> defaultRenderer();
-						$renderer -> setElementTemplate('<div style="text-align:left">{label}</div><div style="text-align:left">{element}</div>');
-						//$form -> addElement('html','<br /><br />');
-						if(in_array('service_ppt2lp',$listActiveServices))
-						{
-							$sql = 'SELECT subkey, selected_value FROM '.$tbl_settings_current.'
+                        $form = new FormValidator('ppt2lp');
+                        $form -> addElement('text', 'host', get_lang('Host'));
+                        //$form -> addElement('html','<br /><br />');
+                        $form -> addElement('text', 'port', get_lang('Port'));
+                        //$form -> addElement('html','<br /><br />');
+                        $form -> addElement('text', 'user', get_lang('UserOnHost'));
+                        //$form -> addElement('html','<br /><br />');
+                        $form -> addElement('text', 'ftp_password', get_lang('FtpPassword'));
+                        //$form -> addElement('html','<br /><br />');
+                        $form -> addElement('text', 'path_to_lzx', get_lang('PathToLzx'));
+                        //$form -> addElement('html','<br /><br />');
+                        $options = array(
+                                    '540x405'=>'540x405',
+                                    '640x480'=>'640x480',
+                                    '720x540'=>'720x540',
+                                    '800x600'=>'800x600',
+                                    '1000x750'=>'1000x750'
+                                    );
+                        $form -> addElement('select', 'size', get_lang('SlideSize'), $options);
+
+
+                        $form -> addElement('hidden', 'extension_code', 'ppt2lp');
+
+                        $defaults = array();
+                        $renderer = $form -> defaultRenderer();
+                        $renderer -> setElementTemplate('<div style="text-align:left">{label}</div><div style="text-align:left">{element}</div>');
+                        //$form -> addElement('html','<br /><br />');
+                        if(in_array('service_ppt2lp',$listActiveServices))
+                        {
+                            $sql = 'SELECT subkey, selected_value FROM '.$tbl_settings_current.'
 									WHERE variable = "service_ppt2lp"
 									AND subkey <> "active"';
-							$rs = Database::query($sql);
-							while($row = Database::fetch_array($rs,'ASSOC'))
-							{
-								$defaults[$row['subkey']] = $row['selected_value'];
-							}
-							$form->addButtonSave(get_lang('ReconfigureExtension'), 'activeExtension');
-						}
-						else {
-							$defaults['host'] = 'localhost';
-							$defaults['port'] = '2002';
-							$defaults['size'] = '720x540';
-							$form->addButtonSave(get_lang('ActivateExtension'), 'activeExtension');
-						}
-
-						$form -> setDefaults($defaults);
-						$form -> display();
-						echo '<br />';
-						?>
+                            $rs = Database::query($sql);
+                            while($row = Database::fetch_array($rs,'ASSOC'))
+                            {
+                                $defaults[$row['subkey']] = $row['selected_value'];
+                            }
+                            $form->addButtonSave(get_lang('ReconfigureExtension'), 'activeExtension');
+                        }
+                        else {
+                            $defaults['host'] = 'localhost';
+                            $defaults['port'] = '2002';
+                            $defaults['size'] = '720x540';
+                            $form->addButtonSave(get_lang('ActivateExtension'), 'activeExtension');
+                        }
+
+                        $form -> setDefaults($defaults);
+                        $form -> display();
+                        echo '<br />';
+                        ?>
 						</form>
                 </div>
             </div>
         </div>
 	
 	<?php
-	/*
+    /*
 	<!-- EPHORUS -->
 	<div id="main_ephorus">
 		<div id="extension_header_ephorus" class="accordion_header">