chamilo / chamilo-lms

main/user/add_users_to_session.php

Spacing +43 added lines, -43 removed lines

@@ -22,9 +22,9 @@ 
 
 // setting breadcrumbs
 if (api_is_platform_admin()) {
-    $interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-    $interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
-    $interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id_session,"name" => get_lang('SessionOverview'));
+    $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+    $interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
+    $interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id_session, "name" => get_lang('SessionOverview'));
 }
 $allowTutors = api_get_setting('allow_tutors_to_assign_students_to_session');
 $extra_field_list = [];
@@ -39,7 +39,7 @@ 
     $tool_name = get_lang('SubscribeUsersToSession');
     $add_type = 'unique';
 
-    if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!='') {
+    if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
         $add_type = Security::remove_XSS($_REQUEST['add_type']);
     }
 
@@ -51,7 +51,7 @@ 
     if (is_array($extra_field_list)) {
     	foreach ($extra_field_list as $extra_field) {
     		//if is enabled to filter and is a "<select>" field type
-    		if ($extra_field[8]==1 && $extra_field[2]==4 ) {
+    		if ($extra_field[8] == 1 && $extra_field[2] == 4) {
                 $new_field_list[] = array(
                     'name' => $extra_field[3],
                     'variable' => $extra_field[1],
@@ -74,7 +74,7 @@ 
     	if (!empty($needle) && !empty($type)) {
 
             //normal behaviour
-            if ($type == 'any_session' && $needle == 'false')  {
+            if ($type == 'any_session' && $needle == 'false') {
                 $type = 'multiple';
                 $needle = '';
             }
@@ -88,7 +88,7 @@ 
     		$cond_user_id = '';
 
             //Only for single & multiple
-            if (in_array($type, array('single','multiple'))) {
+            if (in_array($type, array('single', 'multiple'))) {
         		if (!empty($id_session)) {
         		    $id_session = intval($id_session);
         			// check id_user from session_rel_user table
@@ -98,11 +98,11 @@ 
         			$user_ids = array();
         			if (Database::num_rows($res) > 0) {
         				while ($row = Database::fetch_row($res)) {
-        					$user_ids[] = (int)$row[0];
+        					$user_ids[] = (int) $row[0];
         				}
         			}
         			if (count($user_ids) > 0) {
-        				$cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')';
+        				$cond_user_id = ' AND user.user_id NOT IN('.implode(",", $user_ids).')';
         			}
         		}
             }
@@ -138,7 +138,7 @@ 
                     break;
     		}
     		if (api_is_multiple_url_enabled()) {
-    			$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+    			$tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
     			$access_url_id = api_get_current_access_url_id();
     			if ($access_url_id != -1) {
                     switch ($type) {
@@ -183,11 +183,11 @@ 
     		}
 
     		$rs = Database::query($sql);
-            $i=0;
+            $i = 0;
     		if ($type == 'single') {
     			while ($user = Database::fetch_array($rs)) {
     	            $i++;
-    	            if ($i<=10) {
+    	            if ($i <= 10) {
                 		$person_name = api_get_person_name($user['firstname'], $user['lastname']);
     					$return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_session(\''.$user['user_id'].'\',\''.$person_name.' ('.$user['username'].')'.'\')">'.$person_name.' ('.$user['username'].')</a><br />';
     	            } else {
@@ -195,7 +195,7 @@ 
     	            }
     			}
 
-    			$xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
+    			$xajax_response -> addAssign('ajax_list_users_single', 'innerHTML', api_utf8_encode($return));
     		} else {
     			global $nosessionUsersList;
     			$return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
@@ -204,7 +204,7 @@ 
     	            $return .= '<option value="'.$user['user_id'].'">'.$person_name.' ('.$user['username'].')</option>';
     			}
     			$return .= '</select>';
-    			$xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
+    			$xajax_response -> addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
     		}
     	}
     	return $xajax_response;
@@ -261,7 +261,7 @@ 
     </script>';
 
     $form_sent = 0;
-    $errorMsg = $firstLetterUser = $firstLetterSession='';
+    $errorMsg = $firstLetterUser = $firstLetterSession = '';
     $UserList = $SessionList = array();
     $sessions = array();
     $noPHP_SELF = true;
@@ -273,7 +273,7 @@ 
         $UserList = $_POST['sessionUsersList'];
 
         if (!is_array($UserList)) {
-            $UserList=array();
+            $UserList = array();
         }
 
         if ($form_sent == 1) {
@@ -301,7 +301,7 @@ 
                 WHERE u.status<>".DRH." AND u.status<>6 $order_clause";
 
         if (api_is_multiple_url_enabled()) {
-            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+            $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
                 $sql = "SELECT u.user_id, lastname, firstname, username, session_id
@@ -317,19 +317,19 @@ 
         $result = Database::query($sql);
         $users = Database::store_result($result);
         foreach ($users as $user) {
-            $sessionUsersList[$user['user_id']] = $user ;
+            $sessionUsersList[$user['user_id']] = $user;
         }
         unset($users); //clean to free memory
     } else {
         //Filter by Extra Fields
         $use_extra_fields = false;
         if (is_array($extra_field_list)) {
-            if (is_array($new_field_list) && count($new_field_list)>0 ) {
-                $result_list=array();
+            if (is_array($new_field_list) && count($new_field_list) > 0) {
+                $result_list = array();
                 foreach ($new_field_list as $new_field) {
                     $varname = 'field_'.$new_field['variable'];
                     if (UserManager::is_extra_field_available($new_field['variable'])) {
-                        if (isset($_POST[$varname]) && $_POST[$varname]!='0') {
+                        if (isset($_POST[$varname]) && $_POST[$varname] != '0') {
                             $use_extra_fields = true;
                             $extra_field_result[] = UserManager::get_extra_user_data_by_value(
                                 $new_field['variable'],
@@ -343,9 +343,9 @@ 
 
         if ($use_extra_fields) {
             $final_result = array();
-           	if (count($extra_field_result)>1) {
-    	    for($i=0;$i<count($extra_field_result)-1;$i++) {
-                    if (is_array($extra_field_result[$i+1])) {
+           	if (count($extra_field_result) > 1) {
+    	    for ($i = 0; $i < count($extra_field_result) - 1; $i++) {
+                    if (is_array($extra_field_result[$i + 1])) {
                         $final_result = array_intersect(
                             $extra_field_result[$i],
                             $extra_field_result[$i + 1]
@@ -356,17 +356,17 @@ 
                 $final_result = $extra_field_result[0];
             }
 
-            $where_filter ='';
+            $where_filter = '';
             if (api_is_multiple_url_enabled()) {
-                if (is_array($final_result) && count($final_result)>0) {
-                    $where_filter = " AND u.user_id IN  ('".implode("','",$final_result)."') ";
+                if (is_array($final_result) && count($final_result) > 0) {
+                    $where_filter = " AND u.user_id IN  ('".implode("','", $final_result)."') ";
                 } else {
                     //no results
                     $where_filter = " AND u.user_id  = -1";
                 }
             } else {
-                if (is_array($final_result) && count($final_result)>0) {
-                    $where_filter = " WHERE u.user_id IN  ('".implode("','",$final_result)."') ";
+                if (is_array($final_result) && count($final_result) > 0) {
+                    $where_filter = " WHERE u.user_id IN  ('".implode("','", $final_result)."') ";
                 } else {
                     //no results
                     $where_filter = " WHERE u.user_id  = -1";
@@ -395,7 +395,7 @@ 
                     $order_clause";
         }
         if (api_is_multiple_url_enabled()) {
-            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+            $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
                 $sql = "SELECT  u.user_id, lastname, firstname, username, session_id
@@ -412,7 +412,7 @@ 
         }
 
         $result = Database::query($sql);
-        $users = Database::store_result($result,'ASSOC');
+        $users = Database::store_result($result, 'ASSOC');
 
         foreach ($users as $uid => $user) {
             if ($user['session_id'] != $id_session) {
@@ -427,7 +427,7 @@ 
         unset($users); //clean to free memory
 
         //filling the correct users in list
-        $sql="SELECT  user_id, lastname, firstname, username, session_id
+        $sql = "SELECT  user_id, lastname, firstname, username, session_id
               FROM $tbl_user u
               LEFT JOIN $tbl_session_rel_user
               ON
@@ -437,10 +437,10 @@ 
               WHERE u.status<>".DRH." AND u.status<>6 $order_clause";
 
         if (api_is_multiple_url_enabled()) {
-            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+            $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
-                $sql="SELECT  u.user_id, lastname, firstname, username, session_id
+                $sql = "SELECT  u.user_id, lastname, firstname, username, session_id
                     FROM $tbl_user u
                     LEFT JOIN $tbl_session_rel_user
                     ON
@@ -453,11 +453,11 @@ 
             }
         }
         $result = Database::query($sql);
-        $users = Database::store_result($result,'ASSOC');
+        $users = Database::store_result($result, 'ASSOC');
         foreach ($users as $uid => $user) {
             if ($user['session_id'] == $id_session) {
                 $sessionUsersList[$user['user_id']] = $user;
-                if (array_key_exists($user['user_id'],$nosessionUsersList)) {
+                if (array_key_exists($user['user_id'], $nosessionUsersList)) {
                     unset($nosessionUsersList[$user['user_id']]);
                 }
             }
@@ -473,25 +473,25 @@ 
     	$link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
     	$link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&amp;add='.Security::remove_XSS($_GET['add']).'&amp;add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
     }
-    	$link_add_group = '<a href="usergroups.php">'.Display::return_icon('multiple.gif',get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups').'</a>';
+    	$link_add_group = '<a href="usergroups.php">'.Display::return_icon('multiple.gif', get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups').'</a>';
     ?>
     <div class="actions">
     	<?php echo $link_add_type_unique ?>&nbsp;|&nbsp;<?php echo $link_add_type_multiple ?>&nbsp;|&nbsp;<?php echo $link_add_group; ?>
     </div>
-    <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
+    <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if (!empty($_GET['add'])) echo '&add=true'; ?>" style="margin:0px;" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?>>
     <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
     <?php
     if ($add_type == 'multiple') {
     	if (is_array($extra_field_list)) {
-    		if (is_array($new_field_list) && count($new_field_list)>0 ) {
+    		if (is_array($new_field_list) && count($new_field_list) > 0) {
     			echo '<h3>'.get_lang('FilterUsers').'</h3>';
     			foreach ($new_field_list as $new_field) {
     				echo $new_field['name'];
     				$varname = 'field_'.$new_field['variable'];
     				echo '&nbsp;<select name="'.$varname.'">';
     				echo '<option value="0">--'.get_lang('Select').'--</option>';
-    				foreach	($new_field['data'] as $option) {
-    					$checked='';
+    				foreach ($new_field['data'] as $option) {
+    					$checked = '';
     					if (isset($_POST[$varname])) {
     						if ($_POST[$varname] == $option[1]) {
     							$checked = 'selected="true"';
@@ -546,7 +546,7 @@ 
                   <?php
                   foreach ($nosessionUsersList as $uid => $enreg) {
                   ?>
-                      <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option>
+                      <option value="<?php echo $uid; ?>" <?php if (in_array($uid, $UserList)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option>
                   <?php
                   }
                   ?>
@@ -598,7 +598,7 @@ 
             </div>
             <select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" class="span5">
             <?php
-            foreach($sessionUsersList as $enreg) {
+            foreach ($sessionUsersList as $enreg) {
             ?>
                 <option value="<?php echo $enreg['user_id']; ?>"><?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?></option>
             <?php

main/auth/ldap/authldap.php

Spacing +92 added lines, -92 removed lines

@@ -78,16 +78,16 @@ 
     // res=-1 -> the user does not exist in the ldap database
     // res=1 -> invalid password (user does exist)
 
-    if ($res==1) { //WRONG PASSWORD
+    if ($res == 1) { //WRONG PASSWORD
         //$errorMessage = "LDAP User or password incorrect, try again.<br />";
         if (isset($log)) unset($log); if (isset($uid)) unset($uid);
         $loginLdapSucces = false;
     }
-    if ($res==-1) { //WRONG USERNAME
+    if ($res == -1) { //WRONG USERNAME
         //$errorMessage =  "LDAP User or password incorrect, try again.<br />";
         $login_ldap_success = false;
     }
-    if ($res==0) { //LOGIN & PASSWORD OK - SUCCES
+    if ($res == 0) { //LOGIN & PASSWORD OK - SUCCES
         //$errorMessage = "Successful login w/ LDAP.<br>";
         $login_ldap_success = true;
     }
@@ -103,30 +103,30 @@ 
  *    @author Stefan De Wannemacker
  *    @author Roan Embrechts
  */
-function ldap_find_user_info ($login) {
+function ldap_find_user_info($login) {
     //error_log('Entering ldap_find_user_info('.$login.')',0);
     global $ldap_host, $ldap_port, $ldap_basedn, $ldap_rdn, $ldap_pass, $ldap_search_dn;
     // basic sequence with LDAP is connect, bind, search,
     // interpret search result, close connection
 
     //echo "Connecting ...";
-    $ldap_connect = ldap_connect( $ldap_host, $ldap_port);
+    $ldap_connect = ldap_connect($ldap_host, $ldap_port);
     ldap_set_version($ldap_connect);
     if ($ldap_connect) {
         //echo " Connect to LDAP server successful ";
         //echo "Binding ...";
         $ldap_bind = false;
-        $ldap_bind_res = ldap_handle_bind($ldap_connect,$ldap_bind);
+        $ldap_bind_res = ldap_handle_bind($ldap_connect, $ldap_bind);
         if ($ldap_bind_res) {
             //echo " LDAP bind successful... ";
             //echo " Searching for uid... ";
             // Search surname entry
             //OLD: $sr=ldap_search($ldapconnect,"dc=rug, dc=ac, dc=be", "uid=$login");
             //echo "<p> ldapDc = '$LDAPbasedn' </p>";
-            if(!empty($ldap_search_dn)) {
-                $sr=ldap_search($ldap_connect, $ldap_search_dn, "uid=$login");
+            if (!empty($ldap_search_dn)) {
+                $sr = ldap_search($ldap_connect, $ldap_search_dn, "uid=$login");
             } else {
-                $sr=ldap_search($ldap_connect, $ldap_basedn, "uid=$login");
+                $sr = ldap_search($ldap_connect, $ldap_basedn, "uid=$login");
             }
             //echo " Search result is ".$sr;
             //echo " Number of entries returned is ".ldap_count_entries($ldapconnect,$sr);
@@ -177,25 +177,25 @@ 
     $password1  = $ldap_pass_placeholder;
     $official_code = '';
 
-    define ("STUDENT",5);
-    define ("COURSEMANAGER",1);
+    define("STUDENT", 5);
+    define("COURSEMANAGER", 1);
 
     $tutor_field = api_get_setting('ldap_filled_tutor_field');
     $tutor_value = api_get_setting('ldap_filled_tutor_field_value');
-    if(empty($tutor_field)) {
+    if (empty($tutor_field)) {
         $status = STUDENT;
     } else {
-        if(empty($tutor_value)) {
+        if (empty($tutor_value)) {
             //in this case, we are assuming that the admin didn't give a criteria
             // so that if the field is not empty, it is a tutor
-            if(!empty($info_array[$tutor_field])) {
+            if (!empty($info_array[$tutor_field])) {
                 $status = COURSEMANAGER;
             } else {
                 $status = STUDENT;
             }
         } else {
             //the tutor_value is filled, so we need to check the contents of the LDAP field
-            if (is_array($info_array[$tutor_field]) && in_array($tutor_value,$info_array[$tutor_field])) {
+            if (is_array($info_array[$tutor_field]) && in_array($tutor_value, $info_array[$tutor_field])) {
                 $status = COURSEMANAGER;
             } else {
                 $status = STUDENT;
@@ -212,7 +212,7 @@ 
     if (empty($language)) { $language = 'english'; }
     $_userId = UserManager::create_user($prenom, $nom, $status,
                      $email, $uname, $password, $official_code,
-                     $language,'', '', 'ldap');
+                     $language, '', '', 'ldap');
 
     //echo "new user added to Chamilo, id = $_userId";
 
@@ -246,58 +246,58 @@ 
  * @param string password given by user
  * @return int 0 if authentication succeeded, 1 if password was incorrect, -1 if it didn't belong to LDAP
  */
-function ldap_authentication_check ($uname, $passwd) {
+function ldap_authentication_check($uname, $passwd) {
     //error_log('Entering ldap_authentication_check('.$uname.','.$passwd.')',0);
-    global $ldap_host, $ldap_port, $ldap_basedn, $ldap_host2, $ldap_port2,$ldap_rdn,$ldap_pass;
+    global $ldap_host, $ldap_port, $ldap_basedn, $ldap_host2, $ldap_port2, $ldap_rdn, $ldap_pass;
     //error_log('Entering ldap_authentication_check('.$uname.','.$passwd.')',0);
     // Establish anonymous connection with LDAP server
     // Etablissement de la connexion anonyme avec le serveur LDAP
-    $ds=ldap_connect($ldap_host,$ldap_port);
+    $ds = ldap_connect($ldap_host, $ldap_port);
     ldap_set_version($ds);
 
     $test_bind = false;
-    $test_bind_res = ldap_handle_bind($ds,$test_bind);
+    $test_bind_res = ldap_handle_bind($ds, $test_bind);
     //if problem, use the replica
-    if ($test_bind_res===false) {
-        $ds=ldap_connect($ldap_host2,$ldap_port2);
+    if ($test_bind_res === false) {
+        $ds = ldap_connect($ldap_host2, $ldap_port2);
         ldap_set_version($ds);
     } else {
         //error_log('Connected to server '.$ldap_host);
     }
-    if ($ds!==false) {
+    if ($ds !== false) {
         //Creation of filter containing values input by the user
         // Here it might be necessary to use $filter="(samaccountName=$uname)"; - see http://support.chamilo.org/issues/4675
-        $filter="(uid=$uname)";
+        $filter = "(uid=$uname)";
         // Open anonymous LDAP connection
-        $result=false;
-        $ldap_bind_res = ldap_handle_bind($ds,$result);
+        $result = false;
+        $ldap_bind_res = ldap_handle_bind($ds, $result);
 	// Executing the search with the $filter parametr
         //error_log('Searching for '.$filter.' on LDAP server',0);
-        $sr=ldap_search($ds,$ldap_basedn,$filter);
+        $sr = ldap_search($ds, $ldap_basedn, $filter);
         $info = ldap_get_entries($ds, $sr);
-        $dn=($info[0]["dn"]);
+        $dn = ($info[0]["dn"]);
         // debug !!    echo"<br> dn = $dn<br> pass = $passwd<br>";
         // closing 1st connection
         ldap_close($ds);
     }
 
     // test the Distinguish Name from the 1st connection
-    if ($dn=="") {
-        return (-1);        // doesn't belong to the addressbook
+    if ($dn == "") {
+        return (-1); // doesn't belong to the addressbook
     }
     //bug ldap.. if password empty, return 1!
-    if ($passwd=="") {
+    if ($passwd == "") {
         return(1);
     }
     // Opening 2nd LDAP connection : Connection user for password check
-    $ds=ldap_connect($ldap_host,$ldap_port);
+    $ds = ldap_connect($ldap_host, $ldap_port);
     ldap_set_version($ds);
     if (!$test_bind) {
-        $ds=ldap_connect($ldap_host2,$ldap_port2);
+        $ds = ldap_connect($ldap_host2, $ldap_port2);
         ldap_set_version($ds);
     }
     // return in case of wrong password connection error
-    if (@ldap_bind( $ds, $dn , $passwd) === false) {
+    if (@ldap_bind($ds, $dn, $passwd) === false) {
         return (1); // invalid password
     } else {// connection successfull
         return (0);
@@ -311,7 +311,7 @@ 
 function ldap_set_version(&$resource) {
     //error_log('Entering ldap_set_version(&$resource)',0);
     global $ldap_version;
-    if ($ldap_version>2) {
+    if ($ldap_version > 2) {
         if (ldap_set_option($resource, LDAP_OPT_PROTOCOL_VERSION, 3)) {
             //ok - don't do anything
         } else {
@@ -325,14 +325,14 @@ 
  * @param    resource    The LDAP bind handler we will be modifying
  * @return    boolean        Status of the bind assignment. True for success, false for failure.
  */
-function ldap_handle_bind(&$ldap_handler,&$ldap_bind) {
+function ldap_handle_bind(&$ldap_handler, &$ldap_bind) {
     //error_log('Entering ldap_handle_bind(&$ldap_handler,&$ldap_bind)',0);
-    global $ldap_rdn,$ldap_pass, $extldap_config;
+    global $ldap_rdn, $ldap_pass, $extldap_config;
     $ldap_rdn = $extldap_config['admin_dn'];
     $ldap_pass = $extldap_config['admin_password'];
     if (!empty($ldap_rdn) and !empty($ldap_pass)) {
         //error_log('Trying authenticated login :'.$ldap_rdn.'/'.$ldap_pass,0);
-        $ldap_bind = ldap_bind($ldap_handler,$ldap_rdn,$ldap_pass);
+        $ldap_bind = ldap_bind($ldap_handler, $ldap_rdn, $ldap_pass);
         if (!$ldap_bind) {
             //error_log('Authenticated login failed',0);
             //try in anonymous mode, you never know...
@@ -358,40 +358,40 @@ 
 
     global $ldap_basedn, $ldap_host, $ldap_port, $ldap_rdn, $ldap_pass, $ldap_search_dn, $extldap_user_correspondance;
 
-    $keyword_firstname = isset($_GET['keyword_firstname']) ? trim(Database::escape_string($_GET['keyword_firstname'])): '';
+    $keyword_firstname = isset($_GET['keyword_firstname']) ? trim(Database::escape_string($_GET['keyword_firstname'])) : '';
     $keyword_lastname = isset($_GET['keyword_lastname']) ? trim(Database::escape_string($_GET['keyword_lastname'])) : '';
     $keyword_username = isset($_GET['keyword_username']) ? trim(Database::escape_string($_GET['keyword_username'])) : '';
     $keyword_type = isset($_GET['keyword_type']) ? Database::escape_string($_GET['keyword_type']) : '';
 
-    $ldap_query=array();
+    $ldap_query = array();
 
     if ($keyword_username != "") {
         $ldap_query[] = str_replace('%username%', $keyword_username, $ldap_search_dn);
     } else {
-        if ($keyword_lastname!=""){
-            $ldap_query[]="(".$extldap_user_correspondance['lastname']."=".$keyword_lastname."*)";
+        if ($keyword_lastname != "") {
+            $ldap_query[] = "(".$extldap_user_correspondance['lastname']."=".$keyword_lastname."*)";
         }
-        if ($keyword_firstname!="") {
-            $ldap_query[]="(".$extldap_user_correspondance['firstname']."=".$keyword_firstname."*)";
+        if ($keyword_firstname != "") {
+            $ldap_query[] = "(".$extldap_user_correspondance['firstname']."=".$keyword_firstname."*)";
         }
     }
-    if ($keyword_type !="" && $keyword_type !="all") {
-        $ldap_query[]="(employeeType=".$keyword_type.")";
+    if ($keyword_type != "" && $keyword_type != "all") {
+        $ldap_query[] = "(employeeType=".$keyword_type.")";
     }
 
-    if (count($ldap_query)>1){
-        $str_query.="(& ";
-        foreach ($ldap_query as $query){
-            $str_query.=" $query";
+    if (count($ldap_query) > 1) {
+        $str_query .= "(& ";
+        foreach ($ldap_query as $query) {
+            $str_query .= " $query";
         }
-        $str_query.=" )";
+        $str_query .= " )";
     } else {
-        $str_query= count($ldap_query) > 0 ? $ldap_query[0] : null;
+        $str_query = count($ldap_query) > 0 ? $ldap_query[0] : null;
     }
 
     $ds = ldap_connect($ldap_host, $ldap_port);
     ldap_set_version($ds);
-    if ($ds && count($ldap_query)>0) {
+    if ($ds && count($ldap_query) > 0) {
         $r = false;
         $res = ldap_handle_bind($ds, $r);
         //$sr = ldap_search($ds, "ou=test-ou,$ldap_basedn", $str_query);
@@ -401,7 +401,7 @@ 
         return $info;
 
     } else {
-        if (count($ldap_query)!=0)
+        if (count($ldap_query) != 0)
             Display :: display_error_message(get_lang('LDAPConnectionError'));
         return array();
     }
@@ -414,7 +414,7 @@ 
  */
 function ldap_get_number_of_users() {
     $info = ldap_get_users();
-    if (count($info)>0) {
+    if (count($info) > 0) {
         return $info['count'];
     } else {
         return 0;
@@ -434,9 +434,9 @@ 
     $is_western_name_order = api_is_western_name_order();
     if (isset($_GET['submit'])) {
         $info = ldap_get_users();
-        if ($info['count']>0) {
-            for ($key = 0; $key < $info["count"]; $key ++) {
-                $user=array();
+        if ($info['count'] > 0) {
+            for ($key = 0; $key < $info["count"]; $key++) {
+                $user = array();
                 // Get uid from dn
                 //YW: this might be a variation between LDAP 2 and LDAP 3, but in LDAP 3, the uid is in
                 //the corresponding index of the array
@@ -470,9 +470,9 @@ 
  * @return string Some HTML-code with modify-buttons
  * @author    Mustapha Alouani
  */
-function modify_filter($user_id,$url_params, $row) {
-    $query_string="id[]=".$row[0];
-    if (!empty($_GET['id_session'])){
+function modify_filter($user_id, $url_params, $row) {
+    $query_string = "id[]=".$row[0];
+    if (!empty($_GET['id_session'])) {
         $query_string .= '&amp;id_session='.Security::remove_XSS($_GET['id_session']);
     }
     //$url_params_id="id=".$row[0];
@@ -497,7 +497,7 @@ 
     $firstname = api_convert_encoding($data['cn'][0], api_get_system_encoding(), 'UTF-8');
     $email = $data['mail'][0];
     // Get uid from dn
-    $dn_array=ldap_explode_dn($data['dn'],1);
+    $dn_array = ldap_explode_dn($data['dn'], 1);
     $username = $dn_array[0]; // uid is first key
     $outab[] = $data['edupersonprimaryaffiliation'][0]; // Here, "student"
     //$val = ldap_get_values_len($ds, $entry, "userPassword");
@@ -505,29 +505,29 @@ 
     //$password = $val[0];
     // TODO the password, if encrypted at the source, will be encrypted twice, which makes it useless. Try to fix that.
     $password = $data['userPassword'][0];
-    $structure=$data['edupersonprimaryorgunitdn'][0];
-    $array_structure=explode(",", $structure);
-    $array_val=explode("=", $array_structure[0]);
-    $etape=$array_val[1];
-    $array_val=explode("=", $array_structure[1]);
-    $annee=$array_val[1];
+    $structure = $data['edupersonprimaryorgunitdn'][0];
+    $array_structure = explode(",", $structure);
+    $array_val = explode("=", $array_structure[0]);
+    $etape = $array_val[1];
+    $array_val = explode("=", $array_structure[1]);
+    $annee = $array_val[1];
     // To ease management, we add the step-year (etape-annee) code
-    $official_code=$etape."-".$annee;
-    $auth_source='ldap';
+    $official_code = $etape."-".$annee;
+    $auth_source = 'ldap';
     // No expiration date for students (recover from LDAP's shadow expiry)
-    $expiration_date='';
-    $active=1;
-    if(empty($status)){$status = 5;}
-    if(empty($phone)){$phone = '';}
-    if(empty($picture_uri)){$picture_uri = '';}
+    $expiration_date = '';
+    $active = 1;
+    if (empty($status)) {$status = 5; }
+    if (empty($phone)) {$phone = ''; }
+    if (empty($picture_uri)) {$picture_uri = ''; }
     // Adding user
     $user_id = 0;
     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);
+        $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);
     } else {
         if ($update_if_exists) {
             $user = api_get_user_info($username);
-            $user_id=$user['user_id'];
+            $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);
         }
     }
@@ -544,21 +544,21 @@ 
 
     // Database Table Definitions
     $tbl_session                        = Database::get_main_table(TABLE_MAIN_SESSION);
-    $tbl_session_rel_class                = Database::get_main_table(TABLE_MAIN_SESSION_CLASS);
+    $tbl_session_rel_class = Database::get_main_table(TABLE_MAIN_SESSION_CLASS);
     $tbl_session_rel_course                = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
     $tbl_session_rel_course_rel_user    = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
     $tbl_course                            = Database::get_main_table(TABLE_MAIN_COURSE);
     $tbl_user                            = Database::get_main_table(TABLE_MAIN_USER);
     $tbl_session_rel_user                = Database::get_main_table(TABLE_MAIN_SESSION_USER);
-    $tbl_class                            = Database::get_main_table(TABLE_MAIN_CLASS);
-    $tbl_class_user                        = Database::get_main_table(TABLE_MAIN_CLASS_USER);
+    $tbl_class = Database::get_main_table(TABLE_MAIN_CLASS);
+    $tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER);
 
     $id_session = (int) $id_session;
     // Once users are imported in the users base, we can assign them to the 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'];
+    $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) {
         foreach ($UserList as $enreg_user) {
@@ -569,21 +569,21 @@ 
               "('$id_session','$enreg_course','$enreg_user')");
         }
         $sql = "SELECT COUNT(user_id) as nbUsers ".
-               " FROM $tbl_session_rel_course_rel_user " .
+               " 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);
         Database::query("UPDATE $tbl_session_rel_course  ".
-               " SET nbr_users=$nbr_users " .
+               " SET nbr_users=$nbr_users ".
                " WHERE session_id='$id_session' ".
                " AND c_id='$enreg_course'");
     }
     foreach ($UserList as $enreg_user) {
         $enreg_user = (int) $enreg_user;
         Database::query("INSERT IGNORE INTO $tbl_session_rel_user ".
-               " (session_id, user_id, registered_at) " .
-               " VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')");
+               " (session_id, user_id, registered_at) ".
+               " VALUES('$id_session','$enreg_user', '".api_get_utc_datetime()."')");
     }
     // We update the number of users in the session
     $sql = "SELECT COUNT(user_id) as nbUsers FROM $tbl_session_rel_user ".
@@ -598,13 +598,13 @@ 
 function syncro_users() {
     global $ldap_basedn, $ldap_host, $ldap_port, $ldap_rdn, $ldap_pass, $ldap_search_dn;
     echo "Connecting ...";
-    $ldap_connect = ldap_connect( $ldap_host, $ldap_port);
+    $ldap_connect = ldap_connect($ldap_host, $ldap_port);
     ldap_set_version($ldap_connect);
     if ($ldap_connect) {
         //echo " Connect to LDAP server successful ";
         //echo "Binding ...";
         $ldap_bind = false;
-        $ldap_bind_res = ldap_handle_bind($ldap_connect,$ldap_bind);
+        $ldap_bind_res = ldap_handle_bind($ldap_connect, $ldap_bind);
         if ($ldap_bind_res) {
             //echo " LDAP bind successful... ";
             //echo " Searching for uid... ";
@@ -612,7 +612,7 @@ 
             //OLD: $sr=ldap_search($ldapconnect,"dc=rug, dc=ac, dc=be", "uid=$login");
             //echo "<p> ldapDc = '$LDAPbasedn' </p>";
             $all_user_query = "uid=*";
-            if(!empty($ldap_search_dn)) {
+            if (!empty($ldap_search_dn)) {
                 $sr = ldap_search($ldap_connect, $ldap_search_dn, $all_user_query);
             } else {
                 $sr = ldap_search($ldap_connect, $ldap_basedn, $all_user_query);
@@ -620,7 +620,7 @@ 
             //echo " Number of entries returned is ".ldap_count_entries($ldapconnect,$sr);
             //echo " Getting entries ...";
             $info = ldap_get_entries($ldap_connect, $sr);
-            for ($key = 0; $key < $info['count']; $key ++) {
+            for ($key = 0; $key < $info['count']; $key++) {
                 $user_id = ldap_add_user_by_array($info[$key], false);
                 if ($user_id) {
                     echo "User #$user_id created ";

main/inc/global.inc.php

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
     if (!$alreadyInstalled) {
         $global_error_code = 2;
         // The system has not been installed yet.
-        require_once __DIR__ . '/../inc/global_error_message.inc.php';
+        require_once __DIR__.'/../inc/global_error_message.inc.php';
         die();
     }
 }
@@ -158,9 +158,9 @@ 
     $request_url_root = '';
     if (empty($_SERVER['HTTP_HOST'])) {
         if (empty($_SERVER['SERVER_NAME'])) {
-            $request_url_root = $protocol . 'localhost/';
+            $request_url_root = $protocol.'localhost/';
         } else {
-            $request_url_root = $protocol . $_SERVER['SERVER_NAME'] . '/';
+            $request_url_root = $protocol.$_SERVER['SERVER_NAME'].'/';
         }
     } else {
         $request_url_root = $protocol.$_SERVER['HTTP_HOST'].'/';
@@ -454,7 +454,7 @@ 
     }
 
     if (!empty($language_priority1) && api_get_language_from_type($language_priority1) !== false) {
-        $language_interface =  api_get_language_from_type($language_priority1);
+        $language_interface = api_get_language_from_type($language_priority1);
     } else {
         if (isset($_course['language'])) {
             $language_interface = $_course['language'];

main/inc/ajax/record_audio_rtc.ajax.php

Spacing +4 added lines, -4 removed lines

@@ -25,16 +25,16 @@
 $audioFileName = Database::escape_string($audioFileName);
 $audioFileName = api_replace_dangerous_char($audioFileName);
 $audioFileName = disable_dangerous_file($audioFileName);
-$audioDir  = Security::remove_XSS($audioDir);
+$audioDir = Security::remove_XSS($audioDir);
 
-$dirBaseDocuments = api_get_path(SYS_COURSE_PATH) . $courseInfo['path'] . '/document';
-$saveDir = $dirBaseDocuments . $audioDir;
+$dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document';
+$saveDir = $dirBaseDocuments.$audioDir;
 
 if (!is_dir($saveDir)) {
     DocumentManager::createDefaultAudioFolder($courseInfo);
 }
 
-$documentPath = $saveDir . '/' . $audioFileName;
+$documentPath = $saveDir.'/'.$audioFileName;
 
 $file['file'] = $file;
 

main/inc/ajax/record_audio_wami.ajax.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 // Do not use here check Fileinfo method because return: text/plain
 
 $dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
-$saveDir = $dirBaseDocuments . $wamidir;
+$saveDir = $dirBaseDocuments.$wamidir;
 
 if (!is_dir($saveDir)) {
     DocumentManager::createDefaultAudioFolder($_course);
@@ -88,7 +88,7 @@ 
 ob_start();
 
 // Strangely the file path changes with a double extension
-copy($documentPath, $documentPath . '.wav');
+copy($documentPath, $documentPath.'.wav');
 
 $documentData = DocumentManager::upload_document(
     $file,

main/inc/lib/fileManage.lib.php

Spacing +9 added lines, -9 removed lines

@@ -225,9 +225,9 @@ 
 		/* File case */
 		if (is_file($source)) {
 			if ($forceMove && !$isWindowsOS && $canExec) {
-				exec('mv ' . $source . ' ' . $target . '/' . $file_name);
+				exec('mv '.$source.' '.$target.'/'.$file_name);
 			} else {
-				copy($source, $target . '/' . $file_name);
+				copy($source, $target.'/'.$file_name);
 				unlink($source);
 			}
 			return true;
@@ -349,17 +349,17 @@ 
 			// Recursive operation if subdirectories exist
 			$dir_number = sizeof($dir_array);
 			if ($dir_number > 0) {
-				for ($i = 0 ; $i < $dir_number ; $i++) {
+				for ($i = 0; $i < $dir_number; $i++) {
 					$sub_dir_array = FileManager::list_all_directories($dir_array[$i]); // Function recursivity
 					if (is_array($dir_array) && is_array($sub_dir_array)) {
-						$dir_array  =  array_merge($dir_array, $sub_dir_array); // Data merge
+						$dir_array = array_merge($dir_array, $sub_dir_array); // Data merge
 					}
 				}
 			}
-			$result_array  =  $dir_array;
-			chdir($save_dir) ;
+			$result_array = $dir_array;
+			chdir($save_dir);
 		}
-		return $result_array ;
+		return $result_array;
 	}
 
 	/**
@@ -404,8 +404,8 @@ 
 		$buffer = '';
 		if (file_exists($file_name)) {
 			$fp = fopen($file_name, 'rb');
-			$buffer = fread ($fp, filesize($file_name));
-			fclose ($fp);
+			$buffer = fread($fp, filesize($file_name));
+			fclose($fp);
 		}
 		return $buffer;
 	}

main/document/record_audio.php

Spacing +12 added lines, -12 removed lines

@@ -29,9 +29,9 @@ 
 $dir = $document_data['path'];
 
 //make some vars
-$wamidir=$dir;
-if($wamidir=="/"){
-	$wamidir="";
+$wamidir = $dir;
+if ($wamidir == "/") {
+	$wamidir = "";
 }
 $wamiurlplay = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$wamidir."/";
 $groupId = api_get_group_id();
@@ -65,7 +65,7 @@ 
 
 //groups //TODO: clean
 if (!empty($groupId)) {
-	$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
+	$interbreadcrumb[] = array("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
 	$noPHP_SELF = true;
 	$group = GroupManager :: get_group_properties($groupId);
 	$path = explode('/', $dir);
@@ -81,7 +81,7 @@ 
 }
 
 if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
-	DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
+	DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir), api_get_session_id()))) {
 	api_not_allowed(true);
 }
 
@@ -99,7 +99,7 @@ 
 // Interbreadcrumb for the current directory root path
 $counter = 0;
 if (isset($document_data['parents'])) {
-	foreach($document_data['parents'] as $document_sub_data) {
+	foreach ($document_data['parents'] as $document_sub_data) {
 		//fixing double group folder in breadcrumb
 		if (api_get_group_id()) {
 			if ($counter == 0) {
@@ -115,14 +115,14 @@ 
 //make some vars
 $wamiuserid = api_get_user_id();
 
-$htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'rtc/RecordRTC.js"></script>';
-$htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_PATH) . 'wami-recorder/recorder.js"></script>';
-$htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_PATH) . 'wami-recorder/gui.js"></script>';
-$htmlHeadXtra[] = '<script type="text/javascript" src="' . api_get_path(WEB_LIBRARY_PATH) . 'swfobject/swfobject.js"></script>';
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'rtc/RecordRTC.js"></script>';
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'wami-recorder/recorder.js"></script>';
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'wami-recorder/gui.js"></script>';
+$htmlHeadXtra[] = '<script type="text/javascript" src="'.api_get_path(WEB_LIBRARY_PATH).'swfobject/swfobject.js"></script>';
 
 $actions = Display::toolbarButton(
-	get_lang('BackTo') . ' ' . get_lang('DocumentsOverview'),
-	'document.php?' . api_get_cidreq() . "&id=$document_id",
+	get_lang('BackTo').' '.get_lang('DocumentsOverview'),
+	'document.php?'.api_get_cidreq()."&id=$document_id",
 	'arrow-left',
 	'default',
 	[],

main/document/showinframes.php

Spacing +10 added lines, -10 removed lines

@@ -149,8 +149,8 @@ 
         );
     }
 } else {
-    foreach($document_data['parents'] as $document_sub_data) {
-        if (!isset($_GET['createdir']) && $document_sub_data['id'] ==  $document_data['id']) {
+    foreach ($document_data['parents'] as $document_sub_data) {
+        if (!isset($_GET['createdir']) && $document_sub_data['id'] == $document_data['id']) {
             $document_sub_data['document_url'] = '#';
         }
         $interbreadcrumb[] = array(
@@ -180,7 +180,7 @@ 
 }
 $js_glossary_in_documents = '';
 
-$js_glossary_in_documents =	'
+$js_glossary_in_documents = '
   $.frameReady(function(){
    //  $("<div>I am a div courses</div>").prependTo("body");
   }, "top.mainFrame",
@@ -200,7 +200,7 @@ 
 // PDF should be displayed with viewerJS
 $web_odf_supported_files[] = 'pdf';
 if (in_array(strtolower($pathinfo['extension']), $web_odf_supported_files)) {
-    $show_web_odf  = true;
+    $show_web_odf = true;
     /*
     $htmlHeadXtra[] = api_get_js('webodf/webodf.js');
     $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/webodf/webodf.css');
@@ -243,7 +243,7 @@ 
     $htmlHeadXtra[] = api_get_js('highlight/highlight.pack.js');
     $htmlHeadXtra[] = api_get_css(api_get_path(WEB_CSS_PATH).'chat.css');
     $htmlHeadXtra[] = api_get_css(
-        api_get_path(WEB_LIBRARY_PATH) . 'javascript/highlight/styles/github.css'
+        api_get_path(WEB_LIBRARY_PATH).'javascript/highlight/styles/github.css'
     );
     $htmlHeadXtra[] = '
     <script>
@@ -254,7 +254,7 @@ 
 $execute_iframe = true;
 if ($jplayer_supported) {
     $extension = api_strtolower($pathinfo['extension']);
-    if ($extension == 'mp4')  {
+    if ($extension == 'mp4') {
         $extension = 'm4v';
     }
     $js_path = api_get_path(WEB_LIBRARY_PATH).'javascript/';
@@ -295,7 +295,7 @@ 
     $execute_iframe = false;
 }
 
-$is_freemind_available = $pathinfo['extension']=='mm' && api_get_setting('enable_freemind') == 'true';
+$is_freemind_available = $pathinfo['extension'] == 'mm' && api_get_setting('enable_freemind') == 'true';
 if ($is_freemind_available) {
     $execute_iframe = false;
 }
@@ -339,18 +339,18 @@ 
 $file_url_web = $file_url.'?'.api_get_cidreq();
 
 if (in_array(strtolower($pathinfo['extension']), array('html', "htm"))) {
-    echo '<a class="btn btn-default" href="' . $file_url_web . '" target="_blank">' . get_lang('CutPasteLink') . '</a>';
+    echo '<a class="btn btn-default" href="'.$file_url_web.'" target="_blank">'.get_lang('CutPasteLink').'</a>';
 }
 
 if ($show_web_odf) {
     $browser = api_get_navigator();
-    $pdfUrl = api_get_path(WEB_LIBRARY_PATH) . 'javascript/ViewerJS/index.html#' . $file_url;
+    $pdfUrl = api_get_path(WEB_LIBRARY_PATH).'javascript/ViewerJS/index.html#'.$file_url;
     if ($browser['name'] == 'Mozilla' && preg_match('|.*\.pdf|i', $header_file)) {
         $pdfUrl = $file_url;
     }
     echo '<div id="viewerJS">';
     echo '<iframe id="viewerJSContent" frameborder="0" allowfullscreen="allowfullscreen" webkitallowfullscreen style="width:100%;"
-            src="' . $pdfUrl. '">
+            src="' . $pdfUrl.'">
         </iframe>';
     echo '</div>';
 } elseif (!$originIsLearnpath) {

main/document/show_content.php

Spacing +5 added lines, -5 removed lines

@@ -90,12 +90,12 @@
 $file_url_web = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$header_file.'?'.api_get_cidreq();
 $pathinfo = pathinfo($header_file);
 
-if ($pathinfo['extension']=='swf') {
-	$width='83%';
-	$height='83%';
+if ($pathinfo['extension'] == 'swf') {
+	$width = '83%';
+	$height = '83%';
 } else {
-	$width='100%';
-	$height='100%';
+	$width = '100%';
+	$height = '100%';
 }
 
 echo '<iframe border="0" frameborder="0" scrolling="no" style="width:'.$width.'; height:'.$height.';background-color:#ffffff;" id="mainFrame" name="mainFrame" src="'.$file_url_web.'?'.api_get_cidreq().'&amp;rand='.mt_rand(1, 1000).'"></iframe>';