ByTIC / framework

src/Config.php

Indentation +39 added lines, -39 removed lines

@@ -3,47 +3,47 @@
 class Nip_Config
 {
 
-	protected $_data;
+    protected $_data;
 
-	public function parse($filename)
-	{
-		$config = parse_ini_file($filename, true);
-		foreach ($config as $key => $value) {
-			if (is_array($value)) {
-				if (!isset($this->_data[$key])) {
-					$this->_data[$key] = new stdClass;
-				}
-				foreach ($value as $subKey => $subValue) {
-					$this->_data[$key]->$subKey = $subValue;
-				}
-			} else {
-				$this->_data[$key] = $value;
-			}
-		}
-		return $this;
-	}
+    public function parse($filename)
+    {
+        $config = parse_ini_file($filename, true);
+        foreach ($config as $key => $value) {
+            if (is_array($value)) {
+                if (!isset($this->_data[$key])) {
+                    $this->_data[$key] = new stdClass;
+                }
+                foreach ($value as $subKey => $subValue) {
+                    $this->_data[$key]->$subKey = $subValue;
+                }
+            } else {
+                $this->_data[$key] = $value;
+            }
+        }
+        return $this;
+    }
 
-	public function __get($name)
-	{
-		return $this->_data[$name];
-	}
+    public function __get($name)
+    {
+        return $this->_data[$name];
+    }
 
-	public function __isset($name)
-	{
-		return isset($this->_data[$name]);
-	}
+    public function __isset($name)
+    {
+        return isset($this->_data[$name]);
+    }
 
-	/**
-	 * Singleton
-	 *
-	 * @return Nip_Config
-	 */
-	static public function instance()
-	{
-		static $instance;
-		if (!($instance instanceof self)) {
-			$instance = new self();
-		}
-		return $instance;
-	}
+    /**
+     * Singleton
+     *
+     * @return Nip_Config
+     */
+    static public function instance()
+    {
+        static $instance;
+        if (!($instance instanceof self)) {
+            $instance = new self();
+        }
+        return $instance;
+    }
 }
\ No newline at end of file

src/acl/permission/Permission.php

Indentation +26 added lines, -26 removed lines

@@ -3,35 +3,35 @@
 class ACL_Permission extends Record
 {
 
-	protected $_resource;
-	protected $_role;
+    protected $_resource;
+    protected $_role;
 
-	public function setResource(ACL_Resource $resource)
-	{
-		$this->_resource = $resource;
-		$this->id_acl_resource = ACL::instance()->getResourcePathString($resource);
-	}
+    public function setResource(ACL_Resource $resource)
+    {
+        $this->_resource = $resource;
+        $this->id_acl_resource = ACL::instance()->getResourcePathString($resource);
+    }
 
-	public function getResource()
-	{
-		if (!$this->_resource) {
-			$this->_resource = ACL::instance()->getResource($this->id_acl_resource);
-		}
-		return $this->_resource;
-	}
+    public function getResource()
+    {
+        if (!$this->_resource) {
+            $this->_resource = ACL::instance()->getResource($this->id_acl_resource);
+        }
+        return $this->_resource;
+    }
 
-	public function setRole(ACL_Role $role)
-	{
-		$this->_role = $role;
-		$this->id_acl_role = ACL::instance()->getRoleID($role);
-	}
+    public function setRole(ACL_Role $role)
+    {
+        $this->_role = $role;
+        $this->id_acl_role = ACL::instance()->getRoleID($role);
+    }
 
-	public function getRole()
-	{
-		if (!$this->_role) {
-			$this->_role = ACL::instance()->getRole($this->id_acl_role);
-		}
-		return $this->_role;
-	}
+    public function getRole()
+    {
+        if (!$this->_role) {
+            $this->_role = ACL::instance()->getRole($this->id_acl_role);
+        }
+        return $this->_role;
+    }
 
 }
\ No newline at end of file

src/acl/permission/Permissions.php

Indentation +13 added lines, -13 removed lines

@@ -3,18 +3,18 @@
 class ACL_Permissions extends Records
 {
 
-	/**
-	 * Singleton
-	 *
-	 * @return ACL_Permissions
-	 */
-	public static function instance()
-	{
-		static $instance;
-		if (!($instance instanceof self)) {
-			$instance = new self();
-		}
-		return $instance;
-	}
+    /**
+     * Singleton
+     *
+     * @return ACL_Permissions
+     */
+    public static function instance()
+    {
+        static $instance;
+        if (!($instance instanceof self)) {
+            $instance = new self();
+        }
+        return $instance;
+    }
 
 }
\ No newline at end of file

src/acl/resource/Resources.php

Indentation +56 added lines, -56 removed lines

@@ -3,61 +3,61 @@
 class ACL_Resources extends Records
 {
 
-	protected $_sortOn = "name";
-
-	public function findAll()
-	{
-		if (!$this->getRegistry()->exists("all")) {
-			$resources = parent::findAll();
-			$this->buildTree($resources);
-		}
-
-		return $this->getRegistry()->get('all');
-	}
-
-	public function buildTree($resources = array())
-	{
-		if ($resources) {
-			/* @var $resource ACL_Resource */
-			foreach ($resources as $resource) {
-				if ($resource->hasParent()) {
-					$parent = $resources[$resource->id_parent];
-					$parent->addChild($resource);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Recursively builds parents path to passed resource
-	 *
-	 * @param ACL_Resource|bool $page
-	 * @param array $return
-	 * @return array
-	 */
-	public function buildPath($resource, &$return = array())
-	{
-		if (!($resource instanceof ACL_Resource)) {
-			return array_reverse($return);
-		}
-
-		$return[] = $resource;
-
-		return $this->buildPath($resource->getParent(), $return);
-	}
-
-	/**
-	 * Singleton
-	 *
-	 * @return ACL_Resources
-	 */
-	public static function instance()
-	{
-		static $instance;
-		if (!($instance instanceof self)) {
-			$instance = new self();
-		}
-		return $instance;
-	}
+    protected $_sortOn = "name";
+
+    public function findAll()
+    {
+        if (!$this->getRegistry()->exists("all")) {
+            $resources = parent::findAll();
+            $this->buildTree($resources);
+        }
+
+        return $this->getRegistry()->get('all');
+    }
+
+    public function buildTree($resources = array())
+    {
+        if ($resources) {
+            /* @var $resource ACL_Resource */
+            foreach ($resources as $resource) {
+                if ($resource->hasParent()) {
+                    $parent = $resources[$resource->id_parent];
+                    $parent->addChild($resource);
+                }
+            }
+        }
+    }
+
+    /**
+     * Recursively builds parents path to passed resource
+     *
+     * @param ACL_Resource|bool $page
+     * @param array $return
+     * @return array
+     */
+    public function buildPath($resource, &$return = array())
+    {
+        if (!($resource instanceof ACL_Resource)) {
+            return array_reverse($return);
+        }
+
+        $return[] = $resource;
+
+        return $this->buildPath($resource->getParent(), $return);
+    }
+
+    /**
+     * Singleton
+     *
+     * @return ACL_Resources
+     */
+    public static function instance()
+    {
+        static $instance;
+        if (!($instance instanceof self)) {
+            $instance = new self();
+        }
+        return $instance;
+    }
 
 }
\ No newline at end of file

src/acl/resource/Resource.php

Indentation +84 added lines, -84 removed lines

@@ -3,89 +3,89 @@
 class ACL_Resource extends Record
 {
 
-	/**
-	 * @var ACL_Resource
-	 */
-	protected $_parent;
-	protected $_children = array();
-	protected $_pathString;
-
-	/**
-	 * @param ACL_Resource $resource
-	 */
-	public function addChild($resource)
-	{
-		$this->_children[$resource->id] = $resource;
-		$resource->setParent($this);
-	}
-
-	public function hasParent()
-	{
-		return $this->id_parent > 0;
-	}
-
-	public function hasChildren()
-	{
-		return count($this->_children) > 0;
-	}
-
-	/**
-	 * @return ACL_Resource
-	 */
-	public function getParent()
-	{
-		if (!$this->_parent) {
-			if ($this->hasParent()) {
-				$parent = $this->getManager()->findOne($this->id_parent);
-				$parent->addChild($this);
-			}
-		}
-
-		return $this->_parent;
-	}
-
-	public function getChildren()
-	{
-		return $this->_children;
-	}
-
-	public function getPath()
-	{
-		return $this->getManager()->buildPath($this);
-	}
-
-	public function getPathString()
-	{
-		if (!$this->_pathString) {
-			$this->_pathString = implode(".", Nip_Helper_Array::instance()->pluck($this->getPath(), "slug"));
-		}
-
-		return $this->_pathString;
-	}
-
-	/**
-	 * @param ACL_Resource $parent
-	 * @return ACL_Resource
-	 */
-	public function setParent(ACL_Resource $parent)
-	{
-		$this->_parent = $parent;
-		return $this;
-	}
-
-	public function getACL()
-	{
-		return ACL::instance();
-	}
-
-	public function insertPermission($role, $type)
-	{
-		return $this->getACL()->insertPermission($this, $role, $type);
-	}
-
-	public function removePermissions()
-	{
-		return $this->getACL()->removePermissions(false, $this);
-	}
+    /**
+     * @var ACL_Resource
+     */
+    protected $_parent;
+    protected $_children = array();
+    protected $_pathString;
+
+    /**
+     * @param ACL_Resource $resource
+     */
+    public function addChild($resource)
+    {
+        $this->_children[$resource->id] = $resource;
+        $resource->setParent($this);
+    }
+
+    public function hasParent()
+    {
+        return $this->id_parent > 0;
+    }
+
+    public function hasChildren()
+    {
+        return count($this->_children) > 0;
+    }
+
+    /**
+     * @return ACL_Resource
+     */
+    public function getParent()
+    {
+        if (!$this->_parent) {
+            if ($this->hasParent()) {
+                $parent = $this->getManager()->findOne($this->id_parent);
+                $parent->addChild($this);
+            }
+        }
+
+        return $this->_parent;
+    }
+
+    public function getChildren()
+    {
+        return $this->_children;
+    }
+
+    public function getPath()
+    {
+        return $this->getManager()->buildPath($this);
+    }
+
+    public function getPathString()
+    {
+        if (!$this->_pathString) {
+            $this->_pathString = implode(".", Nip_Helper_Array::instance()->pluck($this->getPath(), "slug"));
+        }
+
+        return $this->_pathString;
+    }
+
+    /**
+     * @param ACL_Resource $parent
+     * @return ACL_Resource
+     */
+    public function setParent(ACL_Resource $parent)
+    {
+        $this->_parent = $parent;
+        return $this;
+    }
+
+    public function getACL()
+    {
+        return ACL::instance();
+    }
+
+    public function insertPermission($role, $type)
+    {
+        return $this->getACL()->insertPermission($this, $role, $type);
+    }
+
+    public function removePermissions()
+    {
+        return $this->getACL()->removePermissions(false, $this);
+    }
 
 }
\ No newline at end of file

src/acl/role/Roles.php

Indentation +14 added lines, -14 removed lines

@@ -3,20 +3,20 @@
 class ACL_Roles extends Records
 {
 
-	protected $_hasMany = array("Users");
+    protected $_hasMany = array("Users");
 
-	/**
-	 * Singleton
-	 *
-	 * @return ACL_Roles
-	 */
-	public static function instance()
-	{
-		static $instance;
-		if (!($instance instanceof self)) {
-			$instance = new self();
-		}
-		return $instance;
-	}
+    /**
+     * Singleton
+     *
+     * @return ACL_Roles
+     */
+    public static function instance()
+    {
+        static $instance;
+        if (!($instance instanceof self)) {
+            $instance = new self();
+        }
+        return $instance;
+    }
 
 }
\ No newline at end of file

src/acl/role/Role.php

Indentation +86 added lines, -86 removed lines

@@ -3,91 +3,91 @@
 class ACL_Role extends Record
 {
 
-	public function insert()
-	{
-		parent::insert();
-		$this->insertPermissions();
-	}
-
-	public function update($permissions = true)
-	{
-		if ($permissions) {
-			$this->updatePermissions();
-		}
-		parent::update();
-	}
-
-	public function delete()
-	{
-		$this->deletePermissions();
-		$this->deleteUsers();
-		parent::delete();
-	}
-
-	public function insertPermission($resource, $type)
-	{
-		$this->getACL()->insertPermission($resource, $this, $type);
-	}
-
-	public function insertPermissions()
-	{
-		if ($this->permissions) {
-			foreach ($this->permissions as $resource => $types) {
-				foreach ($types as $type => $value) {
-					if (!$this->allowed($resource, $type)) {
-						$this->getACL()->insertPermission($resource, $this, $type);
-					}
-				}
-			}
-		}
-		return $this;
-	}
-
-	public function deletePermissions($resource = false)
-	{
-		$this->getACL()->removePermissions($this, $resource);
-		return $this;
-	}
-
-	public function updatePermissions()
-	{
-		$this->deletePermissions();
-		$this->insertPermissions();
-	}
-
-	public function allowed($resource, $type)
-	{
-		return $this->getACL()->check($this, $resource, $type);
-	}
-
-	public function getACL()
-	{
-		return ACL::instance();
-	}
-
-	public function getRoleID()
-	{
-		return get_class($this) . "." . $this->id;
-	}
-
-	public function validate($request = array())
-	{
-		$this->name = clean($request['name']);
-		$this->permissions = $request['permission'] ? $request['permission'] : array();
-
-		$errors = array();
-
-		if (!$this->name) {
-			$errors['name'] = 'Denumirea este obligatorie';
-		}
-
-		$this->errors = $errors;
-
-		if ($this->errors) {
-			return false;
-		}
-
-		return true;
-	}
+    public function insert()
+    {
+        parent::insert();
+        $this->insertPermissions();
+    }
+
+    public function update($permissions = true)
+    {
+        if ($permissions) {
+            $this->updatePermissions();
+        }
+        parent::update();
+    }
+
+    public function delete()
+    {
+        $this->deletePermissions();
+        $this->deleteUsers();
+        parent::delete();
+    }
+
+    public function insertPermission($resource, $type)
+    {
+        $this->getACL()->insertPermission($resource, $this, $type);
+    }
+
+    public function insertPermissions()
+    {
+        if ($this->permissions) {
+            foreach ($this->permissions as $resource => $types) {
+                foreach ($types as $type => $value) {
+                    if (!$this->allowed($resource, $type)) {
+                        $this->getACL()->insertPermission($resource, $this, $type);
+                    }
+                }
+            }
+        }
+        return $this;
+    }
+
+    public function deletePermissions($resource = false)
+    {
+        $this->getACL()->removePermissions($this, $resource);
+        return $this;
+    }
+
+    public function updatePermissions()
+    {
+        $this->deletePermissions();
+        $this->insertPermissions();
+    }
+
+    public function allowed($resource, $type)
+    {
+        return $this->getACL()->check($this, $resource, $type);
+    }
+
+    public function getACL()
+    {
+        return ACL::instance();
+    }
+
+    public function getRoleID()
+    {
+        return get_class($this) . "." . $this->id;
+    }
+
+    public function validate($request = array())
+    {
+        $this->name = clean($request['name']);
+        $this->permissions = $request['permission'] ? $request['permission'] : array();
+
+        $errors = array();
+
+        if (!$this->name) {
+            $errors['name'] = 'Denumirea este obligatorie';
+        }
+
+        $this->errors = $errors;
+
+        if ($this->errors) {
+            return false;
+        }
+
+        return true;
+    }
 
 }
\ No newline at end of file

src/acl/ACL.php

Indentation +202 added lines, -202 removed lines

@@ -3,207 +3,207 @@
 class ACL
 {
 
-	protected $_resources;
-	protected $_roles;
-	protected $_permissions;
-	protected $_permissionMap;
-	protected $_permissionTypes = array("view", "edit", "delete");
-
-	public function addResource($resource)
-	{
-		$this->_resources[$this->getResourcePathString($resource)] = $resource;
-	}
-
-	public function addRole($role)
-	{
-		$this->_roles[$this->getRoleID($role)] = $role;
-	}
-
-	/**
-	 * Adds $type acces for $role to $resource
-	 * 
-	 * @param mixed $resource
-	 * @param mixed $role
-	 * @param string $type
-	 */
-	public function addPermission($resource, $role, $type = "view")
-	{
-		$resource = $this->getResource($resource);
-		$role = $this->getRole($role);
-		$this->_permissionMap[$this->getRoleID($role)][$this->getResourcePathString($resource)][$type] = true;
-	}
-
-	/**
-	 * Stores $type access for $role to $resource
-	 * Checks to see if permission already exists before insertion
-	 * 
-	 * @param mixed $resource
-	 * @param mixed $role
-	 * @param string $type
-	 */
-	public function insertPermission($resource, $role, $type)
-	{
-		if (!$this->check($role, $resource, $type)) {
-			$permission = ACL_Permissions::instance()->getNew();
-
-			$permission->setRole($this->getRole($role));
-			$permission->setResource($this->getResource($resource));
-
-			$permission->type = $type;
-			$permission->insert();
-
-			$this->addPermission($resource, $role, $type);
-		}
-	}
-
-	/**
-	 * Remove all permissions for $role [to $resource]
-	 * @param mixed $role
-	 */
-	public function removePermissions($role = false, $resource = false)
-	{
-		$permissions = $this->getPermissions($role, $resource);
-		if ($permissions) {
-			foreach ($permissions as $permission) {
-				$permission->delete();
-			}
-		}
-		if ($role) {
-			if ($resource) {
-				unset($this->_permissionMap[$this->getRoleID($role)][$this->getResourcePathString($resource)]);
-			} else {
-				unset($this->_permissionMap[$this->getRoleID($role)]);
-			}
-		} else {
-			if ($resource) {
-				foreach ($this->_permissionMap as $roleID => $resources) {
-					unset($this->_permissionMap[$roleID][$this->getResourcePathString($resource)]);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Checks if $role has $type acces to $resource
-	 *
-	 * @param mixed $role
-	 * @param mixed $resource
-	 * @param string $type
-	 * @return bool
-	 */
-	public function check($role, $resource, $type)
-	{
-		$role = $this->getRoleID($role);
-		$resource = $this->getResourcePathString($resource);
-
-		return $this->_permissionMap[$role][$resource][$type] == true;
-	}
-
-	/**
-	 * @param mixed $resource
-	 * @return ACL_Resource
-	 */
-	public function getResource($resource)
-	{
-		if (!($resource instanceof ACL_Resource)) {
-			$resource = $this->_resources[$resource];
-		}
-		return $resource;
-	}
-
-	public function getResourcePathString($resource)
-	{
-		return $this->getResource($resource)->getPathString();
-	}
-
-	public function getRole($role)
-	{
-		if (!($role instanceof ACL_Role)) {
-			$role = $this->_roles[$role];
-		}
-		return $role;
-	}
-
-	public function getRoleID($role)
-	{
-		return $this->getRole($role)->getRoleID();
-	}
-
-	public function getPermissions($role = false, $resource = false)
-	{
-		if (!$this->_permissions) {
-			$permissions = ACL_Permissions::instance()->findAll();
-			if ($permissions) {
-				foreach ($permissions as $permission) {
-					$this->addPermission($permission->id_acl_resource, $permission->id_acl_role, $permission->type);
-				}
-			}
-			$this->_permissions = $permissions;
-		}
-
-		$return = array();
-		if ($this->_permissions) {
-			foreach ($this->_permissions as $permission) {
-				if ($role) {
-					if ($permission->id_acl_role != $this->getRoleID($role)) {
-						continue;
-					}
-				}
-				if ($resource) {
-					if ($permission->id_acl_resource != $this->getResourcePathString($resource)) {
-						continue;
-					}
-				}
-
-				$return[] = $permission;
-			}
-		}
-		return $return;
-	}
-
-	public function getResources()
-	{
-		if (!$this->_resources) {
-			$resources = ACL_Resources::instance()->findAll();
-			if ($resources) {
-				foreach ($resources as $resource) {
-					$this->addResource($resource);
-				}
-			}
-		}
-		return $this->_resources;
-	}
-
-	public function getRoles()
-	{
-		if (!$this->_roles) {
-			$roles = ACL_Roles::instance()->findAll();
-
-			if ($roles) {
-				foreach ($roles as $role) {
-					$this->addRole($role);
-				}
-			}
-		}
-		return $this->_roles;
-	}
-
-	public function getPermissionTypes()
-	{
-		return $this->_permissionTypes;
-	}
-
-	/**
-	 * Singleton
-	 * @return ACL
-	 */
-	public static function instance()
-	{
-		static $instance;
-		if (!($instance instanceof self)) {
-			$instance = new self();
-		}
-		return $instance;
-	}
+    protected $_resources;
+    protected $_roles;
+    protected $_permissions;
+    protected $_permissionMap;
+    protected $_permissionTypes = array("view", "edit", "delete");
+
+    public function addResource($resource)
+    {
+        $this->_resources[$this->getResourcePathString($resource)] = $resource;
+    }
+
+    public function addRole($role)
+    {
+        $this->_roles[$this->getRoleID($role)] = $role;
+    }
+
+    /**
+     * Adds $type acces for $role to $resource
+     * 
+     * @param mixed $resource
+     * @param mixed $role
+     * @param string $type
+     */
+    public function addPermission($resource, $role, $type = "view")
+    {
+        $resource = $this->getResource($resource);
+        $role = $this->getRole($role);
+        $this->_permissionMap[$this->getRoleID($role)][$this->getResourcePathString($resource)][$type] = true;
+    }
+
+    /**
+     * Stores $type access for $role to $resource
+     * Checks to see if permission already exists before insertion
+     * 
+     * @param mixed $resource
+     * @param mixed $role
+     * @param string $type
+     */
+    public function insertPermission($resource, $role, $type)
+    {
+        if (!$this->check($role, $resource, $type)) {
+            $permission = ACL_Permissions::instance()->getNew();
+
+            $permission->setRole($this->getRole($role));
+            $permission->setResource($this->getResource($resource));
+
+            $permission->type = $type;
+            $permission->insert();
+
+            $this->addPermission($resource, $role, $type);
+        }
+    }
+
+    /**
+     * Remove all permissions for $role [to $resource]
+     * @param mixed $role
+     */
+    public function removePermissions($role = false, $resource = false)
+    {
+        $permissions = $this->getPermissions($role, $resource);
+        if ($permissions) {
+            foreach ($permissions as $permission) {
+                $permission->delete();
+            }
+        }
+        if ($role) {
+            if ($resource) {
+                unset($this->_permissionMap[$this->getRoleID($role)][$this->getResourcePathString($resource)]);
+            } else {
+                unset($this->_permissionMap[$this->getRoleID($role)]);
+            }
+        } else {
+            if ($resource) {
+                foreach ($this->_permissionMap as $roleID => $resources) {
+                    unset($this->_permissionMap[$roleID][$this->getResourcePathString($resource)]);
+                }
+            }
+        }
+    }
+
+    /**
+     * Checks if $role has $type acces to $resource
+     *
+     * @param mixed $role
+     * @param mixed $resource
+     * @param string $type
+     * @return bool
+     */
+    public function check($role, $resource, $type)
+    {
+        $role = $this->getRoleID($role);
+        $resource = $this->getResourcePathString($resource);
+
+        return $this->_permissionMap[$role][$resource][$type] == true;
+    }
+
+    /**
+     * @param mixed $resource
+     * @return ACL_Resource
+     */
+    public function getResource($resource)
+    {
+        if (!($resource instanceof ACL_Resource)) {
+            $resource = $this->_resources[$resource];
+        }
+        return $resource;
+    }
+
+    public function getResourcePathString($resource)
+    {
+        return $this->getResource($resource)->getPathString();
+    }
+
+    public function getRole($role)
+    {
+        if (!($role instanceof ACL_Role)) {
+            $role = $this->_roles[$role];
+        }
+        return $role;
+    }
+
+    public function getRoleID($role)
+    {
+        return $this->getRole($role)->getRoleID();
+    }
+
+    public function getPermissions($role = false, $resource = false)
+    {
+        if (!$this->_permissions) {
+            $permissions = ACL_Permissions::instance()->findAll();
+            if ($permissions) {
+                foreach ($permissions as $permission) {
+                    $this->addPermission($permission->id_acl_resource, $permission->id_acl_role, $permission->type);
+                }
+            }
+            $this->_permissions = $permissions;
+        }
+
+        $return = array();
+        if ($this->_permissions) {
+            foreach ($this->_permissions as $permission) {
+                if ($role) {
+                    if ($permission->id_acl_role != $this->getRoleID($role)) {
+                        continue;
+                    }
+                }
+                if ($resource) {
+                    if ($permission->id_acl_resource != $this->getResourcePathString($resource)) {
+                        continue;
+                    }
+                }
+
+                $return[] = $permission;
+            }
+        }
+        return $return;
+    }
+
+    public function getResources()
+    {
+        if (!$this->_resources) {
+            $resources = ACL_Resources::instance()->findAll();
+            if ($resources) {
+                foreach ($resources as $resource) {
+                    $this->addResource($resource);
+                }
+            }
+        }
+        return $this->_resources;
+    }
+
+    public function getRoles()
+    {
+        if (!$this->_roles) {
+            $roles = ACL_Roles::instance()->findAll();
+
+            if ($roles) {
+                foreach ($roles as $role) {
+                    $this->addRole($role);
+                }
+            }
+        }
+        return $this->_roles;
+    }
+
+    public function getPermissionTypes()
+    {
+        return $this->_permissionTypes;
+    }
+
+    /**
+     * Singleton
+     * @return ACL
+     */
+    public static function instance()
+    {
+        static $instance;
+        if (!($instance instanceof self)) {
+            $instance = new self();
+        }
+        return $instance;
+    }
 
 }
\ No newline at end of file

src/Helpers/Time.php

Indentation +28 added lines, -28 removed lines

@@ -12,42 +12,42 @@
         return $minutes;
     }
 	
-	public function secondsInStringTime($seconds)
-	{
-		if ($days = intval((floor($seconds / 86400)))) {
+    public function secondsInStringTime($seconds)
+    {
+        if ($days = intval((floor($seconds / 86400)))) {
             $seconds = $seconds - $days*86400;
-			$return .= ($return ? ' ' : '') . str_pad($days, 2, 0,STR_PAD_LEFT).'d';
-		}
-		if ($hours = intval((floor($seconds / 3600))) OR $return) {
+            $return .= ($return ? ' ' : '') . str_pad($days, 2, 0,STR_PAD_LEFT).'d';
+        }
+        if ($hours = intval((floor($seconds / 3600))) OR $return) {
             $seconds = $seconds - $hours*3600;
-			$return .= ($return ? ' ' : '') . str_pad($hours, 2, 0,STR_PAD_LEFT).'h';
-		}
-		if ($minutes = intval((floor($seconds / 60))) OR $return) {
-			$seconds = $seconds - $minutes*60;
-			$return .= ($return ? ' ' : '') . str_pad($minutes, 2, 0, STR_PAD_LEFT).'m';
-		}
+            $return .= ($return ? ' ' : '') . str_pad($hours, 2, 0,STR_PAD_LEFT).'h';
+        }
+        if ($minutes = intval((floor($seconds / 60))) OR $return) {
+            $seconds = $seconds - $minutes*60;
+            $return .= ($return ? ' ' : '') . str_pad($minutes, 2, 0, STR_PAD_LEFT).'m';
+        }
         
-		$seconds = round($seconds, 2);  
+        $seconds = round($seconds, 2);  
         if ($seconds) {
             $return .= ($return ? ' ' : '') . str_pad($seconds, 2, 0, STR_PAD_LEFT).'s';
         }
 			
-		return $return;
-	}
+        return $return;
+    }
 
 
-	/**
-	 * Singleton
-	 *
-	 * @return Nip_Helper_Date
-	 */
-	static public function instance()
-	{
-		static $instance;
-		if (!($instance instanceof self)) {
-			$instance = new self();
-		}
-		return $instance;
-	}
+    /**
+     * Singleton
+     *
+     * @return Nip_Helper_Date
+     */
+    static public function instance()
+    {
+        static $instance;
+        if (!($instance instanceof self)) {
+            $instance = new self();
+        }
+        return $instance;
+    }
     
 }