chamilo / chamilo-lms

main/inc/lib/login.lib.php

Indentation +6 added lines, -6 removed lines

@@ -852,14 +852,14 @@ 
             $email = false;
         }
 
-		if ($email) {
-			$condition = "LOWER(email) = '".Database::escape_string($username)."' ";
-		} else {
+        if ($email) {
+            $condition = "LOWER(email) = '".Database::escape_string($username)."' ";
+        } else {
             $condition = "LOWER(username) = '".Database::escape_string($username)."'";
         }
 
-		$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
-		$query = "SELECT 
+        $tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
+        $query = "SELECT 
 		            user_id AS uid, 
 		            lastname AS lastName, 
 		            firstname AS firstName, 
@@ -874,7 +874,7 @@ 
                     auth_source
 				 FROM $tbl_user
 				 WHERE ( $condition AND active = 1) ";
-		$result = Database::query($query);
+        $result = Database::query($query);
         $num_rows = Database::num_rows($result);
         if ($result && $num_rows > 0) {
             return Database::fetch_assoc($result);

plugin/bbb/lib/bbb_api.php

Indentation +403 added lines, -403 removed lines

@@ -44,107 +44,107 @@ 
 
 class BigBlueButtonBN {
 
-	private $_securitySalt;
-	private $_bbbServerBaseUrl;
+    private $_securitySalt;
+    private $_bbbServerBaseUrl;
 
-	/* ___________ General Methods for the BigBlueButton Class __________ */
+    /* ___________ General Methods for the BigBlueButton Class __________ */
 
-	function __construct() {
-	/*
+    function __construct() {
+    /*
 	Establish just our basic elements in the constructor:
 	*/
-		// BASE CONFIGS - set these for your BBB server in config.php and they will
-		// simply flow in here via the constants:
-		$this->_securitySalt 		= CONFIG_SECURITY_SALT;
-		$this->_bbbServerBaseUrl 	= CONFIG_SERVER_BASE_URL;
-	}
-
-	private function _processXmlResponse($url){
-	/*
+        // BASE CONFIGS - set these for your BBB server in config.php and they will
+        // simply flow in here via the constants:
+        $this->_securitySalt 		= CONFIG_SECURITY_SALT;
+        $this->_bbbServerBaseUrl 	= CONFIG_SERVER_BASE_URL;
+    }
+
+    private function _processXmlResponse($url){
+    /*
 	A private utility method used by other public methods to process XML responses.
 	*/
-		if (extension_loaded('curl')) {
-			$ch = curl_init() or die ( curl_error($ch) );
-			$timeout = 10;
-			curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false);
-			curl_setopt( $ch, CURLOPT_URL, $url );
-			curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
-			curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, $timeout);
-			$data = curl_exec( $ch );
-			curl_close( $ch );
-
-			if($data)
-				return (new SimpleXMLElement($data));
-			else
-				return false;
-		}
-		return (simplexml_load_file($url));
-	}
-
-	private function _requiredParam($param) {
-		/* Process required params and throw errors if we don't get values */
-		if ((isset($param)) && ($param != '')) {
-			return $param;
-		}
-		elseif (!isset($param)) {
-			throw new Exception('Missing parameter.');
-		}
-		else {
-			throw new Exception(''.$param.' is required.');
-		}
-	}
-
-	private function _optionalParam($param) {
-		/* Pass most optional params through as set value, or set to '' */
-		/* Don't know if we'll use this one, but let's build it in case. */
-		if ((isset($param)) && ($param != '')) {
-			return $param;
-		}
-		else {
-			$param = '';
-			return $param;
-		}
-	}
-
-	/* __________________ BBB ADMINISTRATION METHODS _________________ */
-	/* The methods in the following section support the following categories of the BBB API:
+        if (extension_loaded('curl')) {
+            $ch = curl_init() or die ( curl_error($ch) );
+            $timeout = 10;
+            curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt( $ch, CURLOPT_URL, $url );
+            curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
+            curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, $timeout);
+            $data = curl_exec( $ch );
+            curl_close( $ch );
+
+            if($data)
+                return (new SimpleXMLElement($data));
+            else
+                return false;
+        }
+        return (simplexml_load_file($url));
+    }
+
+    private function _requiredParam($param) {
+        /* Process required params and throw errors if we don't get values */
+        if ((isset($param)) && ($param != '')) {
+            return $param;
+        }
+        elseif (!isset($param)) {
+            throw new Exception('Missing parameter.');
+        }
+        else {
+            throw new Exception(''.$param.' is required.');
+        }
+    }
+
+    private function _optionalParam($param) {
+        /* Pass most optional params through as set value, or set to '' */
+        /* Don't know if we'll use this one, but let's build it in case. */
+        if ((isset($param)) && ($param != '')) {
+            return $param;
+        }
+        else {
+            $param = '';
+            return $param;
+        }
+    }
+
+    /* __________________ BBB ADMINISTRATION METHODS _________________ */
+    /* The methods in the following section support the following categories of the BBB API:
 	-- create
 	-- join
 	-- end
 	*/
 
-	public function getCreateMeetingUrl($creationParams) {
-		/*
+    public function getCreateMeetingUrl($creationParams) {
+        /*
 		USAGE:
 		(see $creationParams array in createMeetingArray method.)
 		*/
-		$this->_meetingId = $this->_requiredParam($creationParams['meetingId']);
-		$this->_meetingName = $this->_requiredParam($creationParams['meetingName']);
-		// Set up the basic creation URL:
-		$creationUrl = $this->_bbbServerBaseUrl."api/create?";
-		// Add params:
-		$params =
-		'name='.urlencode($this->_meetingName).
-		'&meetingID='.urlencode($this->_meetingId).
-		'&attendeePW='.urlencode($creationParams['attendeePw']).
-		'&moderatorPW='.urlencode($creationParams['moderatorPw']).
-		'&dialNumber='.urlencode($creationParams['dialNumber']).
-		'&voiceBridge='.urlencode($creationParams['voiceBridge']).
-		'&webVoice='.urlencode($creationParams['webVoice']).
-		'&logoutURL='.urlencode($creationParams['logoutUrl']).
-		'&maxParticipants='.urlencode($creationParams['maxParticipants']).
-		'&record='.urlencode($creationParams['record']).
-		'&duration='.urlencode($creationParams['duration']);
-		//'&meta_category='.urlencode($creationParams['meta_category']);
-		$welcomeMessage = $creationParams['welcomeMsg'];
-		if(trim($welcomeMessage))
-			$params .= '&welcome='.urlencode($welcomeMessage);
-		// Return the complete URL:
-		return ( $creationUrl.$params.'&checksum='.sha1("create".$params.$this->_securitySalt) );
-	}
-
-	public function createMeetingWithXmlResponseArray($creationParams) {
-		/*
+        $this->_meetingId = $this->_requiredParam($creationParams['meetingId']);
+        $this->_meetingName = $this->_requiredParam($creationParams['meetingName']);
+        // Set up the basic creation URL:
+        $creationUrl = $this->_bbbServerBaseUrl."api/create?";
+        // Add params:
+        $params =
+        'name='.urlencode($this->_meetingName).
+        '&meetingID='.urlencode($this->_meetingId).
+        '&attendeePW='.urlencode($creationParams['attendeePw']).
+        '&moderatorPW='.urlencode($creationParams['moderatorPw']).
+        '&dialNumber='.urlencode($creationParams['dialNumber']).
+        '&voiceBridge='.urlencode($creationParams['voiceBridge']).
+        '&webVoice='.urlencode($creationParams['webVoice']).
+        '&logoutURL='.urlencode($creationParams['logoutUrl']).
+        '&maxParticipants='.urlencode($creationParams['maxParticipants']).
+        '&record='.urlencode($creationParams['record']).
+        '&duration='.urlencode($creationParams['duration']);
+        //'&meta_category='.urlencode($creationParams['meta_category']);
+        $welcomeMessage = $creationParams['welcomeMsg'];
+        if(trim($welcomeMessage))
+            $params .= '&welcome='.urlencode($welcomeMessage);
+        // Return the complete URL:
+        return ( $creationUrl.$params.'&checksum='.sha1("create".$params.$this->_securitySalt) );
+    }
+
+    public function createMeetingWithXmlResponseArray($creationParams) {
+        /*
 		USAGE:
 		$creationParams = array(
 			'name' => 'Meeting Name',	-- A name for the meeting (or username)
@@ -162,34 +162,34 @@ 
 			'meta_category' => '', 		-- Use to pass additional info to BBB server. See API docs to enable.
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getCreateMeetingURL($creationParams));
+        $xml = $this->_processXmlResponse($this->getCreateMeetingURL($creationParams));
 
         if ($xml) {
-			if($xml->meetingID)
-				return array(
-					'returncode' => $xml->returncode,
-					'message' => $xml->message,
-					'messageKey' => $xml->messageKey,
-					'meetingId' => $xml->meetingID,
-					'attendeePw' => $xml->attendeePW,
-					'moderatorPw' => $xml->moderatorPW,
-					'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded,
-					'createTime' => $xml->createTime
-					);
-			else
-				return array(
-					'returncode' => $xml->returncode,
-					'message' => $xml->message,
-					'messageKey' => $xml->messageKey
-					);
-		}
-		else {
-			return null;
-		}
-	}
-
-	public function getJoinMeetingURL($joinParams) {
-		/*
+            if($xml->meetingID)
+                return array(
+                    'returncode' => $xml->returncode,
+                    'message' => $xml->message,
+                    'messageKey' => $xml->messageKey,
+                    'meetingId' => $xml->meetingID,
+                    'attendeePw' => $xml->attendeePW,
+                    'moderatorPw' => $xml->moderatorPW,
+                    'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded,
+                    'createTime' => $xml->createTime
+                    );
+            else
+                return array(
+                    'returncode' => $xml->returncode,
+                    'message' => $xml->message,
+                    'messageKey' => $xml->messageKey
+                    );
+        }
+        else {
+            return null;
+        }
+    }
+
+    public function getJoinMeetingURL($joinParams) {
+        /*
 		NOTE: At this point, we don't use a corresponding joinMeetingWithXmlResponse here because the API
 		doesn't respond on success, but you can still code that method if you need it. Or, you can take the URL
 		that's returned from this method and simply send your users off to that URL in your code.
@@ -203,249 +203,249 @@ 
 			'webVoiceConf' => ''		-- OPTIONAL - string
 		);
 		*/
-		$this->_meetingId = $this->_requiredParam($joinParams['meetingId']);
-		$this->_username = $this->_requiredParam($joinParams['username']);
-		$this->_password = $this->_requiredParam($joinParams['password']);
-		// Establish the basic join URL:
-		$joinUrl = $this->_bbbServerBaseUrl."api/join?";
-		// Add parameters to the URL:
-		$params =
-		'meetingID='.urlencode($this->_meetingId).
-		'&fullName='.urlencode($this->_username).
-		'&password='.urlencode($this->_password).
-		'&userID='.urlencode($joinParams['userID']).
-		'&webVoiceConf='.urlencode($joinParams['webVoiceConf']);
-		// Only use createTime if we really want to use it. If it's '', then don't pass it:
-		if (((isset($joinParams['createTime'])) && ($joinParams['createTime'] != ''))) {
-			$params .= '&createTime='.urlencode($joinParams['createTime']);
-		}
-		// Return the URL:
-		return ($joinUrl.$params.'&checksum='.sha1("join".$params.$this->_securitySalt));
-	}
-
-	public function getEndMeetingURL($endParams) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($joinParams['meetingId']);
+        $this->_username = $this->_requiredParam($joinParams['username']);
+        $this->_password = $this->_requiredParam($joinParams['password']);
+        // Establish the basic join URL:
+        $joinUrl = $this->_bbbServerBaseUrl."api/join?";
+        // Add parameters to the URL:
+        $params =
+        'meetingID='.urlencode($this->_meetingId).
+        '&fullName='.urlencode($this->_username).
+        '&password='.urlencode($this->_password).
+        '&userID='.urlencode($joinParams['userID']).
+        '&webVoiceConf='.urlencode($joinParams['webVoiceConf']);
+        // Only use createTime if we really want to use it. If it's '', then don't pass it:
+        if (((isset($joinParams['createTime'])) && ($joinParams['createTime'] != ''))) {
+            $params .= '&createTime='.urlencode($joinParams['createTime']);
+        }
+        // Return the URL:
+        return ($joinUrl.$params.'&checksum='.sha1("join".$params.$this->_securitySalt));
+    }
+
+    public function getEndMeetingURL($endParams) {
+        /* USAGE:
 		$endParams = array (
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$this->_meetingId = $this->_requiredParam($endParams['meetingId']);
-		$this->_password = $this->_requiredParam($endParams['password']);
-		$endUrl = $this->_bbbServerBaseUrl."api/end?";
-		$params =
-		'meetingID='.urlencode($this->_meetingId).
-		'&password='.urlencode($this->_password);
-		return ($endUrl.$params.'&checksum='.sha1("end".$params.$this->_securitySalt));
-	}
-
-	public function endMeetingWithXmlResponseArray($endParams) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($endParams['meetingId']);
+        $this->_password = $this->_requiredParam($endParams['password']);
+        $endUrl = $this->_bbbServerBaseUrl."api/end?";
+        $params =
+        'meetingID='.urlencode($this->_meetingId).
+        '&password='.urlencode($this->_password);
+        return ($endUrl.$params.'&checksum='.sha1("end".$params.$this->_securitySalt));
+    }
+
+    public function endMeetingWithXmlResponseArray($endParams) {
+        /* USAGE:
 		$endParams = array (
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getEndMeetingURL($endParams));
-		if ($xml) {
-			return array(
-				'returncode' => $xml->returncode,
-				'message' => $xml->message,
-				'messageKey' => $xml->messageKey
-				);
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	/* __________________ BBB MONITORING METHODS _________________ */
-	/* The methods in the following section support the following categories of the BBB API:
+        $xml = $this->_processXmlResponse($this->getEndMeetingURL($endParams));
+        if ($xml) {
+            return array(
+                'returncode' => $xml->returncode,
+                'message' => $xml->message,
+                'messageKey' => $xml->messageKey
+                );
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    /* __________________ BBB MONITORING METHODS _________________ */
+    /* The methods in the following section support the following categories of the BBB API:
 	-- isMeetingRunning
 	-- getMeetings
 	-- getMeetingInfo
 	*/
 
-	public function getIsMeetingRunningUrl($meetingId) {
-		/* USAGE:
+    public function getIsMeetingRunningUrl($meetingId) {
+        /* USAGE:
 		$meetingId = '1234'		-- REQUIRED - The unique id for the meeting
 		*/
-		$this->_meetingId = $this->_requiredParam($meetingId);
-		$runningUrl = $this->_bbbServerBaseUrl."api/isMeetingRunning?";
-		$params =
-		'meetingID='.urlencode($this->_meetingId);
-		return ($runningUrl.$params.'&checksum='.sha1("isMeetingRunning".$params.$this->_securitySalt));
-	}
-
-	public function isMeetingRunningWithXmlResponseArray($meetingId) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($meetingId);
+        $runningUrl = $this->_bbbServerBaseUrl."api/isMeetingRunning?";
+        $params =
+        'meetingID='.urlencode($this->_meetingId);
+        return ($runningUrl.$params.'&checksum='.sha1("isMeetingRunning".$params.$this->_securitySalt));
+    }
+
+    public function isMeetingRunningWithXmlResponseArray($meetingId) {
+        /* USAGE:
 		$meetingId = '1234'		-- REQUIRED - The unique id for the meeting
 		*/
-		$xml = $this->_processXmlResponse($this->getIsMeetingRunningUrl($meetingId));
-		if($xml) {
-			return array(
-				'returncode' => $xml->returncode,
-				'running' => $xml->running 	// -- Returns true/false.
-				);
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	public function getGetMeetingsUrl() {
-		/* Simply formulate the getMeetings URL
+        $xml = $this->_processXmlResponse($this->getIsMeetingRunningUrl($meetingId));
+        if($xml) {
+            return array(
+                'returncode' => $xml->returncode,
+                'running' => $xml->running 	// -- Returns true/false.
+                );
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    public function getGetMeetingsUrl() {
+        /* Simply formulate the getMeetings URL
 		We do this in a separate function so we have the option to just get this
 		URL and print it if we want for some reason.
 		*/
-		$getMeetingsUrl = $this->_bbbServerBaseUrl."api/getMeetings?checksum=".sha1("getMeetings".$this->_securitySalt);
-		return $getMeetingsUrl;
-	}
+        $getMeetingsUrl = $this->_bbbServerBaseUrl."api/getMeetings?checksum=".sha1("getMeetings".$this->_securitySalt);
+        return $getMeetingsUrl;
+    }
 
-	public function getMeetingsWithXmlResponseArray() {
-		/* USAGE:
+    public function getMeetingsWithXmlResponseArray() {
+        /* USAGE:
 		We don't need to pass any parameters with this one, so we just send the query URL off to BBB
 		and then handle the results that we get in the XML response.
 		*/
-		$xml = $this->_processXmlResponse($this->getGetMeetingsUrl());
-		if($xml) {
-			// If we don't get a success code, stop processing and return just the returncode:
-			if ($xml->returncode != 'SUCCESS') {
-				$result = array(
-					'returncode' => $xml->returncode
-				);
-				return $result;
-			}
-			elseif ($xml->messageKey == 'noMeetings') {
-				/* No meetings on server, so return just this info: */
-				$result = array(
-					'returncode' => $xml->returncode,
-					'messageKey' => $xml->messageKey,
-					'message' => $xml->message
-				);
-				return $result;
-			}
-			else {
-				// In this case, we have success and meetings. First return general response:
-				$result = array(
-					'returncode' => $xml->returncode,
-					'messageKey' => $xml->messageKey,
-					'message' => $xml->message
-				);
-				// Then interate through meeting results and return them as part of the array:
-				foreach ($xml->meetings->meeting as $m) {
-					$result[] = array(
-						'meetingId' => $m->meetingID,
-						'meetingName' => $m->meetingName,
-						'createTime' => $m->createTime,
-						'attendeePw' => $m->attendeePW,
-						'moderatorPw' => $m->moderatorPW,
-						'hasBeenForciblyEnded' => $m->hasBeenForciblyEnded,
-						'running' => $m->running
-						);
-					}
-				return $result;
-			}
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	public function getMeetingInfoUrl($infoParams) {
-		/* USAGE:
+        $xml = $this->_processXmlResponse($this->getGetMeetingsUrl());
+        if($xml) {
+            // If we don't get a success code, stop processing and return just the returncode:
+            if ($xml->returncode != 'SUCCESS') {
+                $result = array(
+                    'returncode' => $xml->returncode
+                );
+                return $result;
+            }
+            elseif ($xml->messageKey == 'noMeetings') {
+                /* No meetings on server, so return just this info: */
+                $result = array(
+                    'returncode' => $xml->returncode,
+                    'messageKey' => $xml->messageKey,
+                    'message' => $xml->message
+                );
+                return $result;
+            }
+            else {
+                // In this case, we have success and meetings. First return general response:
+                $result = array(
+                    'returncode' => $xml->returncode,
+                    'messageKey' => $xml->messageKey,
+                    'message' => $xml->message
+                );
+                // Then interate through meeting results and return them as part of the array:
+                foreach ($xml->meetings->meeting as $m) {
+                    $result[] = array(
+                        'meetingId' => $m->meetingID,
+                        'meetingName' => $m->meetingName,
+                        'createTime' => $m->createTime,
+                        'attendeePw' => $m->attendeePW,
+                        'moderatorPw' => $m->moderatorPW,
+                        'hasBeenForciblyEnded' => $m->hasBeenForciblyEnded,
+                        'running' => $m->running
+                        );
+                    }
+                return $result;
+            }
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    public function getMeetingInfoUrl($infoParams) {
+        /* USAGE:
 		$infoParams = array(
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$this->_meetingId = $this->_requiredParam($infoParams['meetingId']);
-		$this->_password = $this->_requiredParam($infoParams['password']);
-		$infoUrl = $this->_bbbServerBaseUrl."api/getMeetingInfo?";
-		$params =
-		'meetingID='.urlencode($this->_meetingId).
-		'&password='.urlencode($this->_password);
-		return ($infoUrl.$params.'&checksum='.sha1("getMeetingInfo".$params.$this->_securitySalt));
-	}
-
-	public function getMeetingInfoWithXmlResponseArray($infoParams) {
-		/* USAGE:
+        $this->_meetingId = $this->_requiredParam($infoParams['meetingId']);
+        $this->_password = $this->_requiredParam($infoParams['password']);
+        $infoUrl = $this->_bbbServerBaseUrl."api/getMeetingInfo?";
+        $params =
+        'meetingID='.urlencode($this->_meetingId).
+        '&password='.urlencode($this->_password);
+        return ($infoUrl.$params.'&checksum='.sha1("getMeetingInfo".$params.$this->_securitySalt));
+    }
+
+    public function getMeetingInfoWithXmlResponseArray($infoParams) {
+        /* USAGE:
 		$infoParams = array(
 			'meetingId' => '1234',		-- REQUIRED - The unique id for the meeting
 			'password' => 'mp'			-- REQUIRED - The moderator password for the meeting
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getMeetingInfoUrl($infoParams));
-		if($xml) {
-			// If we don't get a success code or messageKey, find out why:
-			if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
-				$result = array(
-					'returncode' => $xml->returncode,
-					'messageKey' => $xml->messageKey,
-					'message' => $xml->message
-				);
-				return $result;
-			}
-			else {
-				// In this case, we have success and meeting info:
-				$result = array(
-					'returncode' => $xml->returncode,
-					'meetingName' => $xml->meetingName,
-					'meetingId' => $xml->meetingID,
-					'createTime' => $xml->createTime,
-					'voiceBridge' => $xml->voiceBridge,
-					'attendeePw' => $xml->attendeePW,
-					'moderatorPw' => $xml->moderatorPW,
-					'running' => $xml->running,
-					'recording' => $xml->recording,
-					'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded,
-					'startTime' => $xml->startTime,
-					'endTime' => $xml->endTime,
-					'participantCount' => $xml->participantCount,
-					'maxUsers' => $xml->maxUsers,
-					'moderatorCount' => $xml->moderatorCount,
-				);
-				// Then interate through attendee results and return them as part of the array:
-				foreach ($xml->attendees->attendee as $a) {
-					$result[] = array(
-						'userId' => $a->userID,
-						'fullName' => $a->fullName,
-						'role' => $a->role
-						);
-					}
-				return $result;
-			}
-		}
-		else {
-			return null;
-		}
-
-	}
-
-	/* __________________ BBB RECORDING METHODS _________________ */
-	/* The methods in the following section support the following categories of the BBB API:
+        $xml = $this->_processXmlResponse($this->getMeetingInfoUrl($infoParams));
+        if($xml) {
+            // If we don't get a success code or messageKey, find out why:
+            if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
+                $result = array(
+                    'returncode' => $xml->returncode,
+                    'messageKey' => $xml->messageKey,
+                    'message' => $xml->message
+                );
+                return $result;
+            }
+            else {
+                // In this case, we have success and meeting info:
+                $result = array(
+                    'returncode' => $xml->returncode,
+                    'meetingName' => $xml->meetingName,
+                    'meetingId' => $xml->meetingID,
+                    'createTime' => $xml->createTime,
+                    'voiceBridge' => $xml->voiceBridge,
+                    'attendeePw' => $xml->attendeePW,
+                    'moderatorPw' => $xml->moderatorPW,
+                    'running' => $xml->running,
+                    'recording' => $xml->recording,
+                    'hasBeenForciblyEnded' => $xml->hasBeenForciblyEnded,
+                    'startTime' => $xml->startTime,
+                    'endTime' => $xml->endTime,
+                    'participantCount' => $xml->participantCount,
+                    'maxUsers' => $xml->maxUsers,
+                    'moderatorCount' => $xml->moderatorCount,
+                );
+                // Then interate through attendee results and return them as part of the array:
+                foreach ($xml->attendees->attendee as $a) {
+                    $result[] = array(
+                        'userId' => $a->userID,
+                        'fullName' => $a->fullName,
+                        'role' => $a->role
+                        );
+                    }
+                return $result;
+            }
+        }
+        else {
+            return null;
+        }
+
+    }
+
+    /* __________________ BBB RECORDING METHODS _________________ */
+    /* The methods in the following section support the following categories of the BBB API:
 	-- getRecordings
 	-- publishRecordings
 	-- deleteRecordings
 	*/
 
-	public function getRecordingsUrl($recordingParams) {
-		/* USAGE:
+    public function getRecordingsUrl($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'meetingId' => '1234',		-- OPTIONAL - comma separate if multiple ids
 		);
 		*/
-		$recordingsUrl = $this->_bbbServerBaseUrl."api/getRecordings?";
-		$params = 'meetingID='.urlencode($recordingParams['meetingId']);
-		return ($recordingsUrl.$params.'&checksum='.sha1("getRecordings".$params.$this->_securitySalt));
+        $recordingsUrl = $this->_bbbServerBaseUrl."api/getRecordings?";
+        $params = 'meetingID='.urlencode($recordingParams['meetingId']);
+        return ($recordingsUrl.$params.'&checksum='.sha1("getRecordings".$params.$this->_securitySalt));
 
-	}
+    }
 
-	public function getRecordingsWithXmlResponseArray($recordingParams) {
-		/* USAGE:
+    public function getRecordingsWithXmlResponseArray($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'meetingId' => '1234',		-- OPTIONAL - comma separate if multiple ids
 		);
@@ -453,121 +453,121 @@ 
 		when creating a meeting, it will kick users out after the duration. Should
 		probably be required in user code when 'recording' is set to true.
 		*/
-		$xml = $this->_processXmlResponse($this->getRecordingsUrl($recordingParams));
-		if($xml) {
-			// If we don't get a success code or messageKey, find out why:
-			if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
-				$result = array(
-					'returncode' => $xml->returncode,
-					'messageKey' => $xml->messageKey,
-					'message' => $xml->message
-				);
-				return $result;
-			}
-			else {
-				// In this case, we have success and recording info:
-				$result = array(
-					'returncode' => $xml->returncode,
-					'messageKey' => $xml->messageKey,
-					'message' => $xml->message
-				);
-
-				foreach ($xml->recordings->recording as $r) {
-					$result[] = array(
-						'recordId' => $r->recordID,
-						'meetingId' => $r->meetingID,
-						'name' => $r->name,
-						'published' => $r->published,
-						'startTime' => $r->startTime,
-						'endTime' => $r->endTime,
-						'playbackFormatType' => $r->playback->format->type,
-						'playbackFormatUrl' => $r->playback->format->url,
-						'playbackFormatLength' => $r->playback->format->length,
-						'metadataTitle' => $r->metadata->title,
-						'metadataSubject' => $r->metadata->subject,
-						'metadataDescription' => $r->metadata->description,
-						'metadataCreator' => $r->metadata->creator,
-						'metadataContributor' => $r->metadata->contributor,
-						'metadataLanguage' => $r->metadata->language,
-						// Add more here as needed for your app depending on your
-						// use of metadata when creating recordings.
-						);
-					}
-				return $result;
-			}
-		}
-		else {
-			return null;
-		}
-	}
-
-	public function getPublishRecordingsUrl($recordingParams) {
-		/* USAGE:
+        $xml = $this->_processXmlResponse($this->getRecordingsUrl($recordingParams));
+        if($xml) {
+            // If we don't get a success code or messageKey, find out why:
+            if (($xml->returncode != 'SUCCESS') || ($xml->messageKey == null)) {
+                $result = array(
+                    'returncode' => $xml->returncode,
+                    'messageKey' => $xml->messageKey,
+                    'message' => $xml->message
+                );
+                return $result;
+            }
+            else {
+                // In this case, we have success and recording info:
+                $result = array(
+                    'returncode' => $xml->returncode,
+                    'messageKey' => $xml->messageKey,
+                    'message' => $xml->message
+                );
+
+                foreach ($xml->recordings->recording as $r) {
+                    $result[] = array(
+                        'recordId' => $r->recordID,
+                        'meetingId' => $r->meetingID,
+                        'name' => $r->name,
+                        'published' => $r->published,
+                        'startTime' => $r->startTime,
+                        'endTime' => $r->endTime,
+                        'playbackFormatType' => $r->playback->format->type,
+                        'playbackFormatUrl' => $r->playback->format->url,
+                        'playbackFormatLength' => $r->playback->format->length,
+                        'metadataTitle' => $r->metadata->title,
+                        'metadataSubject' => $r->metadata->subject,
+                        'metadataDescription' => $r->metadata->description,
+                        'metadataCreator' => $r->metadata->creator,
+                        'metadataContributor' => $r->metadata->contributor,
+                        'metadataLanguage' => $r->metadata->language,
+                        // Add more here as needed for your app depending on your
+                        // use of metadata when creating recordings.
+                        );
+                    }
+                return $result;
+            }
+        }
+        else {
+            return null;
+        }
+    }
+
+    public function getPublishRecordingsUrl($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 			'publish' => 'true',		-- REQUIRED - boolean: true/false
 		);
 		*/
-		$recordingsUrl = $this->_bbbServerBaseUrl."api/publishRecordings?";
-		$params =
-		'recordID='.urlencode($recordingParams['recordId']).
-		'&publish='.urlencode($recordingParams['publish']);
-		return ($recordingsUrl.$params.'&checksum='.sha1("publishRecordings".$params.$this->_securitySalt));
+        $recordingsUrl = $this->_bbbServerBaseUrl."api/publishRecordings?";
+        $params =
+        'recordID='.urlencode($recordingParams['recordId']).
+        '&publish='.urlencode($recordingParams['publish']);
+        return ($recordingsUrl.$params.'&checksum='.sha1("publishRecordings".$params.$this->_securitySalt));
 
-	}
+    }
 
-	public function publishRecordingsWithXmlResponseArray($recordingParams) {
-		/* USAGE:
+    public function publishRecordingsWithXmlResponseArray($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 			'publish' => 'true',		-- REQUIRED - boolean: true/false
 		);
 		*/
-		$xml = $this->_processXmlResponse($this->getPublishRecordingsUrl($recordingParams));
-		if($xml) {
-			return array(
-				'returncode' => $xml->returncode,
-				'published' => $xml->published 	// -- Returns true/false.
-				);
-		}
-		else {
-			return null;
-		}
-
-
-	}
-
-	public function getDeleteRecordingsUrl($recordingParams) {
-		/* USAGE:
+        $xml = $this->_processXmlResponse($this->getPublishRecordingsUrl($recordingParams));
+        if($xml) {
+            return array(
+                'returncode' => $xml->returncode,
+                'published' => $xml->published 	// -- Returns true/false.
+                );
+        }
+        else {
+            return null;
+        }
+
+
+    }
+
+    public function getDeleteRecordingsUrl($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 		);
 		*/
-		$recordingsUrl = $this->_bbbServerBaseUrl."api/deleteRecordings?";
-		$params =
-		'recordID='.urlencode($recordingParams['recordId']);
-		return ($recordingsUrl.$params.'&checksum='.sha1("deleteRecordings".$params.$this->_securitySalt));
-	}
-
-	public function deleteRecordingsWithXmlResponseArray($recordingParams) {
-		/* USAGE:
+        $recordingsUrl = $this->_bbbServerBaseUrl."api/deleteRecordings?";
+        $params =
+        'recordID='.urlencode($recordingParams['recordId']);
+        return ($recordingsUrl.$params.'&checksum='.sha1("deleteRecordings".$params.$this->_securitySalt));
+    }
+
+    public function deleteRecordingsWithXmlResponseArray($recordingParams) {
+        /* USAGE:
 		$recordingParams = array(
 			'recordId' => '1234',		-- REQUIRED - comma separate if multiple ids
 		);
 		*/
 
-		$xml = $this->_processXmlResponse($this->getDeleteRecordingsUrl($recordingParams));
-		if($xml) {
-			return array(
-				'returncode' => $xml->returncode,
-				'deleted' => $xml->deleted 	// -- Returns true/false.
-				);
-		}
-		else {
-			return null;
-		}
-
-	}
+        $xml = $this->_processXmlResponse($this->getDeleteRecordingsUrl($recordingParams));
+        if($xml) {
+            return array(
+                'returncode' => $xml->returncode,
+                'deleted' => $xml->deleted 	// -- Returns true/false.
+                );
+        }
+        else {
+            return null;
+        }
+
+    }
 
 
 

main/user/add_users_to_session.php

Indentation +106 added lines, -106 removed lines

@@ -49,29 +49,29 @@ 
     $extra_field_list = UserManager::get_extra_fields();
     $new_field_list = array();
     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 ) {
+        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 ) {
                 $new_field_list[] = array(
                     'name' => $extra_field[3],
                     'variable' => $extra_field[1],
                     'data' => $extra_field[9],
                 );
-    		}
-    	}
+            }
+        }
     }
 
     function search_users($needle, $type)
     {
-    	global $id_session;
+        global $id_session;
 
         $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
         $tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
 
-    	$xajax_response = new xajaxResponse();
-    	$return = '';
+        $xajax_response = new xajaxResponse();
+        $return = '';
 
-    	if (!empty($needle) && !empty($type)) {
+        if (!empty($needle) && !empty($type)) {
 
             //normal behaviour
             if ($type == 'any_session' && $needle == 'false')  {
@@ -79,32 +79,32 @@ 
                 $needle = '';
             }
 
-    		// xajax send utf8 datas... datas in db can be non-utf8 datas
-    		$charset = api_get_system_encoding();
-    		$needle = Database::escape_string($needle);
-    		$needle = api_convert_encoding($needle, $charset, 'utf-8');
+            // xajax send utf8 datas... datas in db can be non-utf8 datas
+            $charset = api_get_system_encoding();
+            $needle = Database::escape_string($needle);
+            $needle = api_convert_encoding($needle, $charset, 'utf-8');
 
-    		$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
-    		$cond_user_id = '';
+            $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
+            $cond_user_id = '';
 
             //Only for 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
-        			$sql = 'SELECT user_id FROM '.$tbl_session_rel_user.'
+                if (!empty($id_session)) {
+                    $id_session = intval($id_session);
+                    // check id_user from session_rel_user table
+                    $sql = 'SELECT user_id FROM '.$tbl_session_rel_user.'
         			        WHERE session_id ="'.$id_session.'" AND relation_type<>'.SESSION_RELATION_TYPE_RRHH.' ';
-        			$res = Database::query($sql);
-        			$user_ids = array();
-        			if (Database::num_rows($res) > 0) {
-        				while ($row = Database::fetch_row($res)) {
-        					$user_ids[] = (int)$row[0];
-        				}
-        			}
-        			if (count($user_ids) > 0) {
-        				$cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')';
-        			}
-        		}
+                    $res = Database::query($sql);
+                    $user_ids = array();
+                    if (Database::num_rows($res) > 0) {
+                        while ($row = Database::fetch_row($res)) {
+                            $user_ids[] = (int)$row[0];
+                        }
+                    }
+                    if (count($user_ids) > 0) {
+                        $cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')';
+                    }
+                }
             }
 
             switch ($type) {
@@ -136,11 +136,11 @@ 
                                 user.status <> 6 '.$cond_user_id.
                             $order_clause;
                     break;
-    		}
-    		if (api_is_multiple_url_enabled()) {
-    			$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) {
+            }
+            if (api_is_multiple_url_enabled()) {
+                $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) {
                         case 'single':
                             $sql = 'SELECT user.user_id, username, lastname, firstname
@@ -178,36 +178,36 @@ 
                                         user.status<>6 '.$cond_user_id.
                             $order_clause;
                             break;
-    				}
-    			}
-    		}
+                    }
+                }
+            }
 
-    		$rs = Database::query($sql);
+            $rs = Database::query($sql);
             $i=0;
-    		if ($type == 'single') {
-    			while ($user = Database::fetch_array($rs)) {
-    	            $i++;
-    	            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 {
-    	            	$return .= '...<br />';
-    	            }
-    			}
-
-    			$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;">';
-    			while ($user = Database :: fetch_array($rs)) {
-    				$person_name = api_get_person_name($user['firstname'], $user['lastname']);
-    	            $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));
-    		}
-    	}
-    	return $xajax_response;
+            if ($type == 'single') {
+                while ($user = Database::fetch_array($rs)) {
+                    $i++;
+                    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 {
+                        $return .= '...<br />';
+                    }
+                }
+
+                $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;">';
+                while ($user = Database :: fetch_array($rs)) {
+                    $person_name = api_get_person_name($user['firstname'], $user['lastname']);
+                    $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));
+            }
+        }
+        return $xajax_response;
     }
 
     $xajax -> processRequests();
@@ -343,8 +343,8 @@ 
 
         if ($use_extra_fields) {
             $final_result = array();
-           	if (count($extra_field_result)>1) {
-    	    for($i=0;$i<count($extra_field_result)-1;$i++) {
+                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],
@@ -422,7 +422,7 @@ 
                     'un' => $user['username']
                 );
                 unset($users[$uid]);
-    	}
+        }
         }
         unset($users); //clean to free memory
 
@@ -467,13 +467,13 @@ 
     }
 
     if ($add_type == 'multiple') {
-    	$link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
-    	$link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
+        $link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
+        $link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
     } else {
-    	$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_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; ?>
@@ -482,30 +482,30 @@ 
     <?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 ) {
-    			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='';
-    					if (isset($_POST[$varname])) {
-    						if ($_POST[$varname] == $option[1]) {
-    							$checked = 'selected="true"';
-    						}
-    					}
-    					echo '<option value="'.$option[1].'" '.$checked.'>'.$option[1].'</option>';
-    				}
-    				echo '</select>';
-    				echo '&nbsp;&nbsp;';
-    			}
-    			echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
-    			echo '<br /><br />';
-    		}
-    	}
+        if (is_array($extra_field_list)) {
+            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='';
+                        if (isset($_POST[$varname])) {
+                            if ($_POST[$varname] == $option[1]) {
+                                $checked = 'selected="true"';
+                            }
+                        }
+                        echo '<option value="'.$option[1].'" '.$checked.'>'.$option[1].'</option>';
+                    }
+                    echo '</select>';
+                    echo '&nbsp;&nbsp;';
+                }
+                echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
+                echo '<br /><br />';
+            }
+        }
     }
     ?>
 
@@ -514,7 +514,7 @@ 
 
     <?php
     if (!empty($errorMsg)) {
-    	Display::display_normal_message($errorMsg); //main API
+        Display::display_normal_message($errorMsg); //main API
     }
     ?>
     <div class="row">
@@ -535,7 +535,7 @@ 
                 <div id="content_source">
                 <?php
                 if (!($add_type == 'multiple')) {
-                  ?>
+                    ?>
                   <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
                   <div id="ajax_list_users_single"></div>
                   <?php
@@ -544,12 +544,12 @@ 
                 <div id="ajax_list_users_multiple">
                 <select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" class="span5">
                   <?php
-                  foreach ($nosessionUsersList as $uid => $enreg) {
-                  ?>
+                    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>
                   <?php
-                  }
-                  ?>
+                    }
+                    ?>
                 </select>
                 </div>
                     <input type="checkbox" onchange="checked_in_no_session(this.checked);" name="user_with_any_session" id="user_with_any_session_id">
@@ -557,7 +557,7 @@ 
                 <?php
                 }
                 unset($nosessionUsersList);
-               ?>
+                ?>
             </div>
         </div>
 
@@ -584,13 +584,13 @@ 
             <br />
             <br />
     		<?php
-    		if (isset($_GET['add'])) {
-    			echo '<button class="btn btn-primary" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
+            if (isset($_GET['add'])) {
+                echo '<button class="btn btn-primary" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
             } else {
                 //@todo see that the call to "valide()" doesn't duplicate the onsubmit of the form (necessary to avoid delete on "enter" key pressed)
-    			echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
+                echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
             }
-    		?>
+            ?>
         </div>
         <div class="span5">
             <div class="multiple_select_header">

main/inc/lib/fileManage.lib.php

Indentation +185 added lines, -186 removed lines

@@ -170,37 +170,37 @@ 
  */
 function my_rename($file_path, $new_file_name) {
 
-	$save_dir = getcwd();
-	$path = dirname($file_path);
-	$old_file_name = basename($file_path);
-	$new_file_name = api_replace_dangerous_char($new_file_name);
-
-	// If no extension, take the old one
-	if ((strpos($new_file_name, '.') === false) && ($dotpos = strrpos($old_file_name, '.'))) {
-		$new_file_name .= substr($old_file_name, $dotpos);
-	}
-
-	// Note: still possible: 'xx.yy' -rename-> '.yy' -rename-> 'zz'
-	// This is useful for folder names, where otherwise '.' would be sticky
-
-	// Extension PHP is not allowed, change to PHPS
-	$new_file_name = php2phps($new_file_name);
-
-	if ($new_file_name == $old_file_name) {
-		return $old_file_name;
-	}
-
-	if (strtolower($new_file_name) != strtolower($old_file_name) && check_name_exist($path.'/'.$new_file_name)) {
-		return false;
-	}
-	// On a Windows server, it would be better not to do the above check
-	// because it succeeds for some new names resembling the old name.
-	// But on Unix/Linux the check must be done because rename overwrites.
-
-	chdir($path);
-	$res = rename($old_file_name, $new_file_name) ? $new_file_name : false;
-	chdir($save_dir);
-	return $res;
+    $save_dir = getcwd();
+    $path = dirname($file_path);
+    $old_file_name = basename($file_path);
+    $new_file_name = api_replace_dangerous_char($new_file_name);
+
+    // If no extension, take the old one
+    if ((strpos($new_file_name, '.') === false) && ($dotpos = strrpos($old_file_name, '.'))) {
+        $new_file_name .= substr($old_file_name, $dotpos);
+    }
+
+    // Note: still possible: 'xx.yy' -rename-> '.yy' -rename-> 'zz'
+    // This is useful for folder names, where otherwise '.' would be sticky
+
+    // Extension PHP is not allowed, change to PHPS
+    $new_file_name = php2phps($new_file_name);
+
+    if ($new_file_name == $old_file_name) {
+        return $old_file_name;
+    }
+
+    if (strtolower($new_file_name) != strtolower($old_file_name) && check_name_exist($path.'/'.$new_file_name)) {
+        return false;
+    }
+    // On a Windows server, it would be better not to do the above check
+    // because it succeeds for some new names resembling the old name.
+    // But on Unix/Linux the check must be done because rename overwrites.
+
+    chdir($path);
+    $res = rename($old_file_name, $new_file_name) ? $new_file_name : false;
+    chdir($save_dir);
+    return $res;
 }
 
 /**
@@ -217,38 +217,38 @@ 
  */
 function move($source, $target, $forceMove = false, $moveContent = false)
 {
-	if (check_name_exist($source)) {
-		$file_name = basename($source);
+    if (check_name_exist($source)) {
+        $file_name = basename($source);
         $isWindowsOS = api_is_windows_os();
         $canExec = function_exists('exec');
 
-		/* File case */
-		if (is_file($source)) {
-			if ($forceMove && !$isWindowsOS && $canExec) {
-				exec('mv ' . $source . ' ' . $target . '/' . $file_name);
-			} else {
-				copy($source, $target . '/' . $file_name);
-				unlink($source);
-			}
-			return true;
-		} elseif (is_dir($source)) {
-			/* Directory */
-			if ($forceMove && !$isWindowsOS && $canExec) {
-				if ($moveContent) {
-					$base = basename($source);
-					exec('mv '.$source.'/* '.$target.$base.'/');
-					exec('rm -rf '.$source);
-				} else {
-					exec('mv $source $target');
-				}
-			} else {
-				copyDirTo($source, $target);
-			}
-			return true;
-		}
-	} else {
-		return false;
-	}
+        /* File case */
+        if (is_file($source)) {
+            if ($forceMove && !$isWindowsOS && $canExec) {
+                exec('mv ' . $source . ' ' . $target . '/' . $file_name);
+            } else {
+                copy($source, $target . '/' . $file_name);
+                unlink($source);
+            }
+            return true;
+        } elseif (is_dir($source)) {
+            /* Directory */
+            if ($forceMove && !$isWindowsOS && $canExec) {
+                if ($moveContent) {
+                    $base = basename($source);
+                    exec('mv '.$source.'/* '.$target.$base.'/');
+                    exec('rm -rf '.$source);
+                } else {
+                    exec('mv $source $target');
+                }
+            } else {
+                copyDirTo($source, $target);
+            }
+            return true;
+        }
+    } else {
+        return false;
+    }
 }
 
 /**
@@ -279,8 +279,8 @@ 
  * @param 	string	$filename 		filename
  */
 function getextension($filename) {
-	$bouts = explode('.', $filename);
-	return array(array_pop($bouts), implode('.', $bouts));
+    $bouts = explode('.', $filename);
+    return array(array_pop($bouts), implode('.', $bouts));
 }
 
 /**
@@ -291,19 +291,19 @@ 
  * @param 	boolean $recursive if true , include subdir in total
  */
 function dirsize($root, $recursive = true) {
-	$dir = @opendir($root);
-	$size = 0;
-	while ($file = @readdir($dir)) {
-		if (!in_array($file, array('.', '..'))) {
-			if (is_dir($root.'/'.$file)) {
-				$size += $recursive ? dirsize($root.'/'.$file) : 0;
-			} else {
-				$size += @filesize($root.'/'.$file);
-			}
-		}
-	}
-	@closedir($dir);
-	return $size;
+    $dir = @opendir($root);
+    $size = 0;
+    while ($file = @readdir($dir)) {
+        if (!in_array($file, array('.', '..'))) {
+            if (is_dir($root.'/'.$file)) {
+                $size += $recursive ? dirsize($root.'/'.$file) : 0;
+            } else {
+                $size += @filesize($root.'/'.$file);
+            }
+        }
+    }
+    @closedir($dir);
+    return $size;
 }
 
 /*	CLASS FileManager */
@@ -322,7 +322,7 @@ 
 */
 class FileManager
 {
-	/**
+    /**
 		Returns a list of all directories, except the base dir,
 		of the current course. This function uses recursion.
 
@@ -330,131 +330,130 @@ 
 
 		@author Roan Embrechts
 		@version 1.0.1
-	*/
-	function list_all_directories($path)
+     */
+    function list_all_directories($path)
     {
-		$result_array = array();
-		if (is_dir($path)) {
-			$save_dir = getcwd();
-			chdir($path);
-			$handle = opendir($path);
-			while ($element = readdir($handle)) {
-				if ($element == '.' || $element == '..') continue;
+        $result_array = array();
+        if (is_dir($path)) {
+            $save_dir = getcwd();
+            chdir($path);
+            $handle = opendir($path);
+            while ($element = readdir($handle)) {
+                if ($element == '.' || $element == '..') continue;
                 // Skip the current and parent directories
-				if (is_dir($element)) {
-					$dir_array[] = $path.'/'.$element;
-				}
-			}
-			closedir($handle);
-			// Recursive operation if subdirectories exist
-			$dir_number = sizeof($dir_array);
-			if ($dir_number > 0) {
-				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
-					}
-				}
-			}
-			$result_array  =  $dir_array;
-			chdir($save_dir) ;
-		}
-		return $result_array ;
-	}
-
-	/**
+                if (is_dir($element)) {
+                    $dir_array[] = $path.'/'.$element;
+                }
+            }
+            closedir($handle);
+            // Recursive operation if subdirectories exist
+            $dir_number = sizeof($dir_array);
+            if ($dir_number > 0) {
+                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
+                    }
+                }
+            }
+            $result_array  =  $dir_array;
+            chdir($save_dir) ;
+        }
+        return $result_array ;
+    }
+
+    /**
 		This function receives a list of directories.
 		It returns a list of all files in these directories
 
 		@author Roan Embrechts
 		@version 1.0
-	*/
-	function list_all_files($dir_array)
+     */
+    function list_all_files($dir_array)
     {
-		$element_array = array();
-		if (is_dir($dir_array)) {
-
-			$save_dir = getcwd();
-			foreach ($dir_array as $directory) {
-				chdir($directory);
-				$handle = opendir($directory);
-			   	while ($element = readdir($handle)) {
-					if ($element == '.' || $element == '..' || $element == '.htaccess') continue;
+        $element_array = array();
+        if (is_dir($dir_array)) {
+
+            $save_dir = getcwd();
+            foreach ($dir_array as $directory) {
+                chdir($directory);
+                $handle = opendir($directory);
+                    while ($element = readdir($handle)) {
+                    if ($element == '.' || $element == '..' || $element == '.htaccess') continue;
                     // Skip the current and parent directories
-					if (!is_dir($element)) {
-						$element_array[] = $directory.'/'.$element;
-					}
-				}
-				closedir($handle);
-				chdir('..');
-				chdir($save_dir);
-			}
-		}
-
-		return $element_array;
-	}
-
-	/**
+                    if (!is_dir($element)) {
+                        $element_array[] = $directory.'/'.$element;
+                    }
+                }
+                closedir($handle);
+                chdir('..');
+                chdir($save_dir);
+            }
+        }
+
+        return $element_array;
+    }
+
+    /**
 		Loads contents of file $filename into memory and returns them as a string.
 		Function kept for compatibility with older PHP versions.
 		Function is binary safe (is needed on Windows)
-	*/
-	function compat_load_file($file_name)
+     */
+    function compat_load_file($file_name)
     {
-		$buffer = '';
-		if (file_exists($file_name)) {
-			$fp = fopen($file_name, 'rb');
-			$buffer = fread ($fp, filesize($file_name));
-			fclose ($fp);
-		}
-		return $buffer;
-	}
-
-	/**
-	 * Adds file/folder to document table in database
-	 * improvement from set_default_settings (see below):
-	 * take all info from function parameters
-	 * no global variables needed
-	 *
-	 * NOTE $glued_table should already have backticks around it
-	 * (get it from the database library, and it is done automatically)
-	 *
-	 * @param	path, filename, filetype,
-				$glued_table, default_visibility
+        $buffer = '';
+        if (file_exists($file_name)) {
+            $fp = fopen($file_name, 'rb');
+            $buffer = fread ($fp, filesize($file_name));
+            fclose ($fp);
+        }
+        return $buffer;
+    }
 
-	 * action:	Adds an entry to the document table with the default settings.
-	 * @author	Olivier Cauberghe <olivier.cauberghe@ugent.be>
-	 * @author	Roan Embrechts
-	 * @version 1.2
-	 */
-	function set_default_settings($upload_path, $filename, $filetype = 'file', $glued_table, $default_visibility = 'v')
+    /**
+     * Adds file/folder to document table in database
+     * improvement from set_default_settings (see below):
+     * take all info from function parameters
+     * no global variables needed
+     *
+     * NOTE $glued_table should already have backticks around it
+     * (get it from the database library, and it is done automatically)
+     *
+     * @param	path, filename, filetype,
+				$glued_table, default_visibility
+     * action:	Adds an entry to the document table with the default settings.
+     * @author	Olivier Cauberghe <olivier.cauberghe@ugent.be>
+     * @author	Roan Embrechts
+     * @version 1.2
+     */
+    function set_default_settings($upload_path, $filename, $filetype = 'file', $glued_table, $default_visibility = 'v')
     {
-		if (!$default_visibility) $default_visibility = 'v';
-
-		// Make sure path is not wrongly formed
-		$upload_path = !empty($upload_path) ? "/$upload_path" : '';
-
-		$endchar = substr($filename, strlen($filename) - 1, 1);
-		if ($endchar == "\\" || $endchar == '/') {
-			$filename = substr($filename, 0, strlen($filename) - 1);
-		}
-
-		$full_file_name = $upload_path.'/'.$filename;
-		$full_file_name = str_replace("//", '/', $full_file_name);
-
-		$sql_query = "SELECT count(*) as number_existing FROM $glued_table WHERE path='$full_file_name'";
-		$sql_result = Database::query($sql_query);
-		$result = Database::fetch_array($sql_result);
-		// Determine which query to execute
-		if ($result['number_existing'] > 0) {
-			// Entry exists, update
-			$query = "UPDATE $glued_table SET path='$full_file_name',visibility='$default_visibility', filetype='$filetype'
+        if (!$default_visibility) $default_visibility = 'v';
+
+        // Make sure path is not wrongly formed
+        $upload_path = !empty($upload_path) ? "/$upload_path" : '';
+
+        $endchar = substr($filename, strlen($filename) - 1, 1);
+        if ($endchar == "\\" || $endchar == '/') {
+            $filename = substr($filename, 0, strlen($filename) - 1);
+        }
+
+        $full_file_name = $upload_path.'/'.$filename;
+        $full_file_name = str_replace("//", '/', $full_file_name);
+
+        $sql_query = "SELECT count(*) as number_existing FROM $glued_table WHERE path='$full_file_name'";
+        $sql_result = Database::query($sql_query);
+        $result = Database::fetch_array($sql_result);
+        // Determine which query to execute
+        if ($result['number_existing'] > 0) {
+            // Entry exists, update
+            $query = "UPDATE $glued_table SET path='$full_file_name',visibility='$default_visibility', filetype='$filetype'
 			          WHERE path='$full_file_name'";
-		} else {
-			// No entry exists, create new one
-			$query = "INSERT INTO $glued_table (path,visibility,filetype)
+        } else {
+            // No entry exists, create new one
+            $query = "INSERT INTO $glued_table (path,visibility,filetype)
 			          VALUES ('$full_file_name','$default_visibility','$filetype')";
-		}
-		Database::query($query);
-	}
+        }
+        Database::query($query);
+    }
 }

main/inc/lib/formvalidator/Element/SelectLanguage.php

Indentation +18 added lines, -18 removed lines

@@ -7,22 +7,22 @@
  */
 class SelectLanguage extends HTML_QuickForm_select
 {
-	/**
-	 * Class constructor
-	 */
-	public function __construct($elementName = null, $elementLabel = null, $options = null, $attributes = null)
-	{
-		parent::__construct($elementName, $elementLabel, $options, $attributes);
-		// Get all languages
-		$languages = api_get_languages();
-		$this->_options = array();
-		$this->_values = array();
-		foreach ($languages['name'] as $index => $name) {
-			if ($languages['folder'][$index] == api_get_setting('platformLanguage')) {
-				$this->addOption($name, $languages['folder'][$index], array('selected'=>'selected'));
-			} else {
-				$this->addOption($name, $languages['folder'][$index]);
-			}
-		}
-	}
+    /**
+     * Class constructor
+     */
+    public function __construct($elementName = null, $elementLabel = null, $options = null, $attributes = null)
+    {
+        parent::__construct($elementName, $elementLabel, $options, $attributes);
+        // Get all languages
+        $languages = api_get_languages();
+        $this->_options = array();
+        $this->_values = array();
+        foreach ($languages['name'] as $index => $name) {
+            if ($languages['folder'][$index] == api_get_setting('platformLanguage')) {
+                $this->addOption($name, $languages['folder'][$index], array('selected'=>'selected'));
+            } else {
+                $this->addOption($name, $languages['folder'][$index]);
+            }
+        }
+    }
 }

main/document/record_audio.php

Indentation +43 added lines, -43 removed lines

@@ -18,11 +18,11 @@ 
 
 $document_data = DocumentManager::get_document_data_by_id($_GET['id'], api_get_course_id(), true);
 if (empty($document_data)) {
-	if (api_is_in_group()) {
-		$group_properties   = GroupManager::get_group_properties(api_get_group_id());
-		$document_id        = DocumentManager::get_document_id(api_get_course_info(), $group_properties['directory']);
-		$document_data      = DocumentManager::get_document_data_by_id($document_id, api_get_course_id());
-	}
+    if (api_is_in_group()) {
+        $group_properties   = GroupManager::get_group_properties(api_get_group_id());
+        $document_id        = DocumentManager::get_document_id(api_get_course_info(), $group_properties['directory']);
+        $document_data      = DocumentManager::get_document_data_by_id($document_id, api_get_course_id());
+    }
 }
 
 $document_id = $document_data['id'];
@@ -31,7 +31,7 @@ 
 //make some vars
 $wamidir=$dir;
 if($wamidir=="/"){
-	$wamidir="";
+    $wamidir="";
 }
 $wamiurlplay = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$wamidir."/";
 $groupId = api_get_group_id();
@@ -41,48 +41,48 @@ 
 // Please, do not modify this dirname formatting
 
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 //groups //TODO: clean
 if (!empty($groupId)) {
-	$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
-	$noPHP_SELF = true;
-	$group = GroupManager :: get_group_properties($groupId);
-	$path = explode('/', $dir);
-	if ('/'.$path[1] != $group['directory']) {
-		api_not_allowed(true);
-	}
+    $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);
+    if ('/'.$path[1] != $group['directory']) {
+        api_not_allowed(true);
+    }
 }
 
 $interbreadcrumb[] = array("url" => "./document.php?id=".$document_id.'&'.api_get_cidreq(), "name" => get_lang('Documents'));
 
 if (!$is_allowed_in_course) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 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()))) {
-	api_not_allowed(true);
+    DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
+    api_not_allowed(true);
 }
 
 /*	Header */
@@ -90,26 +90,26 @@ 
 
 $display_dir = $dir;
 if (isset ($group)) {
-	$display_dir = explode('/', $dir);
-	unset ($display_dir[0]);
-	unset ($display_dir[1]);
-	$display_dir = implode('/', $display_dir);
+    $display_dir = explode('/', $dir);
+    unset ($display_dir[0]);
+    unset ($display_dir[1]);
+    $display_dir = implode('/', $display_dir);
 }
 
 // Interbreadcrumb for the current directory root path
 $counter = 0;
 if (isset($document_data['parents'])) {
-	foreach($document_data['parents'] as $document_sub_data) {
-		//fixing double group folder in breadcrumb
-		if (api_get_group_id()) {
-			if ($counter == 0) {
-				$counter++;
-				continue;
-			}
-		}
-		$interbreadcrumb[] = array('url' => $document_sub_data['document_url'], 'name' => $document_sub_data['title']);
-		$counter++;
-	}
+    foreach($document_data['parents'] as $document_sub_data) {
+        //fixing double group folder in breadcrumb
+        if (api_get_group_id()) {
+            if ($counter == 0) {
+                $counter++;
+                continue;
+            }
+        }
+        $interbreadcrumb[] = array('url' => $document_sub_data['document_url'], 'name' => $document_sub_data['title']);
+        $counter++;
+    }
 }
 
 //make some vars
@@ -121,12 +121,12 @@ 
 $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",
-	'arrow-left',
-	'default',
-	[],
-	false
+    get_lang('BackTo') . ' ' . get_lang('DocumentsOverview'),
+    'document.php?' . api_get_cidreq() . "&id=$document_id",
+    'arrow-left',
+    'default',
+    [],
+    false
 );
 
 $template = new Template($nameTools);

main/document/show_content.php

Indentation +4 added lines, -4 removed lines

@@ -91,11 +91,11 @@
 $pathinfo = pathinfo($header_file);
 
 if ($pathinfo['extension']=='swf') {
-	$width='83%';
-	$height='83%';
+    $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>';

main/admin/configure_homepage.php

Indentation +849 added lines, -849 removed lines

@@ -17,35 +17,35 @@ 
  */
 function home_tabs($file_logged_in)
 {
-	$post = strpos($file_logged_in, "_logged_in");
-	if ($post !== false) {
-		$file_logged_out = str_replace('_logged_in','', $file_logged_in);
-		//variables initialization
-		$data_logged_out = array();
-		$data_logged_in  = array();
-
-		//we read the file with all links
-		$file = file($file_logged_in);
-		foreach ($file as $line) {
-			$line = str_replace("\n", '',$line);
-			//not logged user only sees public links
-			if (!preg_match('/::private/',$line)) {
-				$data_logged_out[] = $line;
-			}
-			//logged user only sees all links
-			$data_logged_in[] = $line;
-		}
-		//tabs file for logged out users
-		if (file_exists($file_logged_out)) {
-			$fp = fopen($file_logged_out, 'w');
-			fputs($fp, implode("\n", $data_logged_out));
-			fclose($fp);
-		}
-		//tabs file for logged in users
-		$fp = fopen($file_logged_in, 'w');
-		fputs($fp, implode("\n", $data_logged_in));
-		fclose($fp);
-	}
+    $post = strpos($file_logged_in, "_logged_in");
+    if ($post !== false) {
+        $file_logged_out = str_replace('_logged_in','', $file_logged_in);
+        //variables initialization
+        $data_logged_out = array();
+        $data_logged_in  = array();
+
+        //we read the file with all links
+        $file = file($file_logged_in);
+        foreach ($file as $line) {
+            $line = str_replace("\n", '',$line);
+            //not logged user only sees public links
+            if (!preg_match('/::private/',$line)) {
+                $data_logged_out[] = $line;
+            }
+            //logged user only sees all links
+            $data_logged_in[] = $line;
+        }
+        //tabs file for logged out users
+        if (file_exists($file_logged_out)) {
+            $fp = fopen($file_logged_out, 'w');
+            fputs($fp, implode("\n", $data_logged_out));
+            fclose($fp);
+        }
+        //tabs file for logged in users
+        $fp = fopen($file_logged_in, 'w');
+        fputs($fp, implode("\n", $data_logged_in));
+        fclose($fp);
+    }
 }
 
 $cidReset = true;
@@ -76,39 +76,39 @@ 
 $_languages = api_get_languages();
 $selfUrl =  api_get_self();
 $interbreadcrumb[] = array(
-	'url' => 'index.php',
-	'name' => get_lang('PlatformAdmin')
+    'url' => 'index.php',
+    'name' => get_lang('PlatformAdmin')
 );
 
 if (!empty($action)) {
-	$interbreadcrumb[] = array(
-		'url' => 'configure_homepage.php',
-		'name' => get_lang('ConfigureHomePage')
-	);
-
-	switch ($action) {
-		case 'edit_top':
-			$tool_name = get_lang('EditHomePage');
-			break;
-		case 'edit_news':
-			$tool_name = get_lang('EditNews');
-			break;
-		case 'edit_notice':
-			$tool_name = get_lang('EditNotice');
-			break;
-		case 'insert_link':
-			$tool_name = get_lang('InsertLink');
-			break;
-		case 'edit_link':
-			$tool_name = get_lang('EditLink');
-			break;
-		case 'insert_tabs':
-			$tool_name = get_lang('InsertTabs');
-			break;
-		case 'edit_tabs':
-			$tool_name = get_lang('EditTabs');
-			break;
-	}
+    $interbreadcrumb[] = array(
+        'url' => 'configure_homepage.php',
+        'name' => get_lang('ConfigureHomePage')
+    );
+
+    switch ($action) {
+        case 'edit_top':
+            $tool_name = get_lang('EditHomePage');
+            break;
+        case 'edit_news':
+            $tool_name = get_lang('EditNews');
+            break;
+        case 'edit_notice':
+            $tool_name = get_lang('EditNotice');
+            break;
+        case 'insert_link':
+            $tool_name = get_lang('InsertLink');
+            break;
+        case 'edit_link':
+            $tool_name = get_lang('EditLink');
+            break;
+        case 'insert_tabs':
+            $tool_name = get_lang('InsertTabs');
+            break;
+        case 'edit_tabs':
+            $tool_name = get_lang('EditTabs');
+            break;
+    }
 }
 
 // The global logic for language priorities should be:
@@ -131,11 +131,11 @@ 
 
 $lang = ''; //el for "Edit Language"
 if (!empty($_SESSION['user_language_choice'])) {
-	$lang = $_SESSION['user_language_choice'];
+    $lang = $_SESSION['user_language_choice'];
 } elseif (!empty($_SESSION['_user']['language'])) {
-	$lang = $_SESSION['_user']['language'];
+    $lang = $_SESSION['_user']['language'];
 } else {
-	$lang = api_get_setting('platformLanguage');
+    $lang = api_get_setting('platformLanguage');
 }
 
 $languageGet = isset($_GET['language']) ? Security::remove_XSS($_GET['language']) : $lang;
@@ -144,25 +144,25 @@ 
 $homePath = api_get_path(SYS_HOME_PATH);
 
 if (api_is_multiple_url_enabled()) {
-	$access_url_id = api_get_current_access_url_id();
-	if ($access_url_id != -1) {
-		$url_info = api_get_access_url($access_url_id);
-		$url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $url_info['url']));
-		$clean_url = api_replace_dangerous_char($url);
-		$clean_url = str_replace('/', '-', $clean_url);
-		$clean_url .= '/';
-
-		$homep = $homePath; //homep for Home Path
-		$homep_new = $homePath.$clean_url; //homep for Home Path added the url
-		$new_url_dir = $homePath.$clean_url;
-		//we create the new dir for the new sites
-		if (!is_dir($new_url_dir)) {
-			mkdir($new_url_dir, api_get_permissions_for_new_directories());
-		}
-	}
+    $access_url_id = api_get_current_access_url_id();
+    if ($access_url_id != -1) {
+        $url_info = api_get_access_url($access_url_id);
+        $url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $url_info['url']));
+        $clean_url = api_replace_dangerous_char($url);
+        $clean_url = str_replace('/', '-', $clean_url);
+        $clean_url .= '/';
+
+        $homep = $homePath; //homep for Home Path
+        $homep_new = $homePath.$clean_url; //homep for Home Path added the url
+        $new_url_dir = $homePath.$clean_url;
+        //we create the new dir for the new sites
+        if (!is_dir($new_url_dir)) {
+            mkdir($new_url_dir, api_get_permissions_for_new_directories());
+        }
+    }
 } else {
-	$homep_new = '';
-	$homep = $homePath; //homep for Home Path
+    $homep_new = '';
+    $homep = $homePath; //homep for Home Path
 }
 
 $menuf = 'home_menu'; //menuf for Menu File
@@ -177,25 +177,25 @@ 
 
 // If language-specific file does not exist, create it by copying default file
 foreach ($homef as $my_file) {
-	if (api_is_multiple_url_enabled()) {
-		if (!file_exists($homep_new.$my_file.'_'.$lang.$ext)) {
-			if (!file_exists($homep.$my_file.$ext)) {
-				touch($homep.$my_file.$ext);
-			}
-			@copy($homep.$my_file.$ext, $homep_new.$my_file.'_'.$lang.$ext);
-		}
-	} else {
-		if (!file_exists($homep.$my_file.'_'.$lang.$ext)) {
-			if (!file_exists($homep.$my_file.$ext)) {
-				touch($homep.$my_file.$ext);
-			}
-			@copy($homep.$my_file.$ext, $homep.$my_file.'_'.$lang.$ext);
-		}
-	}
+    if (api_is_multiple_url_enabled()) {
+        if (!file_exists($homep_new.$my_file.'_'.$lang.$ext)) {
+            if (!file_exists($homep.$my_file.$ext)) {
+                touch($homep.$my_file.$ext);
+            }
+            @copy($homep.$my_file.$ext, $homep_new.$my_file.'_'.$lang.$ext);
+        }
+    } else {
+        if (!file_exists($homep.$my_file.'_'.$lang.$ext)) {
+            if (!file_exists($homep.$my_file.$ext)) {
+                touch($homep.$my_file.$ext);
+            }
+            @copy($homep.$my_file.$ext, $homep.$my_file.'_'.$lang.$ext);
+        }
+    }
 }
 
 if (api_is_multiple_url_enabled()) {
-	$homep = $homep_new;
+    $homep = $homep_new;
 }
 
 // Check WCAG settings and prepare edition using WCAG
@@ -204,578 +204,578 @@ 
 // Filter link param
 $link = '';
 if (!empty($_GET['link'])) {
-	$link = $_GET['link'];
-	// If the link parameter is suspicious, empty it
-	if (strstr($link, '/') || !strstr($link, '.html') || strstr($link, '\\')) {
-		$link = '';
-		$action = '';
-	}
+    $link = $_GET['link'];
+    // If the link parameter is suspicious, empty it
+    if (strstr($link, '/') || !strstr($link, '.html') || strstr($link, '\\')) {
+        $link = '';
+        $action = '';
+    }
 }
 
 // Start analysing requested actions
 if (!empty($action)) {
-	if (!empty($_POST['formSent'])) {
-		// Variables used are $homep for home path, $menuf for menu file, $newsf
-		// for news file, $topf for top file, $noticef for noticefile,
-		// $ext for '.html'
-		switch ($action) {
-			case 'edit_top':
-				// Filter
-				$home_top = trim(stripslashes($_POST['home_top']));
-
-
-				// Write
-				if (is_writable($homep)) {
-					// Default
-					if (is_writable($homep.$topf.'_'.$lang.$ext)) {
-						$fp = fopen($homep.$topf.'_'.$lang.$ext, 'w');
-						fputs($fp, $home_top);
-						fclose($fp);
-
-						// Language
-						foreach ($_languages['name'] as $key => $value) {
-							$lang_name = $_languages['folder'][$key];
-							if (isset($_POST[$lang_name])) {
-								$fp = fopen($homep.$topf.'_'.$lang_name.$ext, 'w');
-								fputs($fp, $home_top);
-								fclose($fp);
-							}
-						}
-					} else {
-						$errorMsg = get_lang('HomePageFilesNotWritable');
-					}
-				} else {
-					//File does not exist
-					$fp = fopen($homep.$topf.'_'.$lang.$ext, 'w');
-					fputs($fp, $home_top);
-					fclose($fp);
-
-					foreach ($_languages['name'] as $key => $value) {
-						$lang_name = $_languages['folder'][$key];
-						if (isset($_POST[$lang_name])) {
-							if (file_exists($homep.$topf.'_'.$lang_name.$ext)) {
-								$fp = fopen($homep.$topf.'_'.$lang_name.$ext, 'w');
-								fputs($fp, $home_top);
-								fclose($fp);
-							}
-						}
-					}
-				}
-
-				if (EventsMail::check_if_using_class('portal_homepage_edited')) {
-					EventsDispatcher::events('portal_homepage_edited',array('about_user' => api_get_user_id()));
-				}
-				Event::addEvent(
-					LOG_HOMEPAGE_CHANGED,
-					'edit_top',
-					cut(strip_tags($home_top), 254),
-					api_get_utc_datetime(),
-					api_get_user_id()
-				);
-				break;
-			case 'edit_notice':
-				// Filter
-				$notice_title = trim(strip_tags(stripslashes($_POST['notice_title'])));
-				$notice_text = trim(str_replace(array("\r", "\n"), array('', '<br />'), strip_tags(stripslashes($_POST['notice_text']), '<a>')));
-				if (empty($notice_title) || empty($notice_text)) {
-					$errorMsg = get_lang('NoticeWillBeNotDisplayed');
-				}
-				// Write
-				if (file_exists($homep.$noticef.'_'.$lang.$ext)) {
-					if (is_writable($homep.$noticef.'_'.$lang.$ext)) {
-						$fp = fopen($homep.$noticef.'_'.$lang.$ext, 'w');
-						if ($errorMsg == '') {
-							fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
-
-							foreach ($_languages['name'] as $key => $value) {
-								$lang_name = $_languages['folder'][$key];
-								if (isset($_POST[$lang_name])) {
-									if (file_exists($homep.$noticef.'_'.$lang_name.$ext)) {
-										if (is_writable($homep.$noticef.'_'.$lang_name.$ext)) {
-											$fp = fopen($homep.$noticef.'_'.$lang_name.$ext, 'w');
-											fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
-											fclose($fp);
-										}
-									}
-								}
-							}
-						} else {
-							fputs($fp, '');
-
-							foreach ($_languages['name'] as $key => $value) {
-								$lang_name = $_languages['folder'][$key];
-								if (isset($_POST[$lang_name])) {
-									if (file_exists($homep.$noticef.'_'.$lang_name.$ext)) {
-										$fp1 = fopen($homep.$noticef.'_'.$lang_name.$ext, 'w');
-										fputs($fp1, '');
-										fclose($fp1);
-									}
-								}
-							}
-						}
-						fclose($fp);
-					} else {
-						$errorMsg .= "<br/>\n".get_lang('HomePageFilesNotWritable');
-					}
-				} else {
-					//File does not exist
-					$fp = fopen($homep.$noticef.'_'.$lang.$ext, 'w');
-					fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
-					fclose($fp);
-				}
-				Event::addEvent(
+    if (!empty($_POST['formSent'])) {
+        // Variables used are $homep for home path, $menuf for menu file, $newsf
+        // for news file, $topf for top file, $noticef for noticefile,
+        // $ext for '.html'
+        switch ($action) {
+            case 'edit_top':
+                // Filter
+                $home_top = trim(stripslashes($_POST['home_top']));
+
+
+                // Write
+                if (is_writable($homep)) {
+                    // Default
+                    if (is_writable($homep.$topf.'_'.$lang.$ext)) {
+                        $fp = fopen($homep.$topf.'_'.$lang.$ext, 'w');
+                        fputs($fp, $home_top);
+                        fclose($fp);
+
+                        // Language
+                        foreach ($_languages['name'] as $key => $value) {
+                            $lang_name = $_languages['folder'][$key];
+                            if (isset($_POST[$lang_name])) {
+                                $fp = fopen($homep.$topf.'_'.$lang_name.$ext, 'w');
+                                fputs($fp, $home_top);
+                                fclose($fp);
+                            }
+                        }
+                    } else {
+                        $errorMsg = get_lang('HomePageFilesNotWritable');
+                    }
+                } else {
+                    //File does not exist
+                    $fp = fopen($homep.$topf.'_'.$lang.$ext, 'w');
+                    fputs($fp, $home_top);
+                    fclose($fp);
+
+                    foreach ($_languages['name'] as $key => $value) {
+                        $lang_name = $_languages['folder'][$key];
+                        if (isset($_POST[$lang_name])) {
+                            if (file_exists($homep.$topf.'_'.$lang_name.$ext)) {
+                                $fp = fopen($homep.$topf.'_'.$lang_name.$ext, 'w');
+                                fputs($fp, $home_top);
+                                fclose($fp);
+                            }
+                        }
+                    }
+                }
+
+                if (EventsMail::check_if_using_class('portal_homepage_edited')) {
+                    EventsDispatcher::events('portal_homepage_edited',array('about_user' => api_get_user_id()));
+                }
+                Event::addEvent(
+                    LOG_HOMEPAGE_CHANGED,
+                    'edit_top',
+                    cut(strip_tags($home_top), 254),
+                    api_get_utc_datetime(),
+                    api_get_user_id()
+                );
+                break;
+            case 'edit_notice':
+                // Filter
+                $notice_title = trim(strip_tags(stripslashes($_POST['notice_title'])));
+                $notice_text = trim(str_replace(array("\r", "\n"), array('', '<br />'), strip_tags(stripslashes($_POST['notice_text']), '<a>')));
+                if (empty($notice_title) || empty($notice_text)) {
+                    $errorMsg = get_lang('NoticeWillBeNotDisplayed');
+                }
+                // Write
+                if (file_exists($homep.$noticef.'_'.$lang.$ext)) {
+                    if (is_writable($homep.$noticef.'_'.$lang.$ext)) {
+                        $fp = fopen($homep.$noticef.'_'.$lang.$ext, 'w');
+                        if ($errorMsg == '') {
+                            fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
+
+                            foreach ($_languages['name'] as $key => $value) {
+                                $lang_name = $_languages['folder'][$key];
+                                if (isset($_POST[$lang_name])) {
+                                    if (file_exists($homep.$noticef.'_'.$lang_name.$ext)) {
+                                        if (is_writable($homep.$noticef.'_'.$lang_name.$ext)) {
+                                            $fp = fopen($homep.$noticef.'_'.$lang_name.$ext, 'w');
+                                            fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
+                                            fclose($fp);
+                                        }
+                                    }
+                                }
+                            }
+                        } else {
+                            fputs($fp, '');
+
+                            foreach ($_languages['name'] as $key => $value) {
+                                $lang_name = $_languages['folder'][$key];
+                                if (isset($_POST[$lang_name])) {
+                                    if (file_exists($homep.$noticef.'_'.$lang_name.$ext)) {
+                                        $fp1 = fopen($homep.$noticef.'_'.$lang_name.$ext, 'w');
+                                        fputs($fp1, '');
+                                        fclose($fp1);
+                                    }
+                                }
+                            }
+                        }
+                        fclose($fp);
+                    } else {
+                        $errorMsg .= "<br/>\n".get_lang('HomePageFilesNotWritable');
+                    }
+                } else {
+                    //File does not exist
+                    $fp = fopen($homep.$noticef.'_'.$lang.$ext, 'w');
+                    fputs($fp, "<h5>$notice_title</h5><p>\n$notice_text");
+                    fclose($fp);
+                }
+                Event::addEvent(
                     LOG_HOMEPAGE_CHANGED,
                     'edit_notice',
                     cut(strip_tags($notice_title), 254),
                     api_get_utc_datetime(),
                     api_get_user_id()
                 );
-				break;
-			case 'edit_news':
-				//Filter
-				$home_news = trim(stripslashes($_POST['home_news']));
-
-				//Write
-				if ($s_languages_news != 'all') {
-					if (file_exists($homep.$newsf.'_'.$s_languages_news.$ext)) {
-						if (is_writable($homep.$newsf.'_'.$s_languages_news.$ext)) {
-							$fp = fopen($homep.$newsf.'_'.$s_languages_news.$ext, 'w');
-							fputs($fp, $home_news);
-							fclose($fp);
-						} else {
-							$errorMsg = get_lang('HomePageFilesNotWritable');
-						}
-					} else {
-						// File does not exist
-						$fp = fopen($homep.$newsf.'_'.$s_languages_news.$ext, 'w');
-						fputs($fp, $home_news);
-						fclose($fp);
-					}
-				} else {
-					// We update all the news file
-					foreach ($_languages['name'] as $key => $value) {
-						$english_name = $_languages['folder'][$key];
-						if (file_exists($homep.$newsf.'_'.$english_name.$ext)) {
-							if (is_writable($homep.$newsf.'_'.$english_name.$ext)) {
-								$fp = fopen($homep.$newsf.'_'.$english_name.$ext, 'w');
-								fputs($fp, $home_news);
-								fclose($fp);
-							} else {
-								$errorMsg = get_lang('HomePageFilesNotWritable');
-							}
-						} else {
-							// File does not exist
-							$fp = fopen($homep.$newsf.'_'.$english_name.$ext, 'w');
-							fputs($fp, $home_news);
-							fclose($fp);
-						}
-					}
-				}
-				Event::addEvent(
+                break;
+            case 'edit_news':
+                //Filter
+                $home_news = trim(stripslashes($_POST['home_news']));
+
+                //Write
+                if ($s_languages_news != 'all') {
+                    if (file_exists($homep.$newsf.'_'.$s_languages_news.$ext)) {
+                        if (is_writable($homep.$newsf.'_'.$s_languages_news.$ext)) {
+                            $fp = fopen($homep.$newsf.'_'.$s_languages_news.$ext, 'w');
+                            fputs($fp, $home_news);
+                            fclose($fp);
+                        } else {
+                            $errorMsg = get_lang('HomePageFilesNotWritable');
+                        }
+                    } else {
+                        // File does not exist
+                        $fp = fopen($homep.$newsf.'_'.$s_languages_news.$ext, 'w');
+                        fputs($fp, $home_news);
+                        fclose($fp);
+                    }
+                } else {
+                    // We update all the news file
+                    foreach ($_languages['name'] as $key => $value) {
+                        $english_name = $_languages['folder'][$key];
+                        if (file_exists($homep.$newsf.'_'.$english_name.$ext)) {
+                            if (is_writable($homep.$newsf.'_'.$english_name.$ext)) {
+                                $fp = fopen($homep.$newsf.'_'.$english_name.$ext, 'w');
+                                fputs($fp, $home_news);
+                                fclose($fp);
+                            } else {
+                                $errorMsg = get_lang('HomePageFilesNotWritable');
+                            }
+                        } else {
+                            // File does not exist
+                            $fp = fopen($homep.$newsf.'_'.$english_name.$ext, 'w');
+                            fputs($fp, $home_news);
+                            fclose($fp);
+                        }
+                    }
+                }
+                Event::addEvent(
                     LOG_HOMEPAGE_CHANGED,
                     'edit_news',
                     strip_tags(cut($home_news, 254)),
                     api_get_utc_datetime(),
                     api_get_user_id()
                 );
-				break;
-			case 'insert_tabs':
-			case 'edit_tabs':
-			case 'insert_link':
-			case 'edit_link':
-				$link_index     = intval($_POST['link_index']);
-				$insert_where   = intval($_POST['insert_where']);
-				$link_name      = trim(stripslashes($_POST['link_name']));
-				$link_url       = trim(stripslashes($_POST['link_url']));
-				$add_in_tab     = intval($_POST['add_in_tab']);
-				$link_html = trim(stripslashes($_POST['link_html']));
-				$filename = trim(stripslashes($_POST['filename']));
-				$target_blank = $_POST['target_blank'] ? true : false;
-
-				if ($link_url == 'http://' || $link_url == 'https://') {
-					$link_url = '';
-				} elseif (!empty($link_url) && !strstr($link_url, '://')) {
-					$link_url='http://'.$link_url;
-				}
-				$menuf = ($action == 'insert_tabs' || $action == 'edit_tabs')? $mtloggedin : $menuf;
-
-				if (!is_writable($homep.$menuf.'_'.$lang.$ext)) {
-					$errorMsg = get_lang('HomePageFilesNotWritable');
-				} elseif (empty($link_name)) {
-					$errorMsg = get_lang('PleaseEnterLinkName');
-				} else {
-					// New links are added as new files in the home/ directory
-					if ($action == 'insert_link' || $action == 'insert_tabs' || empty($filename) || strstr($filename, '/') || !strstr($filename, '.html')) {
-						$filename = api_replace_dangerous_char($link_name).'.html';
-					}
-
-					// "home_" prefix for links are renamed to "user_" prefix (to avoid name clash with existing home page files)
-					if (!empty($filename)) {
-						$filename = str_replace('home_', 'user_', $filename);
-					}
-					// If the typical language suffix is not found in the file name,
-					// replace the ".html" suffix by "_en.html" or the active menu language
-					if (!strstr($filename,'_'.$lang.$ext)) {
-						$filename = str_replace($ext, '_'.$lang.$ext, $filename);
-					}
-					// Get the contents of home_menu_en.html (or active menu language
-					// version) into $home_menu as an array of one entry per line
-					$home_menu = file($homep.$menuf.'_'.$lang.$ext);
-					$home_menu = implode("\n", $home_menu);
-					$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-					$home_menu = explode("\n", $home_menu);
-					$home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
-					// Prepare place to insert the new link into (default is end of file)
-					if ($insert_where < -1 || $insert_where > (sizeof($home_menu) - 1)) {
-						$insert_where = sizeof($home_menu) - 1;
-					}
-					//
-					// For each line of the file, remove trailing spaces and special chars
-					//foreach ($home_menu as $key => $enreg) {
-					//	$home_menu[$key] = trim($enreg);
-					//}
-					//
-					// If the given link url is empty, then replace the link url by a link to the link file created
-
-					if (empty($link_url) || $link_url == 'http://' ||  $link_url == 'https://') {
-						$link_url = api_get_path(WEB_PATH).'index.php?include='.urlencode($filename);
-						// If the file doesn't exist, then create it and
-						// fill it with default text
-
-						$fp = @fopen($homep.$filename, 'w');
-						if ($fp) {
-							if (empty($link_html)) {
-								fputs($fp, get_lang('MyTextHere'));
-								home_tabs($homep.$filename);
-							} else {
-								fputs($fp, $link_html);
-								home_tabs($homep.$filename);
-							}
-							fclose($fp);
-						}
-					}
-					// If the requested action is to edit a link, open the file and
-					// write to it (if the file doesn't exist, create it)
-					if (in_array($action, array('edit_link'))  && !empty($link_html)) {
-						$fp = @fopen($homep.$filename, 'w');
-						if ($fp) {
-							fputs($fp, $link_html);
-							home_tabs($homep.$filename);
-							fclose($fp);
-						}
-					}
+                break;
+            case 'insert_tabs':
+            case 'edit_tabs':
+            case 'insert_link':
+            case 'edit_link':
+                $link_index     = intval($_POST['link_index']);
+                $insert_where   = intval($_POST['insert_where']);
+                $link_name      = trim(stripslashes($_POST['link_name']));
+                $link_url       = trim(stripslashes($_POST['link_url']));
+                $add_in_tab     = intval($_POST['add_in_tab']);
+                $link_html = trim(stripslashes($_POST['link_html']));
+                $filename = trim(stripslashes($_POST['filename']));
+                $target_blank = $_POST['target_blank'] ? true : false;
+
+                if ($link_url == 'http://' || $link_url == 'https://') {
+                    $link_url = '';
+                } elseif (!empty($link_url) && !strstr($link_url, '://')) {
+                    $link_url='http://'.$link_url;
+                }
+                $menuf = ($action == 'insert_tabs' || $action == 'edit_tabs')? $mtloggedin : $menuf;
+
+                if (!is_writable($homep.$menuf.'_'.$lang.$ext)) {
+                    $errorMsg = get_lang('HomePageFilesNotWritable');
+                } elseif (empty($link_name)) {
+                    $errorMsg = get_lang('PleaseEnterLinkName');
+                } else {
+                    // New links are added as new files in the home/ directory
+                    if ($action == 'insert_link' || $action == 'insert_tabs' || empty($filename) || strstr($filename, '/') || !strstr($filename, '.html')) {
+                        $filename = api_replace_dangerous_char($link_name).'.html';
+                    }
+
+                    // "home_" prefix for links are renamed to "user_" prefix (to avoid name clash with existing home page files)
+                    if (!empty($filename)) {
+                        $filename = str_replace('home_', 'user_', $filename);
+                    }
+                    // If the typical language suffix is not found in the file name,
+                    // replace the ".html" suffix by "_en.html" or the active menu language
+                    if (!strstr($filename,'_'.$lang.$ext)) {
+                        $filename = str_replace($ext, '_'.$lang.$ext, $filename);
+                    }
+                    // Get the contents of home_menu_en.html (or active menu language
+                    // version) into $home_menu as an array of one entry per line
+                    $home_menu = file($homep.$menuf.'_'.$lang.$ext);
+                    $home_menu = implode("\n", $home_menu);
+                    $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+                    $home_menu = explode("\n", $home_menu);
+                    $home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
+                    // Prepare place to insert the new link into (default is end of file)
+                    if ($insert_where < -1 || $insert_where > (sizeof($home_menu) - 1)) {
+                        $insert_where = sizeof($home_menu) - 1;
+                    }
+                    //
+                    // For each line of the file, remove trailing spaces and special chars
+                    //foreach ($home_menu as $key => $enreg) {
+                    //	$home_menu[$key] = trim($enreg);
+                    //}
+                    //
+                    // If the given link url is empty, then replace the link url by a link to the link file created
+
+                    if (empty($link_url) || $link_url == 'http://' ||  $link_url == 'https://') {
+                        $link_url = api_get_path(WEB_PATH).'index.php?include='.urlencode($filename);
+                        // If the file doesn't exist, then create it and
+                        // fill it with default text
+
+                        $fp = @fopen($homep.$filename, 'w');
+                        if ($fp) {
+                            if (empty($link_html)) {
+                                fputs($fp, get_lang('MyTextHere'));
+                                home_tabs($homep.$filename);
+                            } else {
+                                fputs($fp, $link_html);
+                                home_tabs($homep.$filename);
+                            }
+                            fclose($fp);
+                        }
+                    }
+                    // If the requested action is to edit a link, open the file and
+                    // write to it (if the file doesn't exist, create it)
+                    if (in_array($action, array('edit_link'))  && !empty($link_html)) {
+                        $fp = @fopen($homep.$filename, 'w');
+                        if ($fp) {
+                            fputs($fp, $link_html);
+                            home_tabs($homep.$filename);
+                            fclose($fp);
+                        }
+                    }
 
                     $class_add_in_tab = 'class="show_menu"';
 
-					if (!$add_in_tab) {
-						$class_add_in_tab = 'class="hide_menu"';
-					}
-
-					// If the requested action is to create a link, make some room
-					// for the new link in the home_menu array at the requested place
-					// and insert the new link there
-
-					if ($action == 'insert_link' || $action == 'insert_tabs') {
-						for ($i = sizeof($home_menu); $i; $i--) {
-							if ($i > $insert_where) {
-								$home_menu[$i] = $home_menu[$i - 1];
-							} else {
-								break;
-							}
-						}
-						$home_menu[$insert_where + 1] = '<li ' . $class_add_in_tab . '><a href="'.$link_url.'" target="'.($target_blank ? '_blank' : '_self').'">'. $link_name .'</a></li>';
-					} else {
-						// If the request is about a link edition, change the link
-						$home_menu[$link_index]='<li ' . $class_add_in_tab . '><a href="'.$link_url.'" target="'.($target_blank?'_blank':'_self').'">'. $link_name .'</a></li>';
-					}
-					// Re-build the file from the home_menu array
-					$home_menu = implode("\n", $home_menu);
-					// Write
-					if (file_exists($homep.$menuf.'_'.$lang.$ext)) {
-						if (is_writable($homep.$menuf.'_'.$lang.$ext)) {
-							$fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
-							fputs($fp, $home_menu);
-							home_tabs($homep.$menuf.'_'.$lang.$ext);
-							fclose($fp);
-
-							foreach ($_languages['name'] as $key => $value) {
-								$lang_name = $_languages['folder'][$key];
-								if (isset($_POST[$lang_name])) {
-									$fp = fopen($homep.$menuf.'_'.$lang_name.$ext, 'w');
-									fputs($fp, $home_menu);
-									home_tabs($homep.$menuf.'_'.$lang_name.$ext);
-									fclose($fp);
-								}
-							}
-
-							if (file_exists($homep.$menuf.$ext)) {
-								if (is_writable($homep.$menuf.$ext)) {
-									$fpo = fopen($homep.$menuf.$ext, 'w');
-									fputs($fpo, $home_menu);
-									home_tabs($homep.$menuf.$ext);
-									fclose($fpo);
-								}
-							}
-						} else {
-							$errorMsg = get_lang('HomePageFilesNotWritable');
-						}
-					} else {
-						//File does not exist
-						$fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
-						fputs($fp, $home_menu);
-						home_tabs($homep.$menuf.'_'.$lang.$ext);
-						fclose($fp);
-
-						foreach ($_languages['name'] as $key => $value) {
-							$lang_name = $_languages['folder'][$key];
-							if (isset($_POST[$lang_name])) {
-								$fp = fopen($homep.$menuf.'_'.$lang_name.$ext, 'w');
-								fputs($fp, $home_menu);
-								home_tabs($homep.$menuf.'_'.$lang_name.$ext);
-								fclose($fp);
-							}
-						}
-					}
-				}
-				Event::addEvent(
-					LOG_HOMEPAGE_CHANGED,
-					$action,
-					cut($link_name . ':' . $link_url, 254),
-					api_get_utc_datetime(),
-					api_get_user_id()
-				);
-				break;
-		} //end of switch($action)
-
-		if (empty($errorMsg)) {
-			header('Location: '.$selfUrl.'?language='.$languageGet);
-			exit();
-		}
-	} else {
-		//if POST[formSent] is not set
-		switch ($action) {
-			case 'open_link':
-				// Previously, filtering of GET['link'] was done here but it left
-				// a security threat. Filtering has now been moved outside conditions
-				break;
-			case 'delete_tabs':
-			case 'delete_link':
-				// A link is deleted by getting the file into an array, removing the
-				// link and re-writing the array to the file
-				$link_index = intval($_GET['link_index']);
-				$menuf = ($action == 'delete_tabs')? $mtloggedin : $menuf;
-				$home_menu = @file($homep.$menuf.'_'.$lang.$ext);
-				if (empty($home_menu)) {
-					$home_menu = array();
-				}
-				foreach ($home_menu as $key => $enreg) {
-					if ($key == $link_index) {
-						unset($home_menu[$key]);
-					} else {
-						$home_menu[$key] = trim($enreg);
-					}
-				}
-				$home_menu = implode("\n", $home_menu);
-				$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-
-				$fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
-				fputs($fp, $home_menu);
-				home_tabs($homep.$menuf.'_'.$lang.$ext);
-				fclose($fp);
-				if (file_exists($homep.$menuf.$ext)) {
-					if (is_writable($homep.$menuf.$ext)) {
-						$fpo = fopen($homep.$menuf.$ext,'w');
-						fputs($fpo, $home_menu);
-						home_tabs($homep.$menuf.$ext);
-						fclose($fpo);
-					}
-				}
-				header('Location: '.$selfUrl);
-				exit();
-				break;
-			case 'edit_top':
-				// This request is only the preparation for the update of the home_top
-				$home_top = '';
-				if (is_file($homep.$topf.'_'.$lang.$ext) && is_readable($homep.$topf.'_'.$lang.$ext)) {
-					$home_top = @(string)file_get_contents($homep.$topf.'_'.$lang.$ext);
-				} elseif (is_file($homep.$topf.$lang.$ext) && is_readable($homep.$topf.$lang.$ext)) {
-					$home_top = @(string)file_get_contents($homep.$topf.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				$home_top = api_to_system_encoding($home_top, api_detect_encoding(strip_tags($home_top)));
-				break;
-			case 'edit_notice':
-				// This request is only the preparation for the update of the home_notice
-				$home_notice = '';
-				if (is_file($homep.$noticef.'_'.$lang.$ext) && is_readable($homep.$noticef.'_'.$lang.$ext)) {
-					$home_notice = @file($homep.$noticef.'_'.$lang.$ext);
-				} elseif (is_file($homep.$noticef.$lang.$ext) && is_readable($homep.$noticef.$lang.$ext)) {
-					$home_notice = @file($homep.$noticef.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				if (empty($home_notice)) {
-					$home_notice = array();
-				}
-				$notice_title = strip_tags($home_notice[0]);
-				$notice_title = api_to_system_encoding($notice_title, api_detect_encoding($notice_title));
-				$notice_text = strip_tags(str_replace('<br />', "\n", $home_notice[1]), '<a>');
-				$notice_text = api_to_system_encoding($notice_text, api_detect_encoding(strip_tags($notice_text)));
-				break;
-			case 'edit_news':
-				// This request is the preparation for the update of the home_news page
-				$home_news = '';
-				if (is_file($homep.$newsf.'_'.$lang.$ext) && is_readable($homep.$newsf.'_'.$lang.$ext)) {
-					$home_news = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
-				} elseif (is_file($homep.$newsf.$lang.$ext) && is_readable($homep.$newsf.$lang.$ext)) {
-					$home_news = @(string)file_get_contents($homep.$newsf.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				$home_news = api_to_system_encoding($home_news, api_detect_encoding(strip_tags($home_news)));
-				break;
-			case 'insert_link':
-				// This request is the preparation for the addition of an item in home_menu
-				$home_menu = '';
-				$menuf = ($action == 'edit_tabs')? $mtloggedin : $menuf;
-				if (is_file($homep.$menuf.'_'.$lang.$ext) && is_readable($homep.$menuf.'_'.$lang.$ext)) {
-					$home_menu = @file($homep.$menuf.'_'.$lang.$ext);
-				} elseif(is_file($homep.$menuf.$lang.$ext) && is_readable($homep.$menuf.$lang.$ext)) {
-					$home_menu = @file($homep.$menuf.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				if (empty($home_menu)) {
-					$home_menu = array();
-				}
-				if (!empty($home_menu)) {
-					$home_menu = implode("\n", $home_menu);
-					$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-					$home_menu = explode("\n", $home_menu);
-				}
-				$home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
-				break;
-			case 'insert_tabs':
-				// This request is the preparation for the addition of an item in home_menu
-				$home_menu = '';
-				if (is_file($homep.$mtloggedin.'_'.$lang.$ext) && is_readable($homep.$mtloggedin.'_'.$lang.$ext)) {
-					$home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
-				} elseif (is_file($homep.$mtloggedin.$lang.$ext) && is_readable($homep.$mtloggedin.$lang.$ext)) {
-					$home_menu = @file($homep.$mtloggedin.$lang.$ext);
-				} elseif (touch($homep.$mtloggedin.'_'.$lang.$ext)) {
-					$home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-				if (empty($home_menu)) {
-					$home_menu = array();
-				}
-				if (!empty($home_menu)) {
-					$home_menu = implode("\n", $home_menu);
-					$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-					$home_menu = explode("\n", $home_menu);
-				}
-				$home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
-				break;
-			case 'edit_tabs':
-			case 'edit_link':
-				// This request is the preparation for the edition of the links array
-				$home_menu = '';
-				$menuf = ($action == 'edit_tabs')? $mtloggedin : $menuf;
-				if (is_file($homep.$menuf.'_'.$lang.$ext) && is_readable($homep.$menuf.'_'.$lang.$ext)) {
-					$home_menu = @file($homep.$menuf.'_'.$lang.$ext);
-				} elseif(is_file($homep.$menuf.$lang.$ext) && is_readable($homep.$menuf.$lang.$ext)) {
-					$home_menu = @file($homep.$menuf.$lang.$ext);
-				} else {
-					$errorMsg = get_lang('HomePageFilesNotReadable');
-				}
-
-				if (empty($home_menu)) {
-					if (file_exists($homep.$menutabs.'_'.$lang.$ext)) {
-						$home_menu = @file($homep.$menutabs.'_'.$lang.$ext);
-					}
-				}
-
-				if (empty($home_menu)) {
-					$home_menu = array();
-				}
-				if (!empty($home_menu)) {
-					$home_menu = implode("\n", $home_menu);
-					$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
-					$home_menu = explode("\n", $home_menu);
-				}
-
-				$link_index = intval($_GET['link_index']);
-
-				$target_blank = false;
-				$link_name = '';
-				$link_url = '';
-
-				//$home_menu_new = array();
-				//
-				//Cleaning array
-				//foreach ($home_menu as $item) {
-				//	if(!empty($item)) {
-				//		$home_menu_new[] = $item;
-				//	}
-				//}
-				//$home_menu = $home_menu_new;
-
-				// Cleaning the array
-				$home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
-
-				// For each line of the home_menu file
-				foreach ($home_menu as $key => $enreg) {
-
-					// Check if the current item is the one we want to update
-					if ($key == $link_index) {
-						// This is the link we want to update
-						// Check if the target should be "_blank"
-						if (strstr($enreg, 'target="_blank"')) {
-							$target_blank = true;
-						}
-
-						if (strstr($enreg, 'hide_menu')) {
-							$add_in_tab = false;
-						} else {
-							$add_in_tab = true;
-						}
-
-						// Remove dangerous HTML tags from the link itself (this is an
-						// additional measure in case a link previously contained
-						// unsecure tags)
-						$link_name = strip_tags($enreg);
-
-						// Get the contents of "href" attribute in $link_url
-						$enreg = explode('href="',$enreg);
-						list($link_url) = explode('"', $enreg[sizeof($enreg) - 1]);
-
-						// If the link contains the web root of this portal, then strip
-						// it off and keep only the name of the file that needs edition
-						if (strstr($link_url, '?include=')) {
-							$link_url = explode('?include=', $link_url);
-
-							$filename = $link_url[sizeof($link_url) - 1];
-
-							if (!strstr($filename, '/') && strstr($filename, '.html')) {
-								// Get oonly the contents of the link file
-								$link_html = @file($homep.$filename);
-								$link_html = implode('', $link_html);
-								$link_url = '';
-							} else {
-								$filename = '';
-							}
-						}
-						break;
-					}
-				}
-				break;
-		}//end of second switch($action) (when POST['formSent'] was not set, yet)
-	}// end of "else" in if($_POST['formSent']) condition
+                    if (!$add_in_tab) {
+                        $class_add_in_tab = 'class="hide_menu"';
+                    }
+
+                    // If the requested action is to create a link, make some room
+                    // for the new link in the home_menu array at the requested place
+                    // and insert the new link there
+
+                    if ($action == 'insert_link' || $action == 'insert_tabs') {
+                        for ($i = sizeof($home_menu); $i; $i--) {
+                            if ($i > $insert_where) {
+                                $home_menu[$i] = $home_menu[$i - 1];
+                            } else {
+                                break;
+                            }
+                        }
+                        $home_menu[$insert_where + 1] = '<li ' . $class_add_in_tab . '><a href="'.$link_url.'" target="'.($target_blank ? '_blank' : '_self').'">'. $link_name .'</a></li>';
+                    } else {
+                        // If the request is about a link edition, change the link
+                        $home_menu[$link_index]='<li ' . $class_add_in_tab . '><a href="'.$link_url.'" target="'.($target_blank?'_blank':'_self').'">'. $link_name .'</a></li>';
+                    }
+                    // Re-build the file from the home_menu array
+                    $home_menu = implode("\n", $home_menu);
+                    // Write
+                    if (file_exists($homep.$menuf.'_'.$lang.$ext)) {
+                        if (is_writable($homep.$menuf.'_'.$lang.$ext)) {
+                            $fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
+                            fputs($fp, $home_menu);
+                            home_tabs($homep.$menuf.'_'.$lang.$ext);
+                            fclose($fp);
+
+                            foreach ($_languages['name'] as $key => $value) {
+                                $lang_name = $_languages['folder'][$key];
+                                if (isset($_POST[$lang_name])) {
+                                    $fp = fopen($homep.$menuf.'_'.$lang_name.$ext, 'w');
+                                    fputs($fp, $home_menu);
+                                    home_tabs($homep.$menuf.'_'.$lang_name.$ext);
+                                    fclose($fp);
+                                }
+                            }
+
+                            if (file_exists($homep.$menuf.$ext)) {
+                                if (is_writable($homep.$menuf.$ext)) {
+                                    $fpo = fopen($homep.$menuf.$ext, 'w');
+                                    fputs($fpo, $home_menu);
+                                    home_tabs($homep.$menuf.$ext);
+                                    fclose($fpo);
+                                }
+                            }
+                        } else {
+                            $errorMsg = get_lang('HomePageFilesNotWritable');
+                        }
+                    } else {
+                        //File does not exist
+                        $fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
+                        fputs($fp, $home_menu);
+                        home_tabs($homep.$menuf.'_'.$lang.$ext);
+                        fclose($fp);
+
+                        foreach ($_languages['name'] as $key => $value) {
+                            $lang_name = $_languages['folder'][$key];
+                            if (isset($_POST[$lang_name])) {
+                                $fp = fopen($homep.$menuf.'_'.$lang_name.$ext, 'w');
+                                fputs($fp, $home_menu);
+                                home_tabs($homep.$menuf.'_'.$lang_name.$ext);
+                                fclose($fp);
+                            }
+                        }
+                    }
+                }
+                Event::addEvent(
+                    LOG_HOMEPAGE_CHANGED,
+                    $action,
+                    cut($link_name . ':' . $link_url, 254),
+                    api_get_utc_datetime(),
+                    api_get_user_id()
+                );
+                break;
+        } //end of switch($action)
+
+        if (empty($errorMsg)) {
+            header('Location: '.$selfUrl.'?language='.$languageGet);
+            exit();
+        }
+    } else {
+        //if POST[formSent] is not set
+        switch ($action) {
+            case 'open_link':
+                // Previously, filtering of GET['link'] was done here but it left
+                // a security threat. Filtering has now been moved outside conditions
+                break;
+            case 'delete_tabs':
+            case 'delete_link':
+                // A link is deleted by getting the file into an array, removing the
+                // link and re-writing the array to the file
+                $link_index = intval($_GET['link_index']);
+                $menuf = ($action == 'delete_tabs')? $mtloggedin : $menuf;
+                $home_menu = @file($homep.$menuf.'_'.$lang.$ext);
+                if (empty($home_menu)) {
+                    $home_menu = array();
+                }
+                foreach ($home_menu as $key => $enreg) {
+                    if ($key == $link_index) {
+                        unset($home_menu[$key]);
+                    } else {
+                        $home_menu[$key] = trim($enreg);
+                    }
+                }
+                $home_menu = implode("\n", $home_menu);
+                $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+
+                $fp = fopen($homep.$menuf.'_'.$lang.$ext, 'w');
+                fputs($fp, $home_menu);
+                home_tabs($homep.$menuf.'_'.$lang.$ext);
+                fclose($fp);
+                if (file_exists($homep.$menuf.$ext)) {
+                    if (is_writable($homep.$menuf.$ext)) {
+                        $fpo = fopen($homep.$menuf.$ext,'w');
+                        fputs($fpo, $home_menu);
+                        home_tabs($homep.$menuf.$ext);
+                        fclose($fpo);
+                    }
+                }
+                header('Location: '.$selfUrl);
+                exit();
+                break;
+            case 'edit_top':
+                // This request is only the preparation for the update of the home_top
+                $home_top = '';
+                if (is_file($homep.$topf.'_'.$lang.$ext) && is_readable($homep.$topf.'_'.$lang.$ext)) {
+                    $home_top = @(string)file_get_contents($homep.$topf.'_'.$lang.$ext);
+                } elseif (is_file($homep.$topf.$lang.$ext) && is_readable($homep.$topf.$lang.$ext)) {
+                    $home_top = @(string)file_get_contents($homep.$topf.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                $home_top = api_to_system_encoding($home_top, api_detect_encoding(strip_tags($home_top)));
+                break;
+            case 'edit_notice':
+                // This request is only the preparation for the update of the home_notice
+                $home_notice = '';
+                if (is_file($homep.$noticef.'_'.$lang.$ext) && is_readable($homep.$noticef.'_'.$lang.$ext)) {
+                    $home_notice = @file($homep.$noticef.'_'.$lang.$ext);
+                } elseif (is_file($homep.$noticef.$lang.$ext) && is_readable($homep.$noticef.$lang.$ext)) {
+                    $home_notice = @file($homep.$noticef.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                if (empty($home_notice)) {
+                    $home_notice = array();
+                }
+                $notice_title = strip_tags($home_notice[0]);
+                $notice_title = api_to_system_encoding($notice_title, api_detect_encoding($notice_title));
+                $notice_text = strip_tags(str_replace('<br />', "\n", $home_notice[1]), '<a>');
+                $notice_text = api_to_system_encoding($notice_text, api_detect_encoding(strip_tags($notice_text)));
+                break;
+            case 'edit_news':
+                // This request is the preparation for the update of the home_news page
+                $home_news = '';
+                if (is_file($homep.$newsf.'_'.$lang.$ext) && is_readable($homep.$newsf.'_'.$lang.$ext)) {
+                    $home_news = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
+                } elseif (is_file($homep.$newsf.$lang.$ext) && is_readable($homep.$newsf.$lang.$ext)) {
+                    $home_news = @(string)file_get_contents($homep.$newsf.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                $home_news = api_to_system_encoding($home_news, api_detect_encoding(strip_tags($home_news)));
+                break;
+            case 'insert_link':
+                // This request is the preparation for the addition of an item in home_menu
+                $home_menu = '';
+                $menuf = ($action == 'edit_tabs')? $mtloggedin : $menuf;
+                if (is_file($homep.$menuf.'_'.$lang.$ext) && is_readable($homep.$menuf.'_'.$lang.$ext)) {
+                    $home_menu = @file($homep.$menuf.'_'.$lang.$ext);
+                } elseif(is_file($homep.$menuf.$lang.$ext) && is_readable($homep.$menuf.$lang.$ext)) {
+                    $home_menu = @file($homep.$menuf.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                if (empty($home_menu)) {
+                    $home_menu = array();
+                }
+                if (!empty($home_menu)) {
+                    $home_menu = implode("\n", $home_menu);
+                    $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+                    $home_menu = explode("\n", $home_menu);
+                }
+                $home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
+                break;
+            case 'insert_tabs':
+                // This request is the preparation for the addition of an item in home_menu
+                $home_menu = '';
+                if (is_file($homep.$mtloggedin.'_'.$lang.$ext) && is_readable($homep.$mtloggedin.'_'.$lang.$ext)) {
+                    $home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
+                } elseif (is_file($homep.$mtloggedin.$lang.$ext) && is_readable($homep.$mtloggedin.$lang.$ext)) {
+                    $home_menu = @file($homep.$mtloggedin.$lang.$ext);
+                } elseif (touch($homep.$mtloggedin.'_'.$lang.$ext)) {
+                    $home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+                if (empty($home_menu)) {
+                    $home_menu = array();
+                }
+                if (!empty($home_menu)) {
+                    $home_menu = implode("\n", $home_menu);
+                    $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+                    $home_menu = explode("\n", $home_menu);
+                }
+                $home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
+                break;
+            case 'edit_tabs':
+            case 'edit_link':
+                // This request is the preparation for the edition of the links array
+                $home_menu = '';
+                $menuf = ($action == 'edit_tabs')? $mtloggedin : $menuf;
+                if (is_file($homep.$menuf.'_'.$lang.$ext) && is_readable($homep.$menuf.'_'.$lang.$ext)) {
+                    $home_menu = @file($homep.$menuf.'_'.$lang.$ext);
+                } elseif(is_file($homep.$menuf.$lang.$ext) && is_readable($homep.$menuf.$lang.$ext)) {
+                    $home_menu = @file($homep.$menuf.$lang.$ext);
+                } else {
+                    $errorMsg = get_lang('HomePageFilesNotReadable');
+                }
+
+                if (empty($home_menu)) {
+                    if (file_exists($homep.$menutabs.'_'.$lang.$ext)) {
+                        $home_menu = @file($homep.$menutabs.'_'.$lang.$ext);
+                    }
+                }
+
+                if (empty($home_menu)) {
+                    $home_menu = array();
+                }
+                if (!empty($home_menu)) {
+                    $home_menu = implode("\n", $home_menu);
+                    $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
+                    $home_menu = explode("\n", $home_menu);
+                }
+
+                $link_index = intval($_GET['link_index']);
+
+                $target_blank = false;
+                $link_name = '';
+                $link_url = '';
+
+                //$home_menu_new = array();
+                //
+                //Cleaning array
+                //foreach ($home_menu as $item) {
+                //	if(!empty($item)) {
+                //		$home_menu_new[] = $item;
+                //	}
+                //}
+                //$home_menu = $home_menu_new;
+
+                // Cleaning the array
+                $home_menu = array_values(array_filter(array_map('trim', $home_menu), 'strlen'));
+
+                // For each line of the home_menu file
+                foreach ($home_menu as $key => $enreg) {
+
+                    // Check if the current item is the one we want to update
+                    if ($key == $link_index) {
+                        // This is the link we want to update
+                        // Check if the target should be "_blank"
+                        if (strstr($enreg, 'target="_blank"')) {
+                            $target_blank = true;
+                        }
+
+                        if (strstr($enreg, 'hide_menu')) {
+                            $add_in_tab = false;
+                        } else {
+                            $add_in_tab = true;
+                        }
+
+                        // Remove dangerous HTML tags from the link itself (this is an
+                        // additional measure in case a link previously contained
+                        // unsecure tags)
+                        $link_name = strip_tags($enreg);
+
+                        // Get the contents of "href" attribute in $link_url
+                        $enreg = explode('href="',$enreg);
+                        list($link_url) = explode('"', $enreg[sizeof($enreg) - 1]);
+
+                        // If the link contains the web root of this portal, then strip
+                        // it off and keep only the name of the file that needs edition
+                        if (strstr($link_url, '?include=')) {
+                            $link_url = explode('?include=', $link_url);
+
+                            $filename = $link_url[sizeof($link_url) - 1];
+
+                            if (!strstr($filename, '/') && strstr($filename, '.html')) {
+                                // Get oonly the contents of the link file
+                                $link_html = @file($homep.$filename);
+                                $link_html = implode('', $link_html);
+                                $link_url = '';
+                            } else {
+                                $filename = '';
+                            }
+                        }
+                        break;
+                    }
+                }
+                break;
+        }//end of second switch($action) (when POST['formSent'] was not set, yet)
+    }// end of "else" in if($_POST['formSent']) condition
 } else {
-	//if $action is empty, then prepare a list of the course categories to display (?)
-	$Categories = CourseCategory::getCategoriesToDisplayInHomePage();
+    //if $action is empty, then prepare a list of the course categories to display (?)
+    $Categories = CourseCategory::getCategoriesToDisplayInHomePage();
 }
 
 // Display section
@@ -783,25 +783,25 @@ 
 Display::display_header($tool_name);
 
 switch ($action) {
-	case 'open_link':
-		if (!empty($link)) {
-			// $link is only set in case of action=open_link and is filtered
-			$open = @(string)file_get_contents($homep.$link);
-			$open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
-			echo $open;
-		}
-		break;
-	case 'edit_notice':
-		// Display for edit_notice case
-		?>
+    case 'open_link':
+        if (!empty($link)) {
+            // $link is only set in case of action=open_link and is filtered
+            $open = @(string)file_get_contents($homep.$link);
+            $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
+            echo $open;
+        }
+        break;
+    case 'edit_notice':
+        // Display for edit_notice case
+        ?>
 		<form action="<?php echo $selfUrl; ?>?action=<?php echo $action; ?>" method="post" class="form-horizontal">
 			<legend><?php echo $tool_name; ?></legend>
 			<input type="hidden" name="formSent" value="1"/>
 			<?php
-			if (!empty($errorMsg)) {
-				Display::display_normal_message($errorMsg);
-			}
-			?>
+            if (!empty($errorMsg)) {
+                Display::display_normal_message($errorMsg);
+            }
+            ?>
                         <div class="row">
                             <div class="col-md-12">
                                 <p><?php echo get_lang('LetThoseFieldsEmptyToHideTheNotice'); ?></p>
@@ -839,170 +839,170 @@ 
                         </div>
 		</form>
 		<?php
-		break;
-	case 'insert_tabs':
-	case 'edit_tabs':
-	case 'insert_link':
-	case 'edit_link':
-		$menuf = ($action == 'insert_tabs' || $action == 'edit_tabs') ? $mtloggedin : $menuf;
-		if (!empty($errorMsg)) {
-			Display::display_normal_message($errorMsg);
-		}
-		$default = array();
-		$form = new FormValidator('configure_homepage_'.$action, 'post', $selfUrl.'?action='.$action, '', array('style' => 'margin: 0px;'));
-		$renderer =& $form->defaultRenderer();
-
-		$form->addElement('header', '', $tool_name);
-		$form->addElement('hidden', 'formSent', '1');
-		$form->addElement('hidden', 'link_index', ($action == 'edit_link' || $action == 'edit_tabs') ? $link_index : '0');
-		$form->addElement('hidden', 'filename', ($action == 'edit_link' || $action == 'edit_tabs') ? (!empty($filename) ? $filename : '') : '');
-
-		$form->addElement('text', 'link_name', get_lang('LinkName'), array('size' => '30', 'maxlength' => '50'));
-		if (!empty($link_name)) {
-			$default['link_name'] = $link_name;
-		}
-		$default['link_url'] = empty($link_url) ? 'http://' : api_htmlentities($link_url, ENT_QUOTES);
-		$linkUrlComment = ($action == 'insert_tabs') ? get_lang('Optional').'<br />'.get_lang('GlobalLinkUseDoubleColumnPrivateToShowPrivately') : '';
-		$form->addElement('text', 'link_url', array(get_lang('LinkURL'), $linkUrlComment), array('size' => '30', 'maxlength' => '100', 'style' => 'width: 350px;'));
-
-		$options = array('-1' => get_lang('FirstPlace'));
-
-		$selected = '';
-
-		if ($action == 'insert_link' || $action == 'insert_tabs') {
-			$add_in_tab = 1;
-			if (is_array($home_menu)){
-				foreach ($home_menu as $key => $enreg) {
-					if (strlen($enreg = trim(strip_tags($enreg))) > 0) {
-						$options[$key] = get_lang('After').' &quot;'.$enreg.'&quot;';
-						$formSentCheck = (!empty($_POST['formSent']) ? true : false);
-						$selected = $formSentCheck && $insert_where == $key ? $key : '';
-					}
-				}
-			}
-			$default['insert_link'] = $selected;
-			$form->addElement('select', 'insert_where', get_lang('InsertThisLink') , $options);
-		}
-
-		$target_blank_checkbox = $form->addElement('checkbox', 'target_blank', null, get_lang('OpenInNewWindow'), 1);
-
-		if ($action == 'insert_tabs' || $action == 'edit_tabs') {
-			$form->addElement('checkbox', 'add_in_tab', null, get_lang('AddInMenu'), 1);
-			$default['add_in_tab'] = $add_in_tab;
-		}
-
-		if (!empty($target_blank)) { $target_blank_checkbox->setChecked(true); }
-
-		if ($action == 'edit_link' && (empty($link_url) || $link_url == 'http://' || $link_url == 'https://')) {
-			$default['link_html'] = isset($_POST['link_html']) ? $_POST['link_html'] : $link_html;
-			$form->addHtmlEditor('link_html', get_lang('Content'), false, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
+        break;
+    case 'insert_tabs':
+    case 'edit_tabs':
+    case 'insert_link':
+    case 'edit_link':
+        $menuf = ($action == 'insert_tabs' || $action == 'edit_tabs') ? $mtloggedin : $menuf;
+        if (!empty($errorMsg)) {
+            Display::display_normal_message($errorMsg);
+        }
+        $default = array();
+        $form = new FormValidator('configure_homepage_'.$action, 'post', $selfUrl.'?action='.$action, '', array('style' => 'margin: 0px;'));
+        $renderer =& $form->defaultRenderer();
+
+        $form->addElement('header', '', $tool_name);
+        $form->addElement('hidden', 'formSent', '1');
+        $form->addElement('hidden', 'link_index', ($action == 'edit_link' || $action == 'edit_tabs') ? $link_index : '0');
+        $form->addElement('hidden', 'filename', ($action == 'edit_link' || $action == 'edit_tabs') ? (!empty($filename) ? $filename : '') : '');
+
+        $form->addElement('text', 'link_name', get_lang('LinkName'), array('size' => '30', 'maxlength' => '50'));
+        if (!empty($link_name)) {
+            $default['link_name'] = $link_name;
+        }
+        $default['link_url'] = empty($link_url) ? 'http://' : api_htmlentities($link_url, ENT_QUOTES);
+        $linkUrlComment = ($action == 'insert_tabs') ? get_lang('Optional').'<br />'.get_lang('GlobalLinkUseDoubleColumnPrivateToShowPrivately') : '';
+        $form->addElement('text', 'link_url', array(get_lang('LinkURL'), $linkUrlComment), array('size' => '30', 'maxlength' => '100', 'style' => 'width: 350px;'));
+
+        $options = array('-1' => get_lang('FirstPlace'));
+
+        $selected = '';
+
+        if ($action == 'insert_link' || $action == 'insert_tabs') {
+            $add_in_tab = 1;
+            if (is_array($home_menu)){
+                foreach ($home_menu as $key => $enreg) {
+                    if (strlen($enreg = trim(strip_tags($enreg))) > 0) {
+                        $options[$key] = get_lang('After').' &quot;'.$enreg.'&quot;';
+                        $formSentCheck = (!empty($_POST['formSent']) ? true : false);
+                        $selected = $formSentCheck && $insert_where == $key ? $key : '';
+                    }
+                }
+            }
+            $default['insert_link'] = $selected;
+            $form->addElement('select', 'insert_where', get_lang('InsertThisLink') , $options);
+        }
+
+        $target_blank_checkbox = $form->addElement('checkbox', 'target_blank', null, get_lang('OpenInNewWindow'), 1);
+
+        if ($action == 'insert_tabs' || $action == 'edit_tabs') {
+            $form->addElement('checkbox', 'add_in_tab', null, get_lang('AddInMenu'), 1);
+            $default['add_in_tab'] = $add_in_tab;
+        }
+
+        if (!empty($target_blank)) { $target_blank_checkbox->setChecked(true); }
+
+        if ($action == 'edit_link' && (empty($link_url) || $link_url == 'http://' || $link_url == 'https://')) {
+            $default['link_html'] = isset($_POST['link_html']) ? $_POST['link_html'] : $link_html;
+            $form->addHtmlEditor('link_html', get_lang('Content'), false, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
             $form->addButtonSave(get_lang('Save'),'submit');
 
-		} else {
-			if (in_array($action, array('edit_tabs','insert_tabs'))) {
-				$default['link_html'] = isset($_POST['link_html']) ? $_POST['link_html'] : (!empty($link_html) ? $link_html : '');
-				$form->addHtmlEditor('link_html', get_lang('Content'), false, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
-			}
-			$form->addElement('checkbox', 'all_langs', null, get_lang('ApplyAllLanguages'), array('id' => 'all_langs'));
-			$form->addElement('html','<table id="table_langs" style="margin-left:159px;"><tr>');
-			$i = 0;
-			foreach ($_languages['name'] as $key => $value) {
-				$i++;
-				$lang_name = $_languages['folder'][$key];
-				$html_langs = '<td width="300">';
-				$html_langs .= '<label><input type="checkbox" id="lang" name="'.$lang_name.'" />&nbsp;'.$lang_name.'<label/>';
-				$html_langs .= '</td>';
-				if ($i % 5 == 0) {
-					$html_langs .= '</tr><tr>';
-				}
-				$form->addElement('html', $html_langs);
-			}
-			$form->addElement('html','</tr></table><br/>');
+        } else {
+            if (in_array($action, array('edit_tabs','insert_tabs'))) {
+                $default['link_html'] = isset($_POST['link_html']) ? $_POST['link_html'] : (!empty($link_html) ? $link_html : '');
+                $form->addHtmlEditor('link_html', get_lang('Content'), false, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
+            }
+            $form->addElement('checkbox', 'all_langs', null, get_lang('ApplyAllLanguages'), array('id' => 'all_langs'));
+            $form->addElement('html','<table id="table_langs" style="margin-left:159px;"><tr>');
+            $i = 0;
+            foreach ($_languages['name'] as $key => $value) {
+                $i++;
+                $lang_name = $_languages['folder'][$key];
+                $html_langs = '<td width="300">';
+                $html_langs .= '<label><input type="checkbox" id="lang" name="'.$lang_name.'" />&nbsp;'.$lang_name.'<label/>';
+                $html_langs .= '</td>';
+                if ($i % 5 == 0) {
+                    $html_langs .= '</tr><tr>';
+                }
+                $form->addElement('html', $html_langs);
+            }
+            $form->addElement('html','</tr></table><br/>');
             $form->addButtonSave(get_lang('Save'),'submit');
-		}
-
-		$form->setDefaults($default);
-		$form->display();
-
-		break;
-	case 'edit_top':
-	case 'edit_news':
-		if ($action == 'edit_top') {
-			$name = $topf;
-			$open = $home_top;
-		} else {
-			$name = $newsf;
-			$open = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
-		}
-		$open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
-
-		if (!empty($errorMsg)) {
-			Display::display_normal_message($errorMsg); //main API
-		}
-
-		$default = array();
-		$form = new FormValidator(
-			'configure_homepage_'.$action,
-			'post',
-			$selfUrl.'?action='.$action,
-			'',
-			array('style' => 'margin: 0px;')
-		);
-		$renderer =& $form->defaultRenderer();
-		$renderer->setHeaderTemplate('');
-		$renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
-		$renderer->setCustomElementTemplate('<tr><td>{element}</td></tr>');
-		$renderer->setRequiredNoteTemplate('');
-		$form->addElement('hidden', 'formSent', '1');
-
-		if ($action == 'edit_news') {
-			$_languages = api_get_languages();
-			$html = '<tr><td>'.get_lang('ChooseNewsLanguage').' : ';
-			$html .= '<select name="news_languages">';
-			$html .= '<option value="all">'.get_lang('ApplyAllLanguages').'</option>';
-			foreach ($_languages['name'] as $key => $value) {
-				$english_name = $_languages['folder'][$key];
-				if ($language == $english_name) {
-					$html .= '<option value="'.$english_name.'" selected="selected">'.$value.'</option>';
-				} else {
-					$html .= '<option value="'.$english_name.'">'.$value.'</option>';
-				}
-			}
-			$html .= '</select></td></tr>';
-			$form->addElement('html', $html);
-		}
-
-		$default[$name] = str_replace('{rel_path}', api_get_path(REL_PATH), $open);
-		$form->addHtmlEditor($name, '', true, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
-		$form->addElement('checkbox', 'all_langs', null, get_lang('ApplyAllLanguages'),array('id' => 'all_langs'));
-		$form->addElement('html','<table id="table_langs" style="margin-left:5px;"><tr>');
-
-		$currentLanguage = api_get_interface_language();
-		$i = 0;
-		foreach ($_languages['name'] as $key => $value) {
-			$lang_name = $_languages['folder'][$key];
-			$i++;
-
-			$checked = null;
-			if ($languageGet == $lang_name)  {
-				$checked = "checked";
-			}
-			$html_langs = '<td width="300">';
-			$html_langs .= '<label><input type="checkbox" '.$checked.' id="lang" name="'.$lang_name.'" />&nbsp;'.$value.'<label/>';
-			$html_langs .= '</td>';
-			if ($i % 5 == 0) {
-				$html_langs .= '</tr><tr>';
-			}
-			$form->addElement('html', $html_langs);
-		}
-		$form->addElement('html','</tr></table><br/>');
-		$form->addButtonSave(get_lang('Save'));
-		$form->setDefaults($default);
-		$form->display();
-
-		break;
-	default: // When no action applies, default page to update campus homepage
-		?>
+        }
+
+        $form->setDefaults($default);
+        $form->display();
+
+        break;
+    case 'edit_top':
+    case 'edit_news':
+        if ($action == 'edit_top') {
+            $name = $topf;
+            $open = $home_top;
+        } else {
+            $name = $newsf;
+            $open = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
+        }
+        $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
+
+        if (!empty($errorMsg)) {
+            Display::display_normal_message($errorMsg); //main API
+        }
+
+        $default = array();
+        $form = new FormValidator(
+            'configure_homepage_'.$action,
+            'post',
+            $selfUrl.'?action='.$action,
+            '',
+            array('style' => 'margin: 0px;')
+        );
+        $renderer =& $form->defaultRenderer();
+        $renderer->setHeaderTemplate('');
+        $renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
+        $renderer->setCustomElementTemplate('<tr><td>{element}</td></tr>');
+        $renderer->setRequiredNoteTemplate('');
+        $form->addElement('hidden', 'formSent', '1');
+
+        if ($action == 'edit_news') {
+            $_languages = api_get_languages();
+            $html = '<tr><td>'.get_lang('ChooseNewsLanguage').' : ';
+            $html .= '<select name="news_languages">';
+            $html .= '<option value="all">'.get_lang('ApplyAllLanguages').'</option>';
+            foreach ($_languages['name'] as $key => $value) {
+                $english_name = $_languages['folder'][$key];
+                if ($language == $english_name) {
+                    $html .= '<option value="'.$english_name.'" selected="selected">'.$value.'</option>';
+                } else {
+                    $html .= '<option value="'.$english_name.'">'.$value.'</option>';
+                }
+            }
+            $html .= '</select></td></tr>';
+            $form->addElement('html', $html);
+        }
+
+        $default[$name] = str_replace('{rel_path}', api_get_path(REL_PATH), $open);
+        $form->addHtmlEditor($name, '', true, false, array('ToolbarSet' => 'PortalHomePage', 'Width' => '100%', 'Height' => '400'));
+        $form->addElement('checkbox', 'all_langs', null, get_lang('ApplyAllLanguages'),array('id' => 'all_langs'));
+        $form->addElement('html','<table id="table_langs" style="margin-left:5px;"><tr>');
+
+        $currentLanguage = api_get_interface_language();
+        $i = 0;
+        foreach ($_languages['name'] as $key => $value) {
+            $lang_name = $_languages['folder'][$key];
+            $i++;
+
+            $checked = null;
+            if ($languageGet == $lang_name)  {
+                $checked = "checked";
+            }
+            $html_langs = '<td width="300">';
+            $html_langs .= '<label><input type="checkbox" '.$checked.' id="lang" name="'.$lang_name.'" />&nbsp;'.$value.'<label/>';
+            $html_langs .= '</td>';
+            if ($i % 5 == 0) {
+                $html_langs .= '</tr><tr>';
+            }
+            $form->addElement('html', $html_langs);
+        }
+        $form->addElement('html','</tr></table><br/>');
+        $form->addButtonSave(get_lang('Save'));
+        $form->setDefaults($default);
+        $form->display();
+
+        break;
+    default: // When no action applies, default page to update campus homepage
+        ?>
 
 <section id="page-home">
     <div class="row">
@@ -1158,53 +1158,53 @@ 
             ?>
 
             <?php
-		if (file_exists($homep.$newsf.'_'.$lang.$ext)) {
+        if (file_exists($homep.$newsf.'_'.$lang.$ext)) {
                     $open = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
                     $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
                     echo $open;
-		} else {
+        } else {
                     $open = @(string)file_get_contents($homep.$newsf.$ext);
                     $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
                     echo $open;
-		}
+        }
             ?>
 
             <?php
                 // Add new page
-		$home_menu = '';
-		if (file_exists($homep.$mtloggedin.'_'.$lang.$ext)) {
+        $home_menu = '';
+        if (file_exists($homep.$mtloggedin.'_'.$lang.$ext)) {
                     $home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
-		} else {
+        } else {
                     $home_menu = @file($homep.$mtloggedin.$ext);
-		}
-		if (empty($home_menu)) {
+        }
+        if (empty($home_menu)) {
                     if (file_exists($homep.$menutabs.'_'.$lang.$ext)) {
-			$home_menu = @file($homep.$menutabs.'_'.$lang.$ext);
+            $home_menu = @file($homep.$menutabs.'_'.$lang.$ext);
                     }
-		}
-		if (empty($home_menu)) {
+        }
+        if (empty($home_menu)) {
                     $home_menu = array();
-		}
-		if (!empty($home_menu)) {
+        }
+        if (!empty($home_menu)) {
                     $home_menu = implode("\n", $home_menu);
                     $home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
                     $home_menu = explode("\n", $home_menu);
-		}
-		$link_list = '';
-		$tab_counter = 0;
+        }
+        $link_list = '';
+        $tab_counter = 0;
                     foreach ($home_menu as $enreg) {
                     $enreg = trim($enreg);
-			if (!empty($enreg)) {
+            if (!empty($enreg)) {
                             $edit_link   = ' <a href="'.$selfUrl.'?action=edit_tabs&amp;link_index='.$tab_counter.'" ><span>'.Display::return_icon('edit.png', get_lang('Edit')).'</span></a>';
                             $delete_link = ' <a href="'.$selfUrl.'?action=delete_tabs&amp;link_index='.$tab_counter.'"  onclick="javascript: if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES)).'\')) return false;"><span>'.Display::return_icon('delete.png', get_lang('Delete')).'</span></a>';
                             $tab_string = str_replace(array('href="'.api_get_path(WEB_PATH).'index.php?include=', '</li>'),
                                 array('href="'.api_get_path(WEB_CODE_PATH).'admin/'.basename($selfUrl).'?action=open_link&link=', $edit_link.$delete_link.'</li>'),
-				$enreg);
+                $enreg);
                             $tab_string = str_replace(array('<li>', '</li>','class="hide_menu"', 'hide_menu'), '', $tab_string);
-				$link_list .= Display::tag('li', $tab_string, array('class' => 'list-group-item'));
-				$tab_counter++;
-			}
-		}
+                $link_list .= Display::tag('li', $tab_string, array('class' => 'list-group-item'));
+                $tab_counter++;
+            }
+        }
             ?>
             <div class="actions">
 		<a href="<?php echo $selfUrl; ?>?action=insert_tabs">
@@ -1212,9 +1212,9 @@ 
                 </a>
             </div>
             <?php
-		echo '<ul id="list-hiperlink" class="list-group">';
-		echo $link_list;
-		echo '</ul>';
+        echo '<ul id="list-hiperlink" class="list-group">';
+        echo $link_list;
+        echo '</ul>';
             ?>
         </div>
     </div>

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='';
-					$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='';
+                    $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);
+    }
 }