Version 4.5.0

applications/cms/sources/Media/Folder.php

@@ -12,7 +12,7 @@
 namespace IPS\cms\Media;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -26,13 +26,12 @@ class _Folder extends \IPS\Node\Model
 	/**
 	 * Munge different record types
 	 *
-	 *
 	 * @return  array
 	 */
 	public static function munge()
 	{
 		$rows = array();
-		$args = func_get_args();
+		$args = \func_get_args();
 	
 		foreach( $args as $arg )
 		{
@@ -112,7 +111,10 @@ class _Folder extends \IPS\Node\Model
 	 * @brief	[Node] Show forms modally?
 	 */
 	public static $modalForms = TRUE;
-	
+
+	/**
+	 * @brief	[Node] Restrictions
+	 */
 	protected static $restrictions = array(
  		'app'		=> 'cms',
  		'module'	=> 'pages',
@@ -142,8 +144,7 @@ class _Folder extends \IPS\Node\Model
 	
 	/**
 	 * [Node] Get buttons to display in tree
-	 * Example code explains return value
-	 * @endcode
+	 *
 	 * @param	string	$url		Base URL
 	 * @param	bool	$subnode	Is this a subnode?
 	 * @return	array
@@ -299,7 +300,7 @@ class _Folder extends \IPS\Node\Model
 	 * Resets the stored path
 	 * 
 	 * @param	boolean	$recursivelyCheck	Recursively reset up and down the tree
-	 * @return void
+	 * @return	void
 	 */
 	public function resetPath( $recursivelyCheck=true )
 	{
@@ -310,7 +311,7 @@ class _Folder extends \IPS\Node\Model
 			$path[] = $obj->name;
 		}
 		
-		$this->path = ( count( $path ) ) ? implode( '/', $path ) . '/' . $this->name : $this->name;
+		$this->path = ( \count( $path ) ) ? implode( '/', $path ) . '/' . $this->name : $this->name;
 		
 		/* Save path update */
 		parent::save();