chamilo / chamilo-lms

plugin/pens/lib/pens/pens_request.php

Indentation +447 added lines, -447 removed lines

@@ -43,453 +43,453 @@
 
 abstract class PENSRequest extends PENSMessage {
 
-	/**
-	 * PENS Version to be used. Currently, the only valid value is 1.0.0. Required.
-	 * @var string
-	 */
-	protected $_pens_version = null;
-	
-	/**
-	 * Command being used. The only valid values are collect, alert and receipt.Required
-	 * @var string
-	 */
-	protected $_command = null;
-	
-	/**
-	 * Package type being used. The only valid values are aicc-pkg, scorm-pif, ims-qti. Required
-	 * @var string
-	 */
-	protected $_package_type = null;
-	
-	/**
-	 * Package type version. Required
-	 * @var string
-	 */
-	protected $_package_type_version = null;
-	
-	/**
-	 * Package format. The only valid values are zip, url, jar, war and xml. Required
-	 * @var string
-	 */
-	protected $_package_format = null;
-	
-	/**
-	 * Package id. Requires a valid URI according to RFC 2396. Required
-	 * @var string
-	 */
-	protected $_package_id = null;
-	
-	/**
-	 * Package url. Requires a valid, fully qualified URL including transport protocol and filename extension. Required
-	 * @var string
-	 */
-	protected $_package_url = null;
-	
-	/**
-	 * User id required for system to retrieve package from URL. Optional.
-	 * @var string
-	 */
-	protected $_package_url_user_id = null;
-	
-	/**
-	 * Account required for system to retrieve package from URL. Optional.
-	 * @var string
-	 */
-	protected $_package_url_account = null;
-	
-	/**
-	 * Password required for system to retrieve package from URL. Optional.
-	 * @var string
-	 */
-	protected $_package_url_password = null;
-	
-	/**
-	 * Expiry date for package URL. ISO 8601 format expressed as UTC. Will be transformed into a PHP DateTime object during construction. Required
-	 * @var DateTime
-	 */
-	protected $_package_url_expiry = null;
-	
-	/**
-	 * Name or ID for client submitting the content package to the target system. Required.
-	 * @var string
-	 */
-	protected $_client = null;
-	
-	/**
-	 * User-id or sign-on for target system. Optional
-	 * @var string
-	 */
-	protected $_system_user_id = null;
-	
-	/**
-	 * Either a URL-encoded password token or the null string. If the 
-	 * target system requires a password and the null string value is 
-	 * passed, then the target system is responsible for prompting for a 
-	 * password for target system. Optional
-	 * @var string
-	 */
-	protected $_system_password = null;
-	
-	/**
-	 * URL to send acknowledgement receipt after collecting a package. Any URL, including mailto (as per RFC 2368 and RFC 2822). Required.
-	 * @var string
-	 */
-	protected $_receipt = null;
-	
-	/**
-	 * URL to send alerts to while processing the package. Any URL, including mailto (as per RFC 2368 and RFC 2822). Optional.
-	 * @var string
-	 */
-	protected $_alerts = null;
-	
-	/**
-	 * Unstructured character string that may be used to transfer vendor-specific data such as processing hints or deployment information. Optional.
-	 * @var string
-	 */
-	protected $_vendor_data = null;
-	
-	/**
-	 * Constructor
-	 * 
-	 * Constructs a PENSRequest based class using the arguments given
-	 * 
-	 * @param array Arguments
-	 */
-	public function __construct($arguments) {
-		$this->setPensVersion($arguments["pens-version"]);
-		$this->setPackageType($arguments["package-type"]);
-		$this->setPackageTypeVersion($arguments["package-type-version"]);
-		$this->setPackageFormat($arguments["package-format"]);
-		$this->setPackageId($arguments["package-id"]);
-		$this->setPackageUrl($arguments["package-url"]);
-		$this->setPackageUrlUserId($arguments["package-url-user-id"]);
-		$this->setPackageUrlAccount($arguments["package-url-account"]);
-		$this->setPackageUrlPassword($arguments["package-url-password"]);
-		$this->setPackageUrlExpiry($arguments["package-url-expiry"]);
-		$this->setClient($arguments["client"]);
-		$this->setSystemUserId($arguments["system-user-id"]);
-		$this->setSystemPassword($arguments["system-password"]);
-		$this->setReceipt($arguments["receipt"]);
-		$this->setAlerts($arguments["alerts"]);
-		$this->setVendorData($arguments["vendor-data"]);
-	}
-	
-	public function getPensVersion() {
-		return $this->_pens_version;
-	}
-	
-	/**
-	 * Sets the PENS version
-	 * 
-	 * @param string PENS version
-	 * 
-	 * @throws PENSException with code 2001 if invalid
-	 */
-	public function setPensVersion($pens_version) {
-		if($pens_version == PENSConfig::$version) {
-			$this->_pens_version = $pens_version;
-		} else {
-			throw new PENSException(2001);
-		}
-	}
-	
-	public function getCommand() {
-		return $this->_command;
-	}
-	
-	/**
-	 * Sets the command
-	 * 
-	 * @param string command
-	 * 
-	 * @throws PENSException with code 2002 if invalid
-	 */
-	protected function setCommand($command) {
-		if(in_array($command, PENSConfig::$allowed_commands)) {
-			$this->_command = $command;
-		} else {
-			throw new PENSException(2002);
-		}
-	}
-	
-	public function getPackageType() {
-		return $this->_package_type;
-	}
-	
-	/**
-	 * Sets the package type
-	 * 
-	 * @param string package type
-	 * 
-	 * @throws PENSException with code 2003 if invalid
-	 */
-	public function setPackageType($package_type) {
-		if(in_array($package_type, PENSConfig::$allowed_package_types)) {
-			$this->_package_type = $package_type;
-		} else {
-			throw new PENSException(2003);
-		}
-	}
-	
-	public function getPackageTypeVersion() {
-		return $this->_package_type_version;
-	}
-	
-	/**
-	 * Sets the package type version
-	 * 
-	 * @param string package type version
-	 * 
-	 * @throws PENSException with code 2004 if invalid
-	 */
-	public function setPackageTypeVersion($package_type_version) {
-		if(empty($package_type_version)) {
-			throw new PENSException(2004);
-		} else {
-			$this->_package_type_version = $package_type_version;
-		}
-	}
-	
-	public function getPackageFormat() {
-		return $this->_package_format;
-	}
-	
-	/**
-	 * Sets the package format
-	 * 
-	 * @param string package format
-	 * 
-	 * @throws PENSException with code 2005 if invalid
-	 */
-	public function setPackageFormat($package_format) {
-		if(in_array($package_format, PENSConfig::$allowed_package_formats)) {
-			$this->_package_format = $package_format;
-		} else {
-			throw new PENSException(2005);
-		}
-	}
-	
-	public function getPackageId() {
-		return $this->_package_id;
-	}
-	
-	/**
-	 * Sets the package Id
-	 * 
-	 * @param string package Id
-	 * 
-	 * @throws PENSException with code 2007 if invalid
-	 */
-	public function setPackageId($package_id) {
-		if (preg_match('/'.ABSOLUTEURI_2396.'/', $package_id)) {
-			$this->_package_id = $package_id;
-		} else {
-			throw new PENSException(2007);
-		}
-	}
-	
-	public function getPackageUrl() {
-		return $this->_package_url;
-	}
-	
-	/**
-	 * Sets the package url
-	 * 
-	 * @param string package url
-	 * 
-	 * @throws PENSException with code 2008 if invalid
-	 */
-	public function setPackageUrl($package_url) {
-		if (preg_match('/'.ABSOLUTEURI_2396.'/', $package_url) && substr($package_url, -4) == ".".$this->_package_format) {
-			$this->_package_url = $package_url;
-		} else {
-			throw new PENSException(2008);
-		}
-	}
-	
-	public function getFilename() {
-		return substr(strrchr($this->_package_url, "/"), 1);
-	}
-	
-	public function getPackageUrlUserId() {
-		return $this->_package_url_user_id;
-	}
-	
-	public function setPackageUrlUserId($package_url_user_id) {
-		if(!empty($package_url_user_id)) {
-			$this->_package_url_user_id = $package_url_user_id;
-		}
-	}
-	
-	public function getPackageUrlAccount() {
-		return $this->_package_url_account;
-	}
-	
-	public function setPackageUrlAccount($package_url_account) {
-		if(!empty($package_url_account)) {
-			$this->_package_url_account = $package_url_account;
-		}
-	}
-	
-	public function getPackageUrlPassword() {
-		return $this->_package_url_password;
-	}
-	
-	public function setPackageUrlPassword($package_url_password) {
-		if(!empty($package_url_password)) {
-			$this->_package_url_password = $package_url_password;
-		}
-	}
-	
-	public function getPackageUrlExpiry() {
-		return $this->_package_url_expiry;
-	}
-	
-	/**
-	 * Sets the package url expiry and transforms it into a php DateTime object
-	 * 
-	 * @param string package url expiry
-	 * 
-	 * @throws PENSException with code 2009 if invalid
-	 * @todo Perform a better validation of the date
-	 */
-	public function setPackageUrlExpiry($package_url_expiry) {
-		if(empty($package_url_expiry)) {
-			throw new PENSException(2009);
-		} else {
-			try {
-				$expiry = new DateTime($package_url_expiry, new DateTimeZone('UTC'));
-				$this->_package_url_expiry = $expiry;
-			} catch(Exception $e) {
-				throw new PENSException(2009);
-			}
-		}
-	}
-	
-	public function getClient() {
-		return $this->_client;
-	}
-	
-	/**
-	 * Sets the client
-	 * 
-	 * @param string client
-	 * 
-	 * @throws PENSException with code 2010 if invalid
-	 */
-	public function setClient($client) {
-		if(!empty($client)) {
-			$this->_client = $client;
-		} else {
-			throw new PENSException(2010);
-		}
-	}
-	
-	public function getSystemUserId() {
-		return $this->_system_user_id;
-	}
-	
-	public function setSystemUserId($system_user_id) {
-		if(!empty($system_user_id)) {
-			$this->_system_user_id = $system_user_id;
-		}
-	}
-	
-	public function getSystemPassword() {
-		return $this->_system_password;
-	}
-	
-	public function setSystemPassword($system_password) {
-		if(!empty($system_password)) {
-			$this->_system_password = $system_password;
-		}
-	}
-	
-	public function getReceipt() {
-		return $this->_receipt;
-	}
-	
-	/**
-	 * Sets the receipt url
-	 * 
-	 * @param string receipt url
-	 * 
-	 * @throws PENSException with code 2011 if invalid
-	 */
-	public function setReceipt($receipt) {
-		if($this instanceof PENSRequestCollect) {
-			if (preg_match('/'.ABSOLUTEURI_2396.'/', $receipt)) {
-				$this->_receipt = $receipt;
-			} else {
-				throw new PENSException(2011);
-			}
-		}
-	}
-	
-	public function getAlerts() {
-		return $this->_alerts;
-	}
-	
-	public function setAlerts($alerts) {
-		if(!empty($alerts)) {
-			if(preg_match('/'.ABSOLUTEURI_2396.'/', $alerts)) {
-				$this->_alerts = $alerts;
-			} else {
-				throw new PENSException(1201);
-			}
-		}
-	}
-	
-	public function getVendorData() {
-		return $this->_vendor_data;
-	}
-	
-	public function setVendorData($vendor_data) {
-		if(!empty($vendor_data)) {
-			$this->_vendor_data = $vendor_data;
-		}
-	}
-	
-	/**
-	 * Returns an associative that contains all the fields needed to send a
-	 * receipt or an alert to the client
-	 * 
-	 * @return array Associative array
-	 */
-	protected function getSendReceiptAlertArray() {
-		return array("pens-version" => $this->getPensVersion(),
-			"package-type" => $this->getPackageType(),
-			"package-type-version" => $this->getPackageTypeVersion(),
-			"package-format" => $this->getPackageFormat(),
-			"package-id" => $this->getPackageId(),
-			"package-url" => $this->getPackageUrl(),
-			"package-url-expiry" => $this->getPackageUrlExpiry()->format(DateTime::ISO8601),
-			"client" => $this->getClient());
-	}
-	
-	/**
-	 * Returns an associative that contains all the fields needed to send a
-	 * receipt to the client
-	 * 
-	 * @return array Associative array
-	 */
-	public function getSendReceiptArray() {
-		$receipt = $this->getSendReceiptAlertArray();
-		$receipt["command"] = "receipt";
-		return $receipt;
-	}
-	
-	/**
-	 * Returns an associative that contains all the fields needed to send an
-	 * alert to the client
-	 * 
-	 * @return array Associative array
-	 */
-	public function getSendAlertArray() {
-		$alert = $this->getSendReceiptAlertArray();
-		$alert["command"] = "alert";
-		return $alert;
-	}
+    /**
+     * PENS Version to be used. Currently, the only valid value is 1.0.0. Required.
+     * @var string
+     */
+    protected $_pens_version = null;
+	
+    /**
+     * Command being used. The only valid values are collect, alert and receipt.Required
+     * @var string
+     */
+    protected $_command = null;
+	
+    /**
+     * Package type being used. The only valid values are aicc-pkg, scorm-pif, ims-qti. Required
+     * @var string
+     */
+    protected $_package_type = null;
+	
+    /**
+     * Package type version. Required
+     * @var string
+     */
+    protected $_package_type_version = null;
+	
+    /**
+     * Package format. The only valid values are zip, url, jar, war and xml. Required
+     * @var string
+     */
+    protected $_package_format = null;
+	
+    /**
+     * Package id. Requires a valid URI according to RFC 2396. Required
+     * @var string
+     */
+    protected $_package_id = null;
+	
+    /**
+     * Package url. Requires a valid, fully qualified URL including transport protocol and filename extension. Required
+     * @var string
+     */
+    protected $_package_url = null;
+	
+    /**
+     * User id required for system to retrieve package from URL. Optional.
+     * @var string
+     */
+    protected $_package_url_user_id = null;
+	
+    /**
+     * Account required for system to retrieve package from URL. Optional.
+     * @var string
+     */
+    protected $_package_url_account = null;
+	
+    /**
+     * Password required for system to retrieve package from URL. Optional.
+     * @var string
+     */
+    protected $_package_url_password = null;
+	
+    /**
+     * Expiry date for package URL. ISO 8601 format expressed as UTC. Will be transformed into a PHP DateTime object during construction. Required
+     * @var DateTime
+     */
+    protected $_package_url_expiry = null;
+	
+    /**
+     * Name or ID for client submitting the content package to the target system. Required.
+     * @var string
+     */
+    protected $_client = null;
+	
+    /**
+     * User-id or sign-on for target system. Optional
+     * @var string
+     */
+    protected $_system_user_id = null;
+	
+    /**
+     * Either a URL-encoded password token or the null string. If the 
+     * target system requires a password and the null string value is 
+     * passed, then the target system is responsible for prompting for a 
+     * password for target system. Optional
+     * @var string
+     */
+    protected $_system_password = null;
+	
+    /**
+     * URL to send acknowledgement receipt after collecting a package. Any URL, including mailto (as per RFC 2368 and RFC 2822). Required.
+     * @var string
+     */
+    protected $_receipt = null;
+	
+    /**
+     * URL to send alerts to while processing the package. Any URL, including mailto (as per RFC 2368 and RFC 2822). Optional.
+     * @var string
+     */
+    protected $_alerts = null;
+	
+    /**
+     * Unstructured character string that may be used to transfer vendor-specific data such as processing hints or deployment information. Optional.
+     * @var string
+     */
+    protected $_vendor_data = null;
+	
+    /**
+     * Constructor
+     * 
+     * Constructs a PENSRequest based class using the arguments given
+     * 
+     * @param array Arguments
+     */
+    public function __construct($arguments) {
+        $this->setPensVersion($arguments["pens-version"]);
+        $this->setPackageType($arguments["package-type"]);
+        $this->setPackageTypeVersion($arguments["package-type-version"]);
+        $this->setPackageFormat($arguments["package-format"]);
+        $this->setPackageId($arguments["package-id"]);
+        $this->setPackageUrl($arguments["package-url"]);
+        $this->setPackageUrlUserId($arguments["package-url-user-id"]);
+        $this->setPackageUrlAccount($arguments["package-url-account"]);
+        $this->setPackageUrlPassword($arguments["package-url-password"]);
+        $this->setPackageUrlExpiry($arguments["package-url-expiry"]);
+        $this->setClient($arguments["client"]);
+        $this->setSystemUserId($arguments["system-user-id"]);
+        $this->setSystemPassword($arguments["system-password"]);
+        $this->setReceipt($arguments["receipt"]);
+        $this->setAlerts($arguments["alerts"]);
+        $this->setVendorData($arguments["vendor-data"]);
+    }
+	
+    public function getPensVersion() {
+        return $this->_pens_version;
+    }
+	
+    /**
+     * Sets the PENS version
+     * 
+     * @param string PENS version
+     * 
+     * @throws PENSException with code 2001 if invalid
+     */
+    public function setPensVersion($pens_version) {
+        if($pens_version == PENSConfig::$version) {
+            $this->_pens_version = $pens_version;
+        } else {
+            throw new PENSException(2001);
+        }
+    }
+	
+    public function getCommand() {
+        return $this->_command;
+    }
+	
+    /**
+     * Sets the command
+     * 
+     * @param string command
+     * 
+     * @throws PENSException with code 2002 if invalid
+     */
+    protected function setCommand($command) {
+        if(in_array($command, PENSConfig::$allowed_commands)) {
+            $this->_command = $command;
+        } else {
+            throw new PENSException(2002);
+        }
+    }
+	
+    public function getPackageType() {
+        return $this->_package_type;
+    }
+	
+    /**
+     * Sets the package type
+     * 
+     * @param string package type
+     * 
+     * @throws PENSException with code 2003 if invalid
+     */
+    public function setPackageType($package_type) {
+        if(in_array($package_type, PENSConfig::$allowed_package_types)) {
+            $this->_package_type = $package_type;
+        } else {
+            throw new PENSException(2003);
+        }
+    }
+	
+    public function getPackageTypeVersion() {
+        return $this->_package_type_version;
+    }
+	
+    /**
+     * Sets the package type version
+     * 
+     * @param string package type version
+     * 
+     * @throws PENSException with code 2004 if invalid
+     */
+    public function setPackageTypeVersion($package_type_version) {
+        if(empty($package_type_version)) {
+            throw new PENSException(2004);
+        } else {
+            $this->_package_type_version = $package_type_version;
+        }
+    }
+	
+    public function getPackageFormat() {
+        return $this->_package_format;
+    }
+	
+    /**
+     * Sets the package format
+     * 
+     * @param string package format
+     * 
+     * @throws PENSException with code 2005 if invalid
+     */
+    public function setPackageFormat($package_format) {
+        if(in_array($package_format, PENSConfig::$allowed_package_formats)) {
+            $this->_package_format = $package_format;
+        } else {
+            throw new PENSException(2005);
+        }
+    }
+	
+    public function getPackageId() {
+        return $this->_package_id;
+    }
+	
+    /**
+     * Sets the package Id
+     * 
+     * @param string package Id
+     * 
+     * @throws PENSException with code 2007 if invalid
+     */
+    public function setPackageId($package_id) {
+        if (preg_match('/'.ABSOLUTEURI_2396.'/', $package_id)) {
+            $this->_package_id = $package_id;
+        } else {
+            throw new PENSException(2007);
+        }
+    }
+	
+    public function getPackageUrl() {
+        return $this->_package_url;
+    }
+	
+    /**
+     * Sets the package url
+     * 
+     * @param string package url
+     * 
+     * @throws PENSException with code 2008 if invalid
+     */
+    public function setPackageUrl($package_url) {
+        if (preg_match('/'.ABSOLUTEURI_2396.'/', $package_url) && substr($package_url, -4) == ".".$this->_package_format) {
+            $this->_package_url = $package_url;
+        } else {
+            throw new PENSException(2008);
+        }
+    }
+	
+    public function getFilename() {
+        return substr(strrchr($this->_package_url, "/"), 1);
+    }
+	
+    public function getPackageUrlUserId() {
+        return $this->_package_url_user_id;
+    }
+	
+    public function setPackageUrlUserId($package_url_user_id) {
+        if(!empty($package_url_user_id)) {
+            $this->_package_url_user_id = $package_url_user_id;
+        }
+    }
+	
+    public function getPackageUrlAccount() {
+        return $this->_package_url_account;
+    }
+	
+    public function setPackageUrlAccount($package_url_account) {
+        if(!empty($package_url_account)) {
+            $this->_package_url_account = $package_url_account;
+        }
+    }
+	
+    public function getPackageUrlPassword() {
+        return $this->_package_url_password;
+    }
+	
+    public function setPackageUrlPassword($package_url_password) {
+        if(!empty($package_url_password)) {
+            $this->_package_url_password = $package_url_password;
+        }
+    }
+	
+    public function getPackageUrlExpiry() {
+        return $this->_package_url_expiry;
+    }
+	
+    /**
+     * Sets the package url expiry and transforms it into a php DateTime object
+     * 
+     * @param string package url expiry
+     * 
+     * @throws PENSException with code 2009 if invalid
+     * @todo Perform a better validation of the date
+     */
+    public function setPackageUrlExpiry($package_url_expiry) {
+        if(empty($package_url_expiry)) {
+            throw new PENSException(2009);
+        } else {
+            try {
+                $expiry = new DateTime($package_url_expiry, new DateTimeZone('UTC'));
+                $this->_package_url_expiry = $expiry;
+            } catch(Exception $e) {
+                throw new PENSException(2009);
+            }
+        }
+    }
+	
+    public function getClient() {
+        return $this->_client;
+    }
+	
+    /**
+     * Sets the client
+     * 
+     * @param string client
+     * 
+     * @throws PENSException with code 2010 if invalid
+     */
+    public function setClient($client) {
+        if(!empty($client)) {
+            $this->_client = $client;
+        } else {
+            throw new PENSException(2010);
+        }
+    }
+	
+    public function getSystemUserId() {
+        return $this->_system_user_id;
+    }
+	
+    public function setSystemUserId($system_user_id) {
+        if(!empty($system_user_id)) {
+            $this->_system_user_id = $system_user_id;
+        }
+    }
+	
+    public function getSystemPassword() {
+        return $this->_system_password;
+    }
+	
+    public function setSystemPassword($system_password) {
+        if(!empty($system_password)) {
+            $this->_system_password = $system_password;
+        }
+    }
+	
+    public function getReceipt() {
+        return $this->_receipt;
+    }
+	
+    /**
+     * Sets the receipt url
+     * 
+     * @param string receipt url
+     * 
+     * @throws PENSException with code 2011 if invalid
+     */
+    public function setReceipt($receipt) {
+        if($this instanceof PENSRequestCollect) {
+            if (preg_match('/'.ABSOLUTEURI_2396.'/', $receipt)) {
+                $this->_receipt = $receipt;
+            } else {
+                throw new PENSException(2011);
+            }
+        }
+    }
+	
+    public function getAlerts() {
+        return $this->_alerts;
+    }
+	
+    public function setAlerts($alerts) {
+        if(!empty($alerts)) {
+            if(preg_match('/'.ABSOLUTEURI_2396.'/', $alerts)) {
+                $this->_alerts = $alerts;
+            } else {
+                throw new PENSException(1201);
+            }
+        }
+    }
+	
+    public function getVendorData() {
+        return $this->_vendor_data;
+    }
+	
+    public function setVendorData($vendor_data) {
+        if(!empty($vendor_data)) {
+            $this->_vendor_data = $vendor_data;
+        }
+    }
+	
+    /**
+     * Returns an associative that contains all the fields needed to send a
+     * receipt or an alert to the client
+     * 
+     * @return array Associative array
+     */
+    protected function getSendReceiptAlertArray() {
+        return array("pens-version" => $this->getPensVersion(),
+            "package-type" => $this->getPackageType(),
+            "package-type-version" => $this->getPackageTypeVersion(),
+            "package-format" => $this->getPackageFormat(),
+            "package-id" => $this->getPackageId(),
+            "package-url" => $this->getPackageUrl(),
+            "package-url-expiry" => $this->getPackageUrlExpiry()->format(DateTime::ISO8601),
+            "client" => $this->getClient());
+    }
+	
+    /**
+     * Returns an associative that contains all the fields needed to send a
+     * receipt to the client
+     * 
+     * @return array Associative array
+     */
+    public function getSendReceiptArray() {
+        $receipt = $this->getSendReceiptAlertArray();
+        $receipt["command"] = "receipt";
+        return $receipt;
+    }
+	
+    /**
+     * Returns an associative that contains all the fields needed to send an
+     * alert to the client
+     * 
+     * @return array Associative array
+     */
+    public function getSendAlertArray() {
+        $alert = $this->getSendReceiptAlertArray();
+        $alert["command"] = "alert";
+        return $alert;
+    }
 	
 	
 }

plugin/pens/lib/pens/pens_config.php

Indentation +43 added lines, -43 removed lines

@@ -16,54 +16,54 @@
  * along with php-pens.  If not, see <http://www.gnu.org/licenses/>.
  */
  
- /**
- * PENSConfig
- * 
- * Provides the PENSConfig class
- * 
- * @package PENS
- * @author Guillaume Viguier-Just <guillaume@viguierjust.com>
- * @licence http://www.gnu.org/licenses/gpl.txt
- */
+    /**
+     * PENSConfig
+     * 
+     * Provides the PENSConfig class
+     * 
+     * @package PENS
+     * @author Guillaume Viguier-Just <guillaume@viguierjust.com>
+     * @licence http://www.gnu.org/licenses/gpl.txt
+     */
  
- /**
- * PENSConfig
- * 
- * This class provides different static variables to configure php-pens.
- * 
- * @package PENS
- * @author Guillaume Viguier-Just <guillaume@viguierjust.com>
- * @licence http://www.gnu.org/licenses/gpl.txt
- */
+    /**
+     * PENSConfig
+     * 
+     * This class provides different static variables to configure php-pens.
+     * 
+     * @package PENS
+     * @author Guillaume Viguier-Just <guillaume@viguierjust.com>
+     * @licence http://www.gnu.org/licenses/gpl.txt
+     */
 class PENSConfig {
 
-	/**
-	 * PENS version
-	 * @var string
-	 */
-	public static $version = "1.0.0";
+    /**
+     * PENS version
+     * @var string
+     */
+    public static $version = "1.0.0";
 	
-	/**
-	 * Allowed commands
-	 * @var array
-	 */
-	public static $allowed_commands = array("collect", "receipt", "alert");
+    /**
+     * Allowed commands
+     * @var array
+     */
+    public static $allowed_commands = array("collect", "receipt", "alert");
 	
-	/**
-	 * Allowed package types
-	 * @var array
-	 */
-	public static $allowed_package_types = array("aicc-pkg", "scorm-pif", "ims-qti");
+    /**
+     * Allowed package types
+     * @var array
+     */
+    public static $allowed_package_types = array("aicc-pkg", "scorm-pif", "ims-qti");
 	
-	/**
-	 * Allowed package formats
-	 * @var array
-	 */
-	public static $allowed_package_formats = array("zip", "url", "jar", "war", "xml");
+    /**
+     * Allowed package formats
+     * @var array
+     */
+    public static $allowed_package_formats = array("zip", "url", "jar", "war", "xml");
 	
-	/**
-	 * End of line as specified by the PENS specification
-	 * @var string
-	 */
-	public static $eol = "\r\n";
+    /**
+     * End of line as specified by the PENS specification
+     * @var string
+     */
+    public static $eol = "\r\n";
 }

plugin/pens/lib/pens/pens_exception.php

Indentation +55 added lines, -55 removed lines

@@ -37,62 +37,62 @@
  */
 class PENSException extends Exception {
 
-	/**
-	 * Array that provides an association between exception codes and messages
-	 * @var array
-	 */
-	protected static $_code_to_messages = array(
-		1101 => "Unable to parse PENS command",
-		1201 => "Attempt to pass an invalid argument",
-		1301 => "Unable to retrieve package",
-		1302 => "Unable to retrieve package via HTTPS",
-		1304 => "Unable to retrieve package via FTP",
-		1306 => "Unable to retrieve package via FTPS",
-		1310 => "Unable to retrieve package at specified URL due to error in URL or lack of response from URL",
-		1312 => "Unable to retrieve package at specified URL due to error with access credential for package URL",
-		1320 => "Expiration date is non-null and in an improper format",
-		1322 => "Current time indicates expiry date has passed",
-		1420 => "PENS version not supported",
-		1421 => "Command not supported",
-		1430 => "Package type not supported",
-		// The following error code is not specified in the PENS specification and was added in this implementation
-		1431 => "Package format not supported",
-		1432 => "Internal package error",
-		1440 => "Insufficient host space/storage available",
-		1500 => "Unable to communicate with provided acknowledgement URL",
-		1510 => "Unsupported acknowledgement protocol",
-		1520 => "Unsupported alert protocol",
-		2001 => "PENS version invalid or not specified",
-		2002 => "PENS command invalid or not specified",
-		2003 => "package-type invalid or not specified",
-		2004 => "package-type-version invalid or not specified",
-		2005 => "package-format invalid or not specified",
-		2007 => "package-id invalid or not specified",
-		2008 => "package-url invalid or not specified",
-		2009 => "package-url-expiry date invalid or not specified",
-		2010 => "client submitting package invalid or not specified",
-		2011 => "receipt url invalid or not specified"
-	);
+    /**
+     * Array that provides an association between exception codes and messages
+     * @var array
+     */
+    protected static $_code_to_messages = array(
+        1101 => "Unable to parse PENS command",
+        1201 => "Attempt to pass an invalid argument",
+        1301 => "Unable to retrieve package",
+        1302 => "Unable to retrieve package via HTTPS",
+        1304 => "Unable to retrieve package via FTP",
+        1306 => "Unable to retrieve package via FTPS",
+        1310 => "Unable to retrieve package at specified URL due to error in URL or lack of response from URL",
+        1312 => "Unable to retrieve package at specified URL due to error with access credential for package URL",
+        1320 => "Expiration date is non-null and in an improper format",
+        1322 => "Current time indicates expiry date has passed",
+        1420 => "PENS version not supported",
+        1421 => "Command not supported",
+        1430 => "Package type not supported",
+        // The following error code is not specified in the PENS specification and was added in this implementation
+        1431 => "Package format not supported",
+        1432 => "Internal package error",
+        1440 => "Insufficient host space/storage available",
+        1500 => "Unable to communicate with provided acknowledgement URL",
+        1510 => "Unsupported acknowledgement protocol",
+        1520 => "Unsupported alert protocol",
+        2001 => "PENS version invalid or not specified",
+        2002 => "PENS command invalid or not specified",
+        2003 => "package-type invalid or not specified",
+        2004 => "package-type-version invalid or not specified",
+        2005 => "package-format invalid or not specified",
+        2007 => "package-id invalid or not specified",
+        2008 => "package-url invalid or not specified",
+        2009 => "package-url-expiry date invalid or not specified",
+        2010 => "client submitting package invalid or not specified",
+        2011 => "receipt url invalid or not specified"
+    );
 	
-	/**
-	 * Redefines the constructor so that code is the first argument
-	 * 
-	 * @param int Exception code
-	 * @param string Message to display
-	 * @return PENSException Exception created
-	 */
-	public function __construct($code, $message = null) {
-		parent::__construct($message, $code);
-		$this->setMessageBasedOnCode();
-	}
+    /**
+     * Redefines the constructor so that code is the first argument
+     * 
+     * @param int Exception code
+     * @param string Message to display
+     * @return PENSException Exception created
+     */
+    public function __construct($code, $message = null) {
+        parent::__construct($message, $code);
+        $this->setMessageBasedOnCode();
+    }
 	
-	/**
-	 * Sets the message based on the code
-	 */
-	protected function setMessageBasedOnCode() {
-		if(empty($this->message) && !empty(self::$_code_to_messages[$this->code])) {
-			$this->message = self::$_code_to_messages[$this->code];
-		}
-	}
+    /**
+     * Sets the message based on the code
+     */
+    protected function setMessageBasedOnCode() {
+        if(empty($this->message) && !empty(self::$_code_to_messages[$this->code])) {
+            $this->message = self::$_code_to_messages[$this->code];
+        }
+    }
 	
 }

plugin/pens/pens.php

Indentation +13 added lines, -13 removed lines

@@ -29,19 +29,19 @@
 require_once __DIR__ . '/chamilo_pens.php';
 
 class ChamiloPackageHandler extends PENSPackageHandler {
-	public function processPackage($request, $path_to_package) {
-		$server = PENSServer::singleton();
-		// Moves the package to archive/pens
-		$path_to_archives = api_get_path(SYS_ARCHIVE_PATH) . 'pens';
-		if(!is_dir($path_to_archives)) {
-			mkdir($path_to_archives, 0777, true);
-		}
-		rename($path_to_package, $path_to_archives . '/' . $request->getFilename());
-		// Insert the request in the database
-		$chamilo_pens = new ChamiloPens($request);
-		$chamilo_pens->save();
-		$server->sendAlert($request, new PENSResponse(0, 'Package successfully processed'));
-	}
+    public function processPackage($request, $path_to_package) {
+        $server = PENSServer::singleton();
+        // Moves the package to archive/pens
+        $path_to_archives = api_get_path(SYS_ARCHIVE_PATH) . 'pens';
+        if(!is_dir($path_to_archives)) {
+            mkdir($path_to_archives, 0777, true);
+        }
+        rename($path_to_package, $path_to_archives . '/' . $request->getFilename());
+        // Insert the request in the database
+        $chamilo_pens = new ChamiloPens($request);
+        $chamilo_pens->save();
+        $server->sendAlert($request, new PENSResponse(0, 'Package successfully processed'));
+    }
 }
 
 $handler = new ChamiloPackageHandler();

plugin/dashboard/block_student/block_student.class.php

Indentation +141 added lines, -141 removed lines

@@ -14,36 +14,36 @@ 
 class BlockStudent extends Block
 {
     private $user_id;
-	private $students;
-	private $path;
-	private $permission = array(DRH);
+    private $students;
+    private $path;
+    private $permission = array(DRH);
 
-	/**
-	 * Constructor
-	 */
+    /**
+     * Constructor
+     */
     public function __construct ($user_id)
     {
-    	$this->user_id  = $user_id;
-    	$this->path 	= 'block_student';
-    	if ($this->is_block_visible_for_user($user_id)) {
+        $this->user_id  = $user_id;
+        $this->path 	= 'block_student';
+        if ($this->is_block_visible_for_user($user_id)) {
             $this->students =  UserManager::get_users_followed_by_drh($user_id, STUDENT);
-    	}
+        }
     }
 
     /**
-	 * This method check if a user is allowed to see the block inside dashboard interface
-	 * @param	int		User id
-	 * @return	bool	Is block visible for user
-	 */
+     * This method check if a user is allowed to see the block inside dashboard interface
+     * @param	int		User id
+     * @return	bool	Is block visible for user
+     */
     public function is_block_visible_for_user($user_id)
     {
-    	$user_info = api_get_user_info($user_id);
-		$user_status = $user_info['status'];
-		$is_block_visible_for_user = false;
-    	if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
-    		$is_block_visible_for_user = true;
-    	}
-    	return $is_block_visible_for_user;
+        $user_info = api_get_user_info($user_id);
+        $user_status = $user_info['status'];
+        $is_block_visible_for_user = false;
+        if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
+            $is_block_visible_for_user = true;
+        }
+        return $is_block_visible_for_user;
     }
 
     /**
@@ -53,12 +53,12 @@ 
      */
     public function get_block()
     {
-    	global $charset;
-    	$column = 1;
-    	$data   = array();
+        global $charset;
+        $column = 1;
+        $data   = array();
 
         $student_content_html = $this->get_students_content_html_for_drh();
-		$html = '<div class="panel panel-default" id="intro">
+        $html = '<div class="panel panel-default" id="intro">
                     <div class="panel-heading">
                         '.get_lang('StudentsInformationsList').'
                         <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
@@ -70,24 +70,24 @@ 
                         '.$student_content_html.'
                     </div>
                     </div>';
-    	$data['column'] = $column;
-    	$data['content_html'] = $html;
-    	return $data;
+        $data['column'] = $column;
+        $data['content_html'] = $html;
+        return $data;
     }
 
     /**
- 	 * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
- 	 * @return string  content html
- 	 */
+     * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
+     * @return string  content html
+     */
     public function get_students_content_html_for_platform_admin()
     {
- 		$students = $this->students;
- 		//$content = '<div style="margin:10px;">';
- 		$content = '<h4>'.get_lang('YourStudents').'</h4>';
+            $students = $this->students;
+            //$content = '<div style="margin:10px;">';
+            $content = '<h4>'.get_lang('YourStudents').'</h4>';
         $students_table = null;
- 		if (count($students) > 0) {
-	 		$students_table .= '<table class="data_table">';
-	 		$students_table .= '<tr>
+            if (count($students) > 0) {
+                $students_table .= '<table class="data_table">';
+                $students_table .= '<tr>
 									<th width="10%" rowspan="2">'.get_lang('FirstName').'</th>
 									<th width="10%" rowspan="2">'.get_lang('LastName').'</th>
 									<th width="30%" colspan="2">'.get_lang('CourseInformation').'</th>
@@ -97,146 +97,146 @@ 
 									<th width="10%">'.get_lang('Time').'</th>
 								</tr>';
 
-	 		$i = 1;
-	 		foreach ($students as $student) {
+                $i = 1;
+                foreach ($students as $student) {
 
-	 			$courses_by_user = CourseManager::get_courses_list_by_user_id($student['user_id'], true);
-	 			$count_courses = count($courses_by_user);
-				$rowspan = $count_courses?$count_courses+1:2;
+                    $courses_by_user = CourseManager::get_courses_list_by_user_id($student['user_id'], true);
+                    $count_courses = count($courses_by_user);
+                $rowspan = $count_courses?$count_courses+1:2;
 
-				if ($i%2 == 0) {
+                if ($i%2 == 0) {
                     $style = ' style="background-color:#F2F2F2" ';
                 } else {
                     $style = ' style="background-color:#FFF" ';
                 }
 
-	 			$students_table .= '<tr '.$style.'>
+                    $students_table .= '<tr '.$style.'>
 										<td rowspan="'.$rowspan.'">'.$student['firstname'].'</td>
 										<td rowspan="'.$rowspan.'">'.$student['lastname'].'</td>
 									</tr>';
 
-	 			// courses information about the student
-	 			if (!empty($courses_by_user)) {
-		 			foreach ($courses_by_user as $course) {
-		 				$course_code = $course['code'];
-						$courseInfo = api_get_course_info($course_code);
-						$courseId = $courseInfo['real_id'];
-		 				$course_title = $course['title'];
-		 				$time = api_time_to_hms(Tracking :: get_time_spent_on_the_course($student['user_id'], $courseId));
-		 				$students_table .= '<tr '.$style.'>
+                    // courses information about the student
+                    if (!empty($courses_by_user)) {
+                        foreach ($courses_by_user as $course) {
+                            $course_code = $course['code'];
+                        $courseInfo = api_get_course_info($course_code);
+                        $courseId = $courseInfo['real_id'];
+                            $course_title = $course['title'];
+                            $time = api_time_to_hms(Tracking :: get_time_spent_on_the_course($student['user_id'], $courseId));
+                            $students_table .= '<tr '.$style.'>
 											<td align="right">'.$course_title.'</td>
 											<td align="right">'.$time.'</td>
 											</tr>';
-		 			}
-	 			} else {
-	 				$students_table .= '<tr '.$style.'>
+                        }
+                    } else {
+                        $students_table .= '<tr '.$style.'>
 											<td align="center" colspan="2"><i>'.get_lang('Empty').'</i></td>
 										</tr>';
-	 			}
-	 			$i++;
-	 		}
-	 		$students_table .= '</table>';
- 		} else {
- 			$students_table .= get_lang('ThereIsNoInformationAboutYourStudents');
- 		}
-
- 		$content .= $students_table;
-
- 		if (count($students) > 0) {
-			$content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin&display=useroverview">'.get_lang('SeeMore').'</a></div>';
-		}
-		//$content .= '</div>';
-
- 		return $content;
- 	}
-
-  	public function get_students_content_html_for_drh() {
-  		$attendance = new Attendance();
-  		$students = $this->students;
- 		//$content = '<div style="margin:5px;">';
- 		$content = '<h4>'.get_lang('YourStudents').'</h4>';
+                    }
+                    $i++;
+                }
+                $students_table .= '</table>';
+            } else {
+                $students_table .= get_lang('ThereIsNoInformationAboutYourStudents');
+            }
+
+            $content .= $students_table;
+
+            if (count($students) > 0) {
+            $content .= '<div style="text-align:right;margin-top:10px;"><a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin&display=useroverview">'.get_lang('SeeMore').'</a></div>';
+        }
+        //$content .= '</div>';
+
+            return $content;
+        }
+
+        public function get_students_content_html_for_drh() {
+            $attendance = new Attendance();
+            $students = $this->students;
+            //$content = '<div style="margin:5px;">';
+            $content = '<h4>'.get_lang('YourStudents').'</h4>';
         $students_table = null;
- 		if (count($students) > 0) {
-	 		$students_table .= '<table class="data_table">';
-	 		$students_table .= '<tr>
+            if (count($students) > 0) {
+                $students_table .= '<table class="data_table">';
+                $students_table .= '<tr>
 									<th>'.get_lang('User').'</th>
 									<th>'.get_lang('AttendancesFaults').'</th>
 									<th>'.get_lang('Evaluations').'</th>
 								</tr>';
-	 		$i = 1;
-	 		foreach ($students as $student) {
-
-	 			$student_id = $student['user_id'];
-	 			$firstname  = $student['firstname'];
-	 			$lastname   = $student['lastname'];
-	 			$username	= $student['username'];
-
-
-				// get average of faults in attendances by student
-	 			$results_faults_avg = $attendance->get_faults_average_inside_courses($student_id);
-	 			if (!empty($results_faults_avg)) {
-	 				$attendances_faults_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.$results_faults_avg['faults'].'/'.$results_faults_avg['total'].' ('.$results_faults_avg['porcent'].'%)</a>';
-	 			} else {
-	 				$attendances_faults_avg = '0%';
-	 			}
-
-	 			$courses_by_user = CourseManager::get_courses_list_by_user_id($student_id, true);
-				$evaluations_avg  = 0;
-				$score = $weight = 0;
-	 			foreach ($courses_by_user as $course) {
-	 				$course_code = $course['code'];
-	 				$cats = Category::load(null, null, $course_code, null, null, null, false);
-	 				$scoretotal = array();
-	 				if (isset($cats) && isset($cats[0])) {
-		 				$scoretotal= $cats[0]->calc_score($student_id, null, $course_code);
-	 				}
-
-	 				if (!empty($scoretotal)) {
-	 					$score  += $scoretotal[0];
-	 					$weight += $scoretotal[1];
-	 				}
-	 			}
-
-	 			if (!empty($weight)) {
-	 				$evaluations_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.round($score,2).'/'.round($weight,2).'('.round(($score / $weight) * 100,2) . ' %)</a>';
-	 			}
-
-	 			if ($i%2 == 0) {
+                $i = 1;
+                foreach ($students as $student) {
+
+                    $student_id = $student['user_id'];
+                    $firstname  = $student['firstname'];
+                    $lastname   = $student['lastname'];
+                    $username	= $student['username'];
+
+
+                // get average of faults in attendances by student
+                    $results_faults_avg = $attendance->get_faults_average_inside_courses($student_id);
+                    if (!empty($results_faults_avg)) {
+                        $attendances_faults_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.$results_faults_avg['faults'].'/'.$results_faults_avg['total'].' ('.$results_faults_avg['porcent'].'%)</a>';
+                    } else {
+                        $attendances_faults_avg = '0%';
+                    }
+
+                    $courses_by_user = CourseManager::get_courses_list_by_user_id($student_id, true);
+                $evaluations_avg  = 0;
+                $score = $weight = 0;
+                    foreach ($courses_by_user as $course) {
+                        $course_code = $course['code'];
+                        $cats = Category::load(null, null, $course_code, null, null, null, false);
+                        $scoretotal = array();
+                        if (isset($cats) && isset($cats[0])) {
+                            $scoretotal= $cats[0]->calc_score($student_id, null, $course_code);
+                        }
+
+                        if (!empty($scoretotal)) {
+                            $score  += $scoretotal[0];
+                            $weight += $scoretotal[1];
+                        }
+                    }
+
+                    if (!empty($weight)) {
+                        $evaluations_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.round($score,2).'/'.round($weight,2).'('.round(($score / $weight) * 100,2) . ' %)</a>';
+                    }
+
+                    if ($i%2 == 0) {
                     $class_tr = 'row_odd';
                 } else {
                     $class_tr = 'row_even';
                 }
-	    		$students_table .= '<tr class="'.$class_tr.'">
+                $students_table .= '<tr class="'.$class_tr.'">
 										<td>'.api_get_person_name($firstname, $lastname).' ('.$username.')</td>
 										<td>'.$attendances_faults_avg.'</td>
 										<td>'.$evaluations_avg.'</td>
 									</tr>';
 
-	 			$i++;
-	 		}
-	 		$students_table .= '</table>';
- 		} else {
- 			$students_table .= get_lang('ThereIsNoInformationAboutYourStudents');
- 		}
+                    $i++;
+                }
+                $students_table .= '</table>';
+            } else {
+                $students_table .= get_lang('ThereIsNoInformationAboutYourStudents');
+            }
 
-  		$content .= $students_table;
+            $content .= $students_table;
 
- 		if (count($students) > 0) {
-			$content .= '<div style="text-align:right;margin-top:10px;">
+            if (count($students) > 0) {
+            $content .= '<div style="text-align:right;margin-top:10px;">
                             <a href="'.api_get_path(WEB_CODE_PATH).'mySpace/index.php?view=admin&display=yourstudents">'.get_lang('SeeMore').'</a>
                          </div>';
-		}
-		//$content .= '</div>';
+        }
+        //$content .= '</div>';
 
-  		return $content;
-  	}
+            return $content;
+        }
 
     /**
-	 * Get number of students
-	 * @return int
-	 */
-	function get_number_of_students()
+     * Get number of students
+     * @return int
+     */
+    function get_number_of_students()
     {
-		return count($this->students);
-	}
+        return count($this->students);
+    }
 }

main/permissions/user_permissions.inc.php

Indentation +93 added lines, -93 removed lines

@@ -8,7 +8,7 @@ 
 $user_id=$userIdViewed;
 if ($mainUserInfo['status']==1)
 {
-	$course_admin=1;
+    $course_admin=1;
 }
 include_once('permissions_functions.inc.php');
 include_once('all_permissions.inc.php');
@@ -19,26 +19,26 @@ 
 // ---------------------------------------------------
 if ($_POST['StoreUserPermissions'] and $setting_visualisation=='checkbox')
 {
-	$result_message=store_permissions('user', $user_id);
-	if ($result_message)
-	{
-		Display::display_normal_message($result_message);
-	}
+    $result_message=store_permissions('user', $user_id);
+    if ($result_message)
+    {
+        Display::display_normal_message($result_message);
+    }
 }
 if (isset($_GET['action']))
 {
-	if ( isset($_GET['permission']) AND isset($_GET['tool']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
-	{
-		$result_message=store_one_permission('user', $_GET['action'], $user_id, $_GET['tool'], $_GET['permission']);
-	}
-	if (isset($_GET['role']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
-	{
-		$result_message=assign_role('user', $_GET['action'], $user_id, $_GET['role'], $_GET['scope']);
-	}
+    if ( isset($_GET['permission']) AND isset($_GET['tool']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
+    {
+        $result_message=store_one_permission('user', $_GET['action'], $user_id, $_GET['tool'], $_GET['permission']);
+    }
+    if (isset($_GET['role']) AND ($_GET['action']=='grant' OR $_GET['action']=='revoke'))
+    {
+        $result_message=assign_role('user', $_GET['action'], $user_id, $_GET['role'], $_GET['scope']);
+    }
 }
 if (isset($result_message))
 {
-	Display::display_normal_message($result_message);
+    Display::display_normal_message($result_message);
 }
 
 // ---------------------------------------------------
@@ -55,43 +55,43 @@ 
 $groups_of_user=GroupManager::get_group_ids($_course['real_id'],$user_id);
 foreach ($groups_of_user as $group)
 {
-	$this_group_permissions=get_permissions('group',$group);
-	foreach ($this_group_permissions as $tool=>$permissions)
-	{
-		foreach ($permissions as $permission)
-		{
-			$inherited_group_permissions[$tool][]=$permission;
-		}
-	}
+    $this_group_permissions=get_permissions('group',$group);
+    foreach ($this_group_permissions as $tool=>$permissions)
+    {
+        foreach ($permissions as $permission)
+        {
+            $inherited_group_permissions[$tool][]=$permission;
+        }
+    }
 }
 $inherited_permissions=$inherited_group_permissions;
 
 // 			RETRIEVING THE PERMISSIONS OF THE ROLES OF THE USER
 if (api_get_setting('user_roles')=='true') {
-	// course roles that are assigned to the user
-	$current_user_role_permissions_of_user=get_roles_permissions('user',$user_id);
-	$inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
-	// NOTE: deze array moet nog gemerged worden met de $inherited_permissions array
-	// (heet momenteel nog $current_group_permissions_of_user omdat voorlopig enkel de
-	// groepsge�rfde permissions in beschouwing worden genomen
-	// dit moet ook de rol permissies van rollen die toegekend worden aan een gebruiker
-	// en de rol permissies van rollen die toegekend worden aan de groepen van een gebruiker
-	// omvatten.
-	// NOTE: checken als de rollen brol wel degelijk geactiveerd is voordat we dit allemaal
-	// ophalen.
-	// platform roles that are assigned to the user
-	$current_user_role_permissions_of_user=get_roles_permissions('user',$user_id, 'platform');
-	$inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
+    // course roles that are assigned to the user
+    $current_user_role_permissions_of_user=get_roles_permissions('user',$user_id);
+    $inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
+    // NOTE: deze array moet nog gemerged worden met de $inherited_permissions array
+    // (heet momenteel nog $current_group_permissions_of_user omdat voorlopig enkel de
+    // groepsge�rfde permissions in beschouwing worden genomen
+    // dit moet ook de rol permissies van rollen die toegekend worden aan een gebruiker
+    // en de rol permissies van rollen die toegekend worden aan de groepen van een gebruiker
+    // omvatten.
+    // NOTE: checken als de rollen brol wel degelijk geactiveerd is voordat we dit allemaal
+    // ophalen.
+    // platform roles that are assigned to the user
+    $current_user_role_permissions_of_user=get_roles_permissions('user',$user_id, 'platform');
+    $inherited_permissions=permission_array_merge($inherited_permissions,$current_user_role_permissions_of_user);
 }
 //	RETRIEVING THE PERMISSIONS OF THE ROLES OF THE GROUPS OF THE USER
 if (api_get_setting('group_roles')=='true')
 {
-	// NOTE: DIT MOET NOG VERDER UITGEWERKT WORDEN
-	foreach ($groups_of_user as $group)
-	{
-		$this_current_group_role_permissions_of_user=get_roles_permissions('user',$user_id);
-		//$inherited_permissions[$tool][]=$permission;
-	}
+    // NOTE: DIT MOET NOG VERDER UITGEWERKT WORDEN
+    foreach ($groups_of_user as $group)
+    {
+        $this_current_group_role_permissions_of_user=get_roles_permissions('user',$user_id);
+        //$inherited_permissions[$tool][]=$permission;
+    }
 }
 
 // ---------------------------------------------------
@@ -101,11 +101,11 @@ 
 $inherited_permissions=limited_or_full($inherited_permissions);
 if (api_get_setting('permissions')=='limited')
 {
-	$header_array=$rights_limited;
+    $header_array=$rights_limited;
 }
 if (api_get_setting('permissions')=='full')
 {
-	$header_array=$rights_full;
+    $header_array=$rights_full;
 }
 
 
@@ -116,12 +116,12 @@ 
 // ---------------------------------------------------
 if (api_get_setting('user_roles')=='true')
 {
-	// the list of the roles for the user
-	echo '<strong>'.get_lang('UserRoles').'</strong><br />';
-	$current_user_course_roles=get_roles('user',$user_id);
-	$current_user_platform_roles=get_roles('user',$user_id, 'platform');
-	display_role_list($current_user_course_roles, $current_user_platform_roles);
-	echo '<br />';
+    // the list of the roles for the user
+    echo '<strong>'.get_lang('UserRoles').'</strong><br />';
+    $current_user_course_roles=get_roles('user',$user_id);
+    $current_user_platform_roles=get_roles('user',$user_id, 'platform');
+    display_role_list($current_user_course_roles, $current_user_platform_roles);
+    echo '<br />';
 }
 
 // ---------------------------------------------------
@@ -135,59 +135,59 @@ 
 echo "\t\t<th>".get_lang('Module')."</th>\n";
 foreach ($header_array as $header_key=>$header_value)
 {
-	echo "\t\t<th>".get_lang($header_value)."</th>\n";
+    echo "\t\t<th>".get_lang($header_value)."</th>\n";
 }
 echo "\t</tr>\n";
 
 // the main area with the checkboxes or images
 foreach ($tool_rights as $tool=>$rights) // $tool_rights contains all the possible tools and their rights
 {
-	echo "\t<tr>\n";
-	echo "\t\t<td>\n";
-	if (strstr($tool,'BLOG'))
-	{
-		// Not dealing with a real tool here, get name of this blog
-		// Strip blog id
-		$tmp = strpos($tool,'_')+1;
-		$blog_id = substr($tool,$tmp,strlen($tool));
-		// Get title
-		echo get_lang('Blog').": ".Blog::get_blog_title($blog_id);
-	}
-	else
-	{
-		echo get_lang($tool);
-	}
-
-	echo "\t\t</td>\n";
-
-	foreach ($header_array as $key=>$value)
-	{
-
-		echo "\t\t<td align='center'>\n";
-		if (in_array($value,$rights))
-		{
-			if ($setting_visualisation=='checkbox')
-			{
-				display_checkbox_matrix($current_user_permissions, $tool, $value, $inherited_permissions,$course_admin);
-			}
-			if ($setting_visualisation=='image')
-			{
-				display_image_matrix($current_user_permissions, $tool, $value,$inherited_permissions, $course_admin);
-			}
-		}
-		// note: in a later stage this part will be replaced by a function
-		// so that we can easily switch between a checkbox approach or an image approach
-		// where every click is in fact a change of status. In the checkbox approach you first have to
-		// do the changes and then store them by clicking the submit button.
-		echo "\t\t</td>\n";
-	}
-	echo "\t</tr>\n";
+    echo "\t<tr>\n";
+    echo "\t\t<td>\n";
+    if (strstr($tool,'BLOG'))
+    {
+        // Not dealing with a real tool here, get name of this blog
+        // Strip blog id
+        $tmp = strpos($tool,'_')+1;
+        $blog_id = substr($tool,$tmp,strlen($tool));
+        // Get title
+        echo get_lang('Blog').": ".Blog::get_blog_title($blog_id);
+    }
+    else
+    {
+        echo get_lang($tool);
+    }
+
+    echo "\t\t</td>\n";
+
+    foreach ($header_array as $key=>$value)
+    {
+
+        echo "\t\t<td align='center'>\n";
+        if (in_array($value,$rights))
+        {
+            if ($setting_visualisation=='checkbox')
+            {
+                display_checkbox_matrix($current_user_permissions, $tool, $value, $inherited_permissions,$course_admin);
+            }
+            if ($setting_visualisation=='image')
+            {
+                display_image_matrix($current_user_permissions, $tool, $value,$inherited_permissions, $course_admin);
+            }
+        }
+        // note: in a later stage this part will be replaced by a function
+        // so that we can easily switch between a checkbox approach or an image approach
+        // where every click is in fact a change of status. In the checkbox approach you first have to
+        // do the changes and then store them by clicking the submit button.
+        echo "\t\t</td>\n";
+    }
+    echo "\t</tr>\n";
 }
 
 echo "</table>\n";
 if ($setting_visualisation=='checkbox')
 {
-	echo "<input type=\"Submit\" name=\"StoreUserPermissions\" value=\"".get_lang('StorePermissions')."\">";
+    echo "<input type=\"Submit\" name=\"StoreUserPermissions\" value=\"".get_lang('StorePermissions')."\">";
 }
 echo "</form><br />";
 

main/webservices/courses_list.soap.php

Indentation +20 added lines, -20 removed lines

@@ -28,11 +28,11 @@ 
         'all',
         '',
         array(
-          'name'=>'code'  , 'type'=>'xsd:string',
-          'name'=>'title'  , 'type'=>'xsd:string',
-          'name'=>'url'    , 'type'=>'xsd:string',
-          'name'=>'teacher', 'type'=>'xsd:string',
-          'name'=>'language','type'=>'xsd:string',
+            'name'=>'code'  , 'type'=>'xsd:string',
+            'name'=>'title'  , 'type'=>'xsd:string',
+            'name'=>'url'    , 'type'=>'xsd:string',
+            'name'=>'teacher', 'type'=>'xsd:string',
+            'name'=>'language','type'=>'xsd:string',
         )
 );
 
@@ -53,8 +53,8 @@ 
 // Register the method to expose
 $server->register('WSCourseList',         // method name
     array('username' => 'xsd:string',
-          'signature' => 'xsd:string',
-          'visibilities' => 'xsd:string'),      // input parameters
+            'signature' => 'xsd:string',
+            'visibilities' => 'xsd:string'),      // input parameters
     array('return' => 'xsd:Array'),             // output parameters
     'urn:WSCourseList',                         // namespace
     'urn:WSCourseList#WSCourseList',      // soapaction
@@ -97,19 +97,19 @@ 
 
     $courses_list = array();
 
-	if (!is_array($visibilities)) {
-		$visibilities = split(',', $visibilities);
-	}
-	foreach ($visibilities as $visibility) {
-		if (!in_array($visibility, array_keys($vis))) {
-   			return array('error_msg' => 'Security check failed');
-		}
-		$courses_list_tmp = CourseManager::get_courses_list(null, null, null, null, $vis[$visibility]);
-		foreach ($courses_list_tmp as $index => $course) {
-			$course_info = CourseManager::get_course_information($course['code']);
-			$courses_list[] = array('code' => $course['code'], 'title' => api_utf8_encode($course_info['title']), 'url' => api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/', 'teacher' => api_utf8_encode($course_info['tutor_name']), 'language' => $course_info['course_language']);
-		}
-	}
+    if (!is_array($visibilities)) {
+        $visibilities = split(',', $visibilities);
+    }
+    foreach ($visibilities as $visibility) {
+        if (!in_array($visibility, array_keys($vis))) {
+                return array('error_msg' => 'Security check failed');
+        }
+        $courses_list_tmp = CourseManager::get_courses_list(null, null, null, null, $vis[$visibility]);
+        foreach ($courses_list_tmp as $index => $course) {
+            $course_info = CourseManager::get_course_information($course['code']);
+            $courses_list[] = array('code' => $course['code'], 'title' => api_utf8_encode($course_info['title']), 'url' => api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/', 'teacher' => api_utf8_encode($course_info['tutor_name']), 'language' => $course_info['course_language']);
+        }
+    }
     return $courses_list;
 }
 

main/webservices/webservice.php

Indentation +220 added lines, -220 removed lines

@@ -11,237 +11,237 @@
  */
 class WSError
 {
-	/**
-	 * Error handler. This needs to be a class that implements the interface WSErrorHandler
-	 *
-	 * @var WSErrorHandler
-	 */
-	protected static $_handler;
-
-	/**
-	 * Error code
-	 *
-	 * @var int
-	 */
-	public $code;
-
-	/**
-	 * Error message
-	 *
-	 * @var string
-	 */
-	public $message;
-
-	/**
-	 * Constructor
-	 *
-	 * @param int Error code
-	 * @param string Error message
-	 */
-	public function __construct($code, $message) {
-		$this->code = $code;
-		$this->message = $message;
-	}
-
-	/**
-	 * Sets the error handler
-	 *
-	 * @param WSErrorHandler Error handler
-	 */
-	public static function setErrorHandler($handler) {
-		if($handler instanceof WSErrorHandler) {
-			self::$_handler = $handler;
-		}
-	}
-
-	/**
-	 * Returns the error handler
-	 *
-	 * @return WSErrorHandler Error handler
-	 */
-	public static function getErrorHandler() {
-		return self::$_handler;
-	}
-
-	/**
-	 * Transforms the error into an array
-	 *
-	 * @return array Associative array with code and message
-	 */
-	public function toArray() {
-		return array('code' => $this->code, 'message' => $this->message);
-	}
+    /**
+     * Error handler. This needs to be a class that implements the interface WSErrorHandler
+     *
+     * @var WSErrorHandler
+     */
+    protected static $_handler;
+
+    /**
+     * Error code
+     *
+     * @var int
+     */
+    public $code;
+
+    /**
+     * Error message
+     *
+     * @var string
+     */
+    public $message;
+
+    /**
+     * Constructor
+     *
+     * @param int Error code
+     * @param string Error message
+     */
+    public function __construct($code, $message) {
+        $this->code = $code;
+        $this->message = $message;
+    }
+
+    /**
+     * Sets the error handler
+     *
+     * @param WSErrorHandler Error handler
+     */
+    public static function setErrorHandler($handler) {
+        if($handler instanceof WSErrorHandler) {
+            self::$_handler = $handler;
+        }
+    }
+
+    /**
+     * Returns the error handler
+     *
+     * @return WSErrorHandler Error handler
+     */
+    public static function getErrorHandler() {
+        return self::$_handler;
+    }
+
+    /**
+     * Transforms the error into an array
+     *
+     * @return array Associative array with code and message
+     */
+    public function toArray() {
+        return array('code' => $this->code, 'message' => $this->message);
+    }
 }
 
 /**
  * Interface that must be implemented by any error handler
  */
 interface WSErrorHandler {
-	/**
-	 * Handle method
-	 *
-	 * @param WSError Error
-	 */
-	public function handle($error);
+    /**
+     * Handle method
+     *
+     * @param WSError Error
+     */
+    public function handle($error);
 }
 
 /**
  * Main class of the webservice. Webservice classes extend this class
  */
 class WS {
-	/**
-	 * Chamilo configuration
-	 *
-	 * @var array
-	 */
-	protected $_configuration;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		$this->_configuration = $GLOBALS['_configuration'];
-	}
-
-	/**
-	 * Verifies the API key
-	 *
-	 * @param string Secret key
-	 * @return mixed WSError in case of failure, null in case of success
-	 */
-	protected function verifyKey($secret_key) {
-		$ip = trim($_SERVER['REMOTE_ADDR']);
-		// if we are behind a reverse proxy, assume it will send the
-		// HTTP_X_FORWARDED_FOR header and use this IP instead
-		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-			list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
-			$ip = trim($ip1);
-		}
-		$security_key = $ip.$this->_configuration['security_key'];
-
-		if(!api_is_valid_secret_key($secret_key, $security_key)) {
-			return new WSError(1, "API key is invalid");
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Gets the real user id based on the user id field name and value.
-	 * Note that if the user id field name is "chamilo_user_id", it will use the user id
-	 * in the system database
-	 *
-	 * @param string User id field name
-	 * @param string User id value
-	 * @return mixed System user id if the user was found, WSError otherwise
-	 */
-	protected function getUserId($user_id_field_name, $user_id_value) {
-		if($user_id_field_name == "chamilo_user_id") {
-			if(UserManager::is_user_id_valid(intval($user_id_value))) {
-				return intval($user_id_value);
-			} else {
-				return new WSError(100, "User not found");
-			}
-		} else {
-			$user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
-			if($user_id == 0) {
-				return new WSError(100, "User not found");
-			} else {
-				return $user_id;
-			}
-		}
-	}
-
-	/**
-	 * Gets the real course id based on the course id field name and value.
-	 * Note that if the course id field name is "chamilo_course_id", it will use the course id
-	 * in the system database
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return mixed System course id if the course was found, WSError otherwise
-	 */
-	protected function getCourseId($course_id_field_name, $course_id_value)
-	{
-		if ($course_id_field_name == "chamilo_course_id") {
-			if (CourseManager::get_course_code_from_course_id(
-					intval($course_id_value)
-				) != null
-			) {
-				return intval($course_id_value);
-			} else {
-				return new WSError(200, "Course not found");
-			}
-		} else {
-			$courseId = CourseManager::get_course_code_from_original_id(
-				$course_id_value,
-				$course_id_field_name
-			);
-			if (!empty($courseId)) {
-				return $courseId;
-			} else {
-				return new WSError(200, "Course not found");
-			}
-		}
-	}
-
-	/**
-	 * Gets the real session id based on the session id field name and value.
-	 * Note that if the session id field name is "chamilo_session_id", it will use the session id
-	 * in the system database
-	 *
-	 * @param string Session id field name
-	 * @param string Session id value
-	 * @return mixed System session id if the session was found, WSError otherwise
-	 */
-	protected function getSessionId($session_id_field_name, $session_id_value)
-	{
-		if ($session_id_field_name == "chamilo_session_id") {
-			$session = SessionManager::fetch((int)$session_id_value);
-			if (!empty($session)) {
-				return intval($session_id_value);
-			} else {
-				return new WSError(300, "Session not found");
-			}
-		} else {
-			$session_id = SessionManager::getSessionIdFromOriginalId(
-				$session_id_value,
-				$session_id_field_name
-			);
-			if ($session_id == 0) {
-				return new WSError(300, "Session not found");
-			} else {
-				return $session_id;
-			}
-		}
-	}
-
-	/**
-	 * Handles an error by calling the WSError error handler
-	 *
-	 * @param WSError Error
-	 */
-	protected function handleError($error) {
-		$handler = WSError::getErrorHandler();
-		$handler->handle($error);
-	}
-
-	/**
-	 * Gets a successful result
-	 *
-	 * @return array Array with a code of 0 and a message 'Operation was successful'
-	 */
-	protected function getSuccessfulResult() {
-		return array('code' => 0, 'message' => 'Operation was successful');
-	}
-
-	/**
-	 * Test function. Returns the string success
-	 *
-	 * @return string Success
-	 */
-	public function test() {
-		return "success";
-	}
+    /**
+     * Chamilo configuration
+     *
+     * @var array
+     */
+    protected $_configuration;
+
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        $this->_configuration = $GLOBALS['_configuration'];
+    }
+
+    /**
+     * Verifies the API key
+     *
+     * @param string Secret key
+     * @return mixed WSError in case of failure, null in case of success
+     */
+    protected function verifyKey($secret_key) {
+        $ip = trim($_SERVER['REMOTE_ADDR']);
+        // if we are behind a reverse proxy, assume it will send the
+        // HTTP_X_FORWARDED_FOR header and use this IP instead
+        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+            list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
+            $ip = trim($ip1);
+        }
+        $security_key = $ip.$this->_configuration['security_key'];
+
+        if(!api_is_valid_secret_key($secret_key, $security_key)) {
+            return new WSError(1, "API key is invalid");
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Gets the real user id based on the user id field name and value.
+     * Note that if the user id field name is "chamilo_user_id", it will use the user id
+     * in the system database
+     *
+     * @param string User id field name
+     * @param string User id value
+     * @return mixed System user id if the user was found, WSError otherwise
+     */
+    protected function getUserId($user_id_field_name, $user_id_value) {
+        if($user_id_field_name == "chamilo_user_id") {
+            if(UserManager::is_user_id_valid(intval($user_id_value))) {
+                return intval($user_id_value);
+            } else {
+                return new WSError(100, "User not found");
+            }
+        } else {
+            $user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
+            if($user_id == 0) {
+                return new WSError(100, "User not found");
+            } else {
+                return $user_id;
+            }
+        }
+    }
+
+    /**
+     * Gets the real course id based on the course id field name and value.
+     * Note that if the course id field name is "chamilo_course_id", it will use the course id
+     * in the system database
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @return mixed System course id if the course was found, WSError otherwise
+     */
+    protected function getCourseId($course_id_field_name, $course_id_value)
+    {
+        if ($course_id_field_name == "chamilo_course_id") {
+            if (CourseManager::get_course_code_from_course_id(
+                    intval($course_id_value)
+                ) != null
+            ) {
+                return intval($course_id_value);
+            } else {
+                return new WSError(200, "Course not found");
+            }
+        } else {
+            $courseId = CourseManager::get_course_code_from_original_id(
+                $course_id_value,
+                $course_id_field_name
+            );
+            if (!empty($courseId)) {
+                return $courseId;
+            } else {
+                return new WSError(200, "Course not found");
+            }
+        }
+    }
+
+    /**
+     * Gets the real session id based on the session id field name and value.
+     * Note that if the session id field name is "chamilo_session_id", it will use the session id
+     * in the system database
+     *
+     * @param string Session id field name
+     * @param string Session id value
+     * @return mixed System session id if the session was found, WSError otherwise
+     */
+    protected function getSessionId($session_id_field_name, $session_id_value)
+    {
+        if ($session_id_field_name == "chamilo_session_id") {
+            $session = SessionManager::fetch((int)$session_id_value);
+            if (!empty($session)) {
+                return intval($session_id_value);
+            } else {
+                return new WSError(300, "Session not found");
+            }
+        } else {
+            $session_id = SessionManager::getSessionIdFromOriginalId(
+                $session_id_value,
+                $session_id_field_name
+            );
+            if ($session_id == 0) {
+                return new WSError(300, "Session not found");
+            } else {
+                return $session_id;
+            }
+        }
+    }
+
+    /**
+     * Handles an error by calling the WSError error handler
+     *
+     * @param WSError Error
+     */
+    protected function handleError($error) {
+        $handler = WSError::getErrorHandler();
+        $handler->handle($error);
+    }
+
+    /**
+     * Gets a successful result
+     *
+     * @return array Array with a code of 0 and a message 'Operation was successful'
+     */
+    protected function getSuccessfulResult() {
+        return array('code' => 0, 'message' => 'Operation was successful');
+    }
+
+    /**
+     * Test function. Returns the string success
+     *
+     * @return string Success
+     */
+    public function test() {
+        return "success";
+    }
 }
 

main/webservices/courses_list.rest.php

Indentation +33 added lines, -33 removed lines

@@ -22,32 +22,32 @@ 
  */
 function courses_list($security_key, $visibilities = 'public') {
 
-	global $_configuration;
+    global $_configuration;
 
-   	// Check if this script is launch by server and if security key is ok.
-   	if ($security_key != $_configuration['security_key']) {
-   		return array('error_msg' => 'Security check failed');
-   	}
+        // Check if this script is launch by server and if security key is ok.
+        if ($security_key != $_configuration['security_key']) {
+            return array('error_msg' => 'Security check failed');
+        }
 
-	$vis = array('public' => '3', 'public-registered' => '2', 'private' => '1', 'closed' => '0');
+    $vis = array('public' => '3', 'public-registered' => '2', 'private' => '1', 'closed' => '0');
 
-	$courses_list = array();
+    $courses_list = array();
 
-	if (!is_array($visibilities)) {
-		$tmp = $visibilities;
-		$visibilities = array($tmp);
-	}
-	foreach ($visibilities as $visibility) {
-		if (!in_array($visibility, array_keys($vis))) {
-   			return array('error_msg' => 'Security check failed');
-		}
-		$courses_list_tmp = CourseManager::get_courses_list(null, null, null, null, $vis[$visibility]);
-		foreach ($courses_list_tmp as $index => $course) {
-			$course_info = CourseManager::get_course_information($course['code']);
-			$courses_list[$course['code']] = array('title' => api_utf8_encode($course_info['title']), 'url' => api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/', 'teacher' => api_utf8_encode($course_info['tutor_name']), 'language' => $course_info['course_language']);
-		}
-	}
-	return $courses_list;
+    if (!is_array($visibilities)) {
+        $tmp = $visibilities;
+        $visibilities = array($tmp);
+    }
+    foreach ($visibilities as $visibility) {
+        if (!in_array($visibility, array_keys($vis))) {
+                return array('error_msg' => 'Security check failed');
+        }
+        $courses_list_tmp = CourseManager::get_courses_list(null, null, null, null, $vis[$visibility]);
+        foreach ($courses_list_tmp as $index => $course) {
+            $course_info = CourseManager::get_course_information($course['code']);
+            $courses_list[$course['code']] = array('title' => api_utf8_encode($course_info['title']), 'url' => api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/', 'teacher' => api_utf8_encode($course_info['tutor_name']), 'language' => $course_info['course_language']);
+        }
+    }
+    return $courses_list;
 }
 
 header('Content-Type: text/xml; charset=utf-8');
@@ -55,17 +55,17 @@ 
 echo '<courseslist>';
 
 if (empty($_POST['security-key']) || empty($_POST['visibility'])) {
-	echo '<errormsg>Invalid parameters, this script expects a security-key and a visibility parameters</errormsg>';
+    echo '<errormsg>Invalid parameters, this script expects a security-key and a visibility parameters</errormsg>';
 } else {
-	$courses_list = courses_list($_POST['security-key'], $_POST['visibility']);
-	foreach ($courses_list as $code => $cd) {
-		echo '<course>';
-		echo '<code>' , $code , '</code>';
-		echo '<title>' , $cd['title'] , '</title>';
-		echo '<url>' , $cd['url'] , '</url>';
-		echo '<teacher>' , $cd['teacher'] , '</teacher>';
-		echo '<language>' , $cd['language'] , '</language>';
-		echo '</course>';
-	}
+    $courses_list = courses_list($_POST['security-key'], $_POST['visibility']);
+    foreach ($courses_list as $code => $cd) {
+        echo '<course>';
+        echo '<code>' , $code , '</code>';
+        echo '<title>' , $cd['title'] , '</title>';
+        echo '<url>' , $cd['url'] , '</url>';
+        echo '<teacher>' , $cd['teacher'] , '</teacher>';
+        echo '<language>' , $cd['language'] , '</language>';
+        echo '</course>';
+    }
 }
 echo '</courseslist>';