Index: language/en_us/plugin.php
===================================================================
--- language/en_us/plugin.php	(revision 0)
+++ language/en_us/plugin.php	(revision 0)
@@ -0,0 +1,21 @@
+<?php
+
+  return array(
+  
+    'plugin' => 'Plugin',
+    'plugins' => 'Plugins',
+    'list of plugins' => 'List of available plugins',
+    'update plugins' => 'Update plugins',
+    
+    'activated' => 'Activated',
+    'deactivated' => 'De-activated',
+    'what to do with data' => 'What do you want to do with the module associated data?',
+    'delete data' => 'Purge ',
+  	'keep data' => 'Keep',
+    'no plugins found' => 'No plugins found',
+    'plugin activation failed' => 'Plugins failed to activate: %s',
+    'plugins updated' => 'Plugins updated',
+    
+  ); // array
+
+?>
Index: language/en_us/project_interface.php
===================================================================
--- language/en_us/project_interface.php	(revision 162)
+++ language/en_us/project_interface.php	(working copy)
@@ -73,8 +73,8 @@
     'can manage milestones' => 'Manage milestones',
     'can upload files' => 'Upload files',
     'can manage files' => 'Manage files',
-    'can assign to owners' => 'Assign tasks to members of owner company',
-    'can assign to other' => 'Assign tasks to members of other clients',
+    'can assign tasks to owner company' => 'Assign tasks to members of owner company',
+    'can assign tasks to other clients' => 'Assign tasks to members of other clients',
     
     'add by' => 'added by',
     'edit by' => 'updated by',
Index: init.php
===================================================================
--- init.php	(revision 162)
+++ init.php	(working copy)
@@ -123,6 +123,21 @@
     benchmark_timer_set_marker('Init application');
   } // if
   
+  // here we will load plugin helper file
+  require_once 'plugins.php';
+  
+  // Set plugin manager timer...
+  if (Env::isDebugging()) {
+    benchmark_timer_set_marker('Plugin Manager loaded');
+  } // if
+
+  require_once 'permissions.php';
+  
+  // Set permission manager timer...
+  if (Env::isDebugging()) {
+    benchmark_timer_set_marker('Permission Manager loaded');
+  } // if
+
   // We need to call application.php after the routing is executed because
   // some of the application classes may need CONTROLLER, ACTION or $_GET
   // data collected by the matched route
Index: application/plugins/empty.txt
===================================================================
Index: application/permissions.php
===================================================================
--- application/permissions.php	(revision 0)
+++ application/permissions.php	(revision 0)
@@ -0,0 +1,29 @@
+<?php
+
+  /* Permissions loader
+   * @author Brett Edgar (TheWalrus) True Digital Security, Inc. www.truedigitalsecurity.com
+   * @version 1.0
+   * @http://www.projectpier.org/
+   */
+include_once 'models/PermissionManager.class.php';
+// init the permission manager
+  PermissionManager::instance()->init();
+  /*
+   * Convenience function for instance of PermissionManager used by hooks throughout
+   */
+  function permission_manager() {
+    return PermissionManager::instance();
+  }
+  
+  function add_permission($source, $permission_to_add) {
+    permission_manager()->addPermission($source,$permission_to_add);
+  }
+
+  function remove_permission($source, $permission_to_remove) {
+    permission_manager()->removePermission($source,$permission_to_add);
+  }
+
+  function remove_permission_source($source) {
+    permission_manager()->removeSource($source);
+  }
+?>
\ No newline at end of file
Index: application/helpers/tabbednavigation.php
===================================================================
--- application/helpers/tabbednavigation.php	(revision 162)
+++ application/helpers/tabbednavigation.php	(working copy)
@@ -7,7 +7,10 @@
   * @return array
   */
   function tabbed_navigation_items() {
-    return TabbedNavigation::instance()->getItems();
+    // PLUGIN HOOK
+    return plugin_manager()->apply_filters('tabbed_navigation_items',
+                                   TabbedNavigation::instance()->getItems());
+    // PLUGIN HOOK
   } // tabbed_navigation_items
   
   /**
Index: application/helpers/application.php
===================================================================
--- application/helpers/application.php	(revision 162)
+++ application/helpers/application.php	(working copy)
@@ -84,8 +84,8 @@
     
     $logged_user = logged_user();
     
-    $can_assign_to_owners = $logged_user->isMemberOfOwnerCompany() || $logged_user->getProjectPermission($project, ProjectUsers::CAN_ASSIGN_TO_OWNERS);
-    $can_assign_to_other = $logged_user->isMemberOfOwnerCompany() || $logged_user->getProjectPermission($project, ProjectUsers::CAN_ASSIGN_TO_OTHER);
+    $can_assign_to_owners = $logged_user->isMemberOfOwnerCompany() || $logged_user->getProjectPermission($project, PermissionManager::CAN_ASSIGN_TO_OWNERS);
+    $can_assign_to_other = $logged_user->isMemberOfOwnerCompany() || $logged_user->getProjectPermission($project, PermissionManager::CAN_ASSIGN_TO_OTHER);
     
     $grouped_users = $project->getUsers(true);
     
Index: application/helpers/company_website.php
===================================================================
--- application/helpers/company_website.php	(revision 162)
+++ application/helpers/company_website.php	(working copy)
@@ -51,6 +51,10 @@
       get_url('dashboard', 'my_tasks')
     ));
     
+    // PLUGIN HOOK
+    plugin_manager()->do_action('add_dashboard_tab');
+    // PLUGIN HOOK
+    
     tabbed_navigation_set_selected($selected);
   } // dashboard_tabbed_navigation
   
@@ -86,6 +90,7 @@
   define('ADMINISTRATION_TAB_CONFIGURATION', 'config');
   define('ADMINISTRATION_TAB_TOOLS', 'tools');
   define('ADMINISTRATION_TAB_UPGRADE', 'upgrade');
+  define('ADMINISTRATION_TAB_PLUGINS', 'plugins');
 
   /**
   * Prepare administration tabbed navigation
@@ -135,6 +140,16 @@
       lang('upgrade'),
       get_url('administration', 'upgrade')
     ));
+    add_tabbed_navigation_item(new TabbedNavigationItem(
+      ADMINISTRATION_TAB_PLUGINS,
+      lang('plugins'),
+      get_url('administration','plugins')
+    ));
+    
+    // PLUGIN HOOK
+    plugin_manager()->do_action('add_administration_tab');
+    // PLUGIN HOOK
+    
     tabbed_navigation_set_selected($selected);
   } // administration_tabbed_navigation
   
@@ -177,6 +192,11 @@
       lang('my account'), 
       get_url('account', 'index')
     ));
+    
+    // PLUGIN HOOK
+    plugin_manager()->do_action('add_my_account_tab');
+    // PLUGIN HOOK
+    
     tabbed_navigation_set_selected($selected);
   } // account_tabbed_navigation
 
Index: application/helpers/project_website.php
===================================================================
--- application/helpers/project_website.php	(revision 162)
+++ application/helpers/project_website.php	(working copy)
@@ -78,6 +78,11 @@
       lang('people'),
       get_url('project', 'people')
     ));
+    
+    // PLUGIN HOOK
+    plugin_manager()->do_action('add_project_tab');
+    // PLUGIN HOOK
+    
     tabbed_navigation_set_selected($selected);
   } // dashboard_tabbed_navigation
 
Index: application/models/PluginManager.class.php
===================================================================
--- application/models/PluginManager.class.php	(revision 0)
+++ application/models/PluginManager.class.php	(revision 0)
@@ -0,0 +1,179 @@
+<?php
+ /**
+  * PluginManager
+  *
+  * This file contains logic that has been borrowed from my favourite
+  *  publishing platform; WordPress
+  * The implementation is only a part reproduction and has been modified
+  *  to suit the ProjectPier application.
+  * @author Mark Brennand
+  * @link http://www.activeingredient.com.au
+  *
+  * The plugin architecture supports both actions and filters. The difference
+  * between these is a matter of input; all actions on the same hook receive
+  * the same input regardless of order, filters received modified input from
+  * previous filters on the same hook.
+  * 
+  * @see application/plugins.php
+  *  
+  * @version 1.0
+  * @http://www.projectpier.org/
+  */
+class PluginManager {
+    
+  /**
+   * List of filters and actions
+   *
+   * @var array
+   */
+  var $filter_table;
+  var $included;
+    
+  function init() {
+    if (isset($this) && ($this instanceof PluginManager)) {
+
+      $this->included = array();
+      $this->filter_table = array();
+      $activated_plugins = Plugins::getActivatedPlugins();
+        
+      // now load each plugin
+      foreach(array_keys($activated_plugins) as $name) {
+	include_once 'plugins/'.$name.'/init.php';
+      } // foreach
+        
+      // TODO : cleanup up old activated plugins without valid file??
+        
+    } else {
+      PluginManager::instance()->init();
+    } // if
+  } // init
+    
+  function add_filter($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
+    if ( isset($this->filter_table[$tag][$priority]) ) {
+      foreach($this->filter_table[$tag][$priority] as $filter) {
+	if ( $filter['function'] == $function_to_add ) {
+	  return false;
+	} // if
+      } // foreach
+    } // if
+    $this->filter_table[$tag][$priority][] = array('function'=>$function_to_add,
+						   'accepted_args'=>$accepted_args);
+    return true;
+  } // add_filter
+    
+  function remove_filter($tag, $function_to_remove, $priority = 10) {
+    $toret = false;
+    
+    if ( isset($this->filter_table[$tag][$priority]) ) {
+      foreach($this->filter_table[$tag][$priority] as $filter) {
+	if ( $filter['function'] != $function_to_remove ) {
+	  $new_function_list[] = $filter;
+	} else {
+	  $toret = true;
+	} // if
+      } // foreach
+      $this->filter_table[$tag][$priority] = $new_function_list;
+    } // if
+    return $toret;
+  } // remove_filter
+    
+  function do_action($tag,$arg='') {
+    
+    if ( !isset($this->filter_table[$tag]) ) {
+      return;
+    } else {
+      ksort($this->filter_table[$tag]);
+    } // if
+      
+    $args = array();
+    if ( is_array($arg) && 1 == count($arg) && is_object($arg[0]) ) {
+      $args[] =& $arg[0];
+    } else {
+      $args[] = $arg;
+    } // if
+    
+    for ( $a = 2; $a < func_num_args(); $a++ ) {
+      $args[] = func_get_arg($a);
+    } // for
+      
+    foreach ($this->filter_table[$tag] as $priority => $functions) {
+      if ( !is_null($functions) ) {
+	foreach($functions as $f) {
+	  call_user_func_array($f['function'], array_slice($args, 0, (int)$f['accepted_args']));
+	} // foreach
+      } // if
+    } // foreach
+  } // do_action
+  
+  function apply_filters($tag,$value) {
+    $args = func_get_args();
+    
+    if ( !isset($this->filter_table[$tag]) ) {
+      return $value;
+    } else {
+      ksort($this->filter_table[$tag]);
+    } // if
+      
+    foreach ($this->filter_table[$tag] as $priority => $functions) {
+      if ( !is_null($functions) ) {
+	foreach($functions as $f) {
+	  $args[1] = $value;
+	  $value = call_user_func_array($f['function'], array_slice($args, 1,(int)$f['accepted_args']));
+	} // foreach
+      } // if
+    } // foreach
+    return $value;
+  } // apply_filters
+
+  function useHelper($plugin_name, $helper) {
+    $helper_file = APPLICATION_PATH . "/plugins/$plugin_name/helpers/$helper.php";
+
+    // If we have it include, else throw exception
+    if (is_file($helper_file)) {
+      include_once $helper_file;
+      return true;
+    } else {
+      throw new FileDnxError($helper_file, "Helper '$helper' for plugin '$plugin_name' does not exists (expected location '$helper_file')");
+    } // if
+  } // useHelper
+
+  /**
+   * Use specific library. This function will look in plugin directory.
+   * If it doesn't find requested library class, then LibraryDnxError
+   * will be raised
+   *
+   * @access public
+   * @param string $library Library name
+   * @return null
+   * @throws LibraryDnxError
+   */
+  static function useLibrary($plugin_name, $library) {
+    $library_path = APPLICATION_PATH . "/plugins/$plugin_name/library/$library/";
+    if (file_exists($library_path) && is_dir($library_path)) {
+      // Call init library file if it exists
+      $library_init_file = $library_path . $library . '.php';
+      if (is_file($library_init_file)) {
+	include_once $library_init_file;
+      } // if
+      return true;
+    } // if
+
+    throw new LibraryDnxError($library);
+  } // useLibrary
+   
+  /**
+   * Return single PluginManager instance
+   *
+   * @access public
+   * @param void
+   * @return PluginManager 
+   */
+  static function instance() {
+    static $instance;
+    if (!($instance instanceof PluginManager )) {
+      $instance = new PluginManager();
+    } // if
+    return $instance;
+  } // instance
+}
+?>
Index: application/models/application_logs/ApplicationLogs.class.php
===================================================================
--- application/models/application_logs/ApplicationLogs.class.php	(revision 162)
+++ application/models/application_logs/ApplicationLogs.class.php	(working copy)
@@ -130,19 +130,62 @@
       $private_filter = $include_private ? 1 : 0;
       $silent_filter = $include_silent ? 1 : 0;
       
-      return self::findAll(array(
+      $all_logs = self::findAll(array(
         'conditions' => array('`is_private` <= ? AND `is_silent` <= ? AND `project_id` = (?)', $private_filter, $silent_filter, $project->getId()),
         'order' => '`created_on` DESC',
         'limit' => $limit,
         'offset' => $offset,
       )); // findAll
+      
+      
+      return ApplicationLogs::filterLogs($all_logs);
+      
     } // getProjectLogs
     
+    
+    
     /**
+    * Exclude logs from uninstaller plugins
+    *
+    * @param Project $project
+    * @param boolean $include_private
+    * @param boolean $include_silent
+    * @param integer $limit
+    * @param integer $offset
+    * @return array
+    */
+    static function filterLogs($all_logs) {
+      if ($all_logs==NULL) return;
+      $filtered_logs = array();
+      //Only show logs related to installed applications
+      foreach ($all_logs as $log)
+      {
+      	if ($log->getObject()==NULL) continue;
+      	//Search the string 'plugins' in the file path containing the class, if false is a core application else is a plugin
+      	if (strpos($GLOBALS['autoloader_classes'][strtoupper(get_class($log->getObject()))], 'plugins') == false)
+      	{
+      		//the class is a core application 
+      		$filtered_logs[]=$log;
+      	}
+      	else 
+      	{
+      		//the class comes from a plugin
+      		//so we need to filter logs from uninstalled plugins
+      		$plugin_name = strtolower(get_class($log->getObject()->manager()));
+      		$plugin = Plugins::findOne(array('conditions'=>array('`name` = ?', $plugin_name)));
+      		if($plugin->isInstalled()) $filtered_logs[] = $log;
+      	}	
+      
+      }
+      return $filtered_logs;
+      
+    } // filterLogs
+    
+    /**
     * Return overall (for dashboard or RSS)
     *
     * This function will return array of application logs that match the function arguments. Entries can be filtered by 
-    * type (prvivate, silent), projects (if $project_ids is array, if NULL project ID is ignored). Result set can be 
+    * type (private, silent), projects (if $project_ids is array, if NULL project ID is ignored). Result set can be 
     * also limited using $limit and $offset params
     * 
     * @param boolean $include_private
@@ -162,12 +205,14 @@
         $conditions = array('`is_private` <= ? AND `is_silent` <= ?', $private_filter, $silent_filter);
       } // if
       
-      return self::findAll(array(
+      $all_logs = self::findAll(array(
         'conditions' => $conditions,
         'order' => '`created_on` DESC',
         'limit' => $limit,
         'offset' => $offset,
       )); // findAll
+      
+      return ApplicationLogs::filterLogs($all_logs);
     } // getOverallLogs
     
     /**
Index: application/models/project_user_permissions/ProjectUserPermission.class.php
===================================================================
--- application/models/project_user_permissions/ProjectUserPermission.class.php	(revision 0)
+++ application/models/project_user_permissions/ProjectUserPermission.class.php	(revision 0)
@@ -0,0 +1,13 @@
+<?php
+
+  /**
+  * ProjectUserPermission class
+  *
+  * @author Brett Edgar (TheWalrus) True Digital Security, Inc. www.truedigitalsecurity.com
+  * @http://www.projectpier.org/
+  */
+  class ProjectUserPermission extends BaseProjectUserPermission {
+  
+  } // ProjectUserPermission
+
+?>
Index: application/models/project_user_permissions/base/BaseProjectUserPermission.class.php
===================================================================
--- application/models/project_user_permissions/base/BaseProjectUserPermission.class.php	(revision 0)
+++ application/models/project_user_permissions/base/BaseProjectUserPermission.class.php	(revision 0)
@@ -0,0 +1,97 @@
+<?php
+
+  /**
+  * BaseProjectUserPermission class
+  *
+  * @author Brett Edgar (TheWalrus) True Digital Security, Inc. www.truedigitalsecurity.com
+  * @http://www.projectpier.org/
+  */
+  abstract class BaseProjectUserPermission extends DataObject {
+  
+    // -------------------------------------------------------
+    //  Access methods
+    // -------------------------------------------------------
+  
+    /**
+    * Return value of 'project_id' field
+    *
+    * @access public
+    * @param void
+    * @return integer 
+    */
+    function getProjectId() {
+      return $this->getColumnValue('project_id');
+    } // getProjectId()
+    
+    /**
+    * Set value of 'project_id' field
+    *
+    * @access public   
+    * @param integer $value
+    * @return boolean
+    */
+    function setProjectId($value) {
+      return $this->setColumnValue('project_id', $value);
+    } // setProjectId() 
+    
+    /**
+    * Return value of 'user_id' field
+    *
+    * @access public
+    * @param void
+    * @return integer 
+    */
+    function getUserId() {
+      return $this->getColumnValue('user_id');
+    } // getUserId()
+    
+    /**
+    * Set value of 'user_id' field
+    *
+    * @access public   
+    * @param integer $value
+    * @return boolean
+    */
+    function setUserId($value) {
+      return $this->setColumnValue('user_id', $value);
+    } // setUserId() 
+
+    /**
+    * Return value of 'permission_id' field
+    *
+    * @access public
+    * @param void
+    * @return integer 
+    */
+    function getPermissionId() {
+      return $this->getColumnValue('permission_id');
+    } // getPermissionId()
+    
+    /**
+    * Set value of 'permission_id' field
+    *
+    * @access public   
+    * @param integer $value
+    * @return boolean
+    */
+    function setPermissionId($value) {
+      return $this->setColumnValue('permission_id', $value);
+    } // setPermissionId() 
+    
+    /**
+    * Return manager instance
+    *
+    * @access protected
+    * @param void
+    * @return ProjectUsers 
+    */
+    function manager() {
+      if (!($this->manager instanceof ProjectUserPermissions)) {
+        $this->manager = ProjectUserPermissions::instance();
+      }
+      return $this->manager;
+    } // manager
+  
+  } // BaseProjectUserPermission
+
+?>
Index: application/models/project_user_permissions/base/BaseProjectUserPermissions.class.php
===================================================================
--- application/models/project_user_permissions/base/BaseProjectUserPermissions.class.php	(revision 0)
+++ application/models/project_user_permissions/base/BaseProjectUserPermissions.class.php	(revision 0)
@@ -0,0 +1,239 @@
+<?php 
+
+  
+  /**
+  * BaseProjectUserPermissions class
+  *
+  * @author Brett Edgar (TheWalrus) True Digital Security, Inc. www.truedigitalsecurity.com
+  * @http://www.projectpier.org/
+  */
+  abstract class BaseProjectUserPermissions extends DataManager {
+  
+    /**
+    * Column name => Column type map
+    *
+    * @var array
+    * @static
+    */
+    static private $columns = array('user_id' => DATA_TYPE_INTEGER, 'project_id' => DATA_TYPE_INTEGER, 'permission_id' => DATA_TYPE_INTEGER);
+  
+    /**
+    * Construct
+    *
+    * @return BaseProjectUserPermissions 
+    */
+    function __construct() {
+      parent::__construct('ProjectUserPermission', 'project_user_permissions', true);
+    } // __construct
+    
+    // -------------------------------------------------------
+    //  Description methods
+    // -------------------------------------------------------
+    
+    /**
+    * Return array of object columns
+    *
+    * @access public
+    * @param void
+    * @return array
+    */
+    function getColumns() {
+      return array_keys(self::$columns);
+    } // getColumns
+    
+    /**
+    * Return column type
+    *
+    * @access public
+    * @param string $column_name
+    * @return string
+    */
+    function getColumnType($column_name) {
+      if (isset(self::$columns[$column_name])) {
+        return self::$columns[$column_name];
+      } else {
+        return DATA_TYPE_STRING;
+      } // if
+    } // getColumnType
+    
+    /**
+    * Return array of PK columns. If only one column is PK returns its name as string
+    *
+    * @access public
+    * @param void
+    * @return array or string
+    */
+    function getPkColumns() {
+      return array (
+  0 => 'project_id',
+  1 => 'user_id',
+  2 => 'permission_id'
+);
+    } // getPkColumns
+    
+    /**
+    * Return name of first auto_incremenent column if it exists
+    *
+    * @access public
+    * @param void
+    * @return string
+    */
+    function getAutoIncrementColumn() {
+      return NULL;
+    } // getAutoIncrementColumn
+    
+    // -------------------------------------------------------
+    //  Finders
+    // -------------------------------------------------------
+    
+    /**
+    * Do a SELECT query over database with specified arguments
+    *
+    * @access public
+    * @param array $arguments Array of query arguments. Fields:
+    * 
+    *  - one - select first row
+    *  - conditions - additional conditions
+    *  - order - order by string
+    *  - offset - limit offset, valid only if limit is present
+    *  - limit
+    * 
+    * @return one or ProjectUserPermissions objects
+    * @throws DBQueryError
+    */
+    function find($arguments = null) {
+      if (isset($this) && instance_of($this, 'ProjectUserPermissions')) {
+        return parent::find($arguments);
+      } else {
+        return ProjectUserPermissions::instance()->find($arguments);
+        //$instance =& ProjectUserPermissions::instance();
+        //return $instance->find($arguments);
+      } // if
+    } // find
+    
+    /**
+    * Find all records
+    *
+    * @access public
+    * @param array $arguments
+    * @return one or ProjectUserPermissions objects
+    */
+    function findAll($arguments = null) {
+      if (isset($this) && instance_of($this, 'ProjectUserPermissions')) {
+        return parent::findAll($arguments);
+      } else {
+        return ProjectUserPermissions::instance()->findAll($arguments);
+        //$instance =& ProjectUserPermissions::instance();
+        //return $instance->findAll($arguments);
+      } // if
+    } // findAll
+    
+    /**
+    * Find one specific record
+    *
+    * @access public
+    * @param array $arguments
+    * @return ProjectUser 
+    */
+    function findOne($arguments = null) {
+      if (isset($this) && instance_of($this, 'ProjectUserPermissions')) {
+        return parent::findOne($arguments);
+      } else {
+        return ProjectUserPermissions::instance()->findOne($arguments);
+        //$instance =& ProjectUserPermissions::instance();
+        //return $instance->findOne($arguments);
+      } // if
+    } // findOne
+    
+    /**
+    * Return object by its PK value
+    *
+    * @access public
+    * @param mixed $id
+    * @param boolean $force_reload If true cache will be skipped and data will be loaded from database
+    * @return ProjectUser 
+    */
+    function findById($id, $force_reload = false) {
+      if (isset($this) && instance_of($this, 'ProjectUserPermissions')) {
+        return parent::findById($id, $force_reload);
+      } else {
+        return ProjectUserPermissions::instance()->findById($id, $force_reload);
+        //$instance =& ProjectUserPermissions::instance();
+        //return $instance->findById($id, $force_reload);
+      } // if
+    } // findById
+    
+    /**
+    * Return number of rows in this table
+    *
+    * @access public
+    * @param string $conditions Query conditions
+    * @return integer
+    */
+    function count($condition = null) {
+      if (isset($this) && instance_of($this, 'ProjectUserPermissions')) {
+        return parent::count($condition);
+      } else {
+        return ProjectUserPermissions::instance()->count($condition);
+        //$instance =& ProjectUserPermissions::instance();
+        //return $instance->count($condition);
+      } // if
+    } // count
+    
+    /**
+    * Delete rows that match specific conditions. If $conditions is NULL all rows from table will be deleted
+    *
+    * @access public
+    * @param string $conditions Query conditions
+    * @return boolean
+    */
+    function delete($condition = null) {
+      if (isset($this) && instance_of($this, 'ProjectUserPermissions')) {
+        return parent::delete($condition);
+      } else {
+        return ProjectUserPermissions::instance()->delete($condition);
+        //$instance =& ProjectUserPermissions::instance();
+        //return $instance->delete($condition);
+      } // if
+    } // delete
+    
+    /**
+    * This function will return paginated result. Result is an array where first element is 
+    * array of returned object and second populated pagination object that can be used for 
+    * obtaining and rendering pagination data using various helpers.
+    * 
+    * Items and pagination array vars are indexed with 0 for items and 1 for pagination
+    * because you can't use associative indexing with list() construct
+    *
+    * @access public
+    * @param array $arguments Query argumens (@see find()) Limit and offset are ignored!
+    * @param integer $items_per_page Number of items per page
+    * @param integer $current_page Current page number
+    * @return array
+    */
+    function paginate($arguments = null, $items_per_page = 10, $current_page = 1) {
+      if (isset($this) && instance_of($this, 'ProjectUserPermissions')) {
+        return parent::paginate($arguments, $items_per_page, $current_page);
+      } else {
+        return ProjectUserPermissions::instance()->paginate($arguments, $items_per_page, $current_page);
+        //$instance =& ProjectUserPermissions::instance();
+        //return $instance->paginate($arguments, $items_per_page, $current_page);
+      } // if
+    } // paginate
+    
+    /**
+    * Return manager instance
+    *
+    * @return ProjectUserPermissions 
+    */
+    function instance() {
+      static $instance;
+      if (!instance_of($instance, 'ProjectUserPermissions')) {
+        $instance = new ProjectUserPermissions();
+      } // if
+      return $instance;
+    } // instance
+  
+  } // BaseProjectUserPermissions
+
+?>
Index: application/models/project_user_permissions/ProjectUserPermissions.class.php
===================================================================
--- application/models/project_user_permissions/ProjectUserPermissions.class.php	(revision 0)
+++ application/models/project_user_permissions/ProjectUserPermissions.class.php	(revision 0)
@@ -0,0 +1,25 @@
+<?php
+
+  /**
+  * ProjectUserPermissions
+  * @author Brett Edgar (TheWalrus) True Digital Security, Inc. www.truedigitalsecurity.com
+  * @http://www.projectpier.org/
+  */
+  class ProjectUserPermissions extends BaseProjectUserPermissions {
+
+  function getPermissionsForProjectUser(ProjectUser $project_user) {
+    if (isset($this->permissions_cache) && isset($this->permissions_cache[$project_user])) {
+      return $this->permissions_cache[$project_user];
+    }
+    $permissions = array();
+    $pups = ProjectUserPermissions::findAll(array('conditions' => '`project_id` = '.$project_user->getProjectId().' and `user_id` = '.$project_user->getUserId()));
+    if (is_array($pups)) {
+      foreach ($pups as $pup) {
+	$permissions[] = Permissions::getPermissionString($pup->getPermissionId());
+      }
+    } //if
+    $this->permissions_cache[$project_user] = $permissions;
+    return $permissions;
+  } //getPermissionsForProjectUser
+} // ProjectUserPermissions
+?>
Index: application/models/users/User.class.php
===================================================================
--- application/models/users/User.class.php	(revision 162)
+++ application/models/users/User.class.php	(working copy)
@@ -184,7 +184,7 @@
     *
     * @param Project $project
     * @param string $permission Name of the field where the permission value is stored. There are set of constants
-    *   in ProjectUser that hold field names (ProjectUser::CAN_MANAGE_MESSAGES ...)
+    *   in ProjectUser that hold field names (PermissionManager::CAN_MANAGE_MESSAGES ...)
     * @return boolean
     */
     function hasProjectPermission(Project $project, $permission, $use_cache = true) {
@@ -201,17 +201,68 @@
         } // if
         return false;
       } // if
+
+      $value = in_array($permission,$project_user->getPermissions()) ? true : false;
+      if ($use_cache) {
+        $this->project_permissions_cache[$project->getId()][$permission] = $value;
+      } // if
+      return $value;
+    } // hasProjectPermission
+
+    /**
+    * Return project permission for specific user if he is on project. In case of any error $default is returned
+    *
+    * @access public
+    * @param Project $project
+    * @param string $permission Permission name
+    * @param boolean $default Default value
+    * @return boolean
+    */
+    function getProjectPermission(Project $project, $permission, $default = false) {
+      static $valid_permissions = null;
+      if (is_null($valid_permissions)) {
+        $valid_permissions = array_keys(PermissionManager::getPermissionsText());
+      } // if
       
-      $getter_method = 'get' . Inflector::camelize($permission);
-      $project_user_methods = get_class_methods('ProjectUser');
+      if (!in_array($permission, $valid_permissions)) {
+        return $default;
+      } // if
       
-      $value = in_array($getter_method, $project_user_methods) ? $project_user->$getter_method() : false;
-      
+      $project_user = ProjectUsers::findById(array('project_id' => $project->getId(), 'user_id' => $this->getId()));
+      if (!($project_user instanceof ProjectUser)) {
+        if ($use_cache) {
+          $this->project_permissions_cache[$project->getId()][$permission] = false;
+        } // if
+        return $default;
+      } // if
+
+      $value = in_array($permission,$project_user->getPermissions()) ? true : false;
       if ($use_cache) {
         $this->project_permissions_cache[$project->getId()][$permission] = $value;
+      } // if
+      return $value;
+    } // getProjectPermission
+
+    function setProjectPermission(Project $project, $permissionString, $value) {
+      $permission_id = Permissions::getPermissionId($permissionString);
+      if (!isset($permission_id) || !$permission_id) {
+	return false;
       }
-      return $value;
-    } // hasProjectPermission
+      $pup = ProjectUserPermissions::findOne(array('conditions' => '`project_id` = '.$project->getId().' and `user_id` = '.$this->getId().' and `permission_id` = '.$permission_id));
+      if ($value == 1) {
+	if (!isset($pup) || !($pup instanceof ProjectUserPermission)) {
+	  $pup = new ProjectUserPermission();
+	  $pup->setProjectId($project->getId());
+	  $pup->setUserId($this->getId());
+	} //if
+	$pup->setPermissionId($permission_id);
+	$pup->save();
+      } else {
+	if (isset($pup) && ($pup instanceOf ProjectUserPermission)) {
+	  $pup->delete();
+	} // if
+      } // if
+    } // setProjectPermission
     
     /**
     * This function will check if this user have all project permissions
@@ -221,7 +272,7 @@
     * @return boolean
     */
     function hasAllProjectPermissions(Project $project, $use_cache = true) {
-      $permissions = ProjectUsers::getPermissionColumns();
+      $permissions = array_keys(PermissionManager::getPermissionsText());
       if (is_array($permissions)) {
         foreach ($permissions as $permission) {
           if (!$this->hasProjectPermission($project, $permission, $use_cache)) {
@@ -750,37 +801,6 @@
       return ($this->getCompanyId() == $company->getId()) && $this->getIsAdmin();
     } // isCompanyAdmin
     
-    /**
-    * Return project permission for specific user if he is on project. In case of any error $default is returned
-    *
-    * @access public
-    * @param Project $project
-    * @param string $permission Permission name
-    * @param boolean $default Default value
-    * @return boolean
-    */
-    function getProjectPermission(Project $project, $permission, $default = false) {
-      static $valid_permissions = null;
-      if (is_null($valid_permissions)) {
-        $valid_permissions = ProjectUsers::getPermissionColumns();
-      } // if
-      
-      if (!in_array($permission, $valid_permissions)) {
-        return $default;
-      } // if
-      
-      $project_user = ProjectUsers::findById(array(
-        'project_id' => $project->getId(),
-        'user_id' => $this->getId()
-      )); // findById
-      if (!($project_user instanceof ProjectUser)) {
-        return $default;
-      } // if
-      
-      $getter = 'get' . Inflector::camelize($permission);
-      return $project_user->$getter();
-    } // getProjectPermission
-    
     // ---------------------------------------------------
     //  URLs
     // ---------------------------------------------------
Index: application/models/project_milestones/ProjectMilestone.class.php
===================================================================
--- application/models/project_milestones/ProjectMilestone.class.php	(revision 162)
+++ application/models/project_milestones/ProjectMilestone.class.php	(working copy)
@@ -263,7 +263,7 @@
     * @return boolean
     */
     function canManage(User $user) {
-      return $user->getProjectPermission($this->getProject(), ProjectUsers::CAN_MANAGE_MILESTONES);
+      return $user->getProjectPermission($this->getProject(), PermissionManager::CAN_MANAGE_MILESTONES);
     } // canManage
     
     /**
@@ -300,7 +300,7 @@
       if ($user->isAdministrator()) {
         return true;
       }
-      return $user->getProjectPermission($project, ProjectUsers::CAN_MANAGE_MILESTONES);
+      return $user->getProjectPermission($project, PermissionManager::CAN_MANAGE_MILESTONES);
     } // canAdd
     
     /**
Index: application/models/PermissionManager.class.php
===================================================================
--- application/models/PermissionManager.class.php	(revision 0)
+++ application/models/PermissionManager.class.php	(revision 0)
@@ -0,0 +1,108 @@
+<?php
+ /**
+  * PermissionManager
+  *
+  * @author Brett Edgar (TheWalrus) True Digital Security, Inc. www.truedigitalsecurity.com
+  * @version 1.0
+  * @http://www.projectpier.org/
+  */
+class PermissionManager {
+
+  /** Built-in user permissions **/
+  const CAN_MANAGE_MESSAGES   = 'messages-manage';
+  const CAN_MANAGE_TASKS      = 'tasks-manage';
+  const CAN_MANAGE_MILESTONES = 'milestones-manage';
+  const CAN_UPLOAD_FILES      = 'files-upload';
+  const CAN_MANAGE_FILES      = 'files-manage';
+  const CAN_ASSIGN_TO_OWNERS  = 'tasks-assign_to_owner_company';
+  const CAN_ASSIGN_TO_OTHER   = 'tasks-assign_to_other_clients';
+
+  function init() {
+    if (isset($this) && ($this instanceof PermissionManager)) {
+      
+    } else {
+      PermissionManager::instance()->init();
+    } // if
+  }
+
+  /**
+   * Return single PermissionManager instance
+   *
+   * @access public
+   * @param void
+   * @return PluginManager 
+   */
+  static function instance() {
+    static $instance;
+    if (!($instance instanceof PermissionManager )) {
+      $instance = new PermissionManager();
+    } // if
+    return $instance;
+  } // instance
+
+  /*
+   * Get the localized permission text for displaying to the user
+   * @return array mapping the permission string to the localized text for that permission string
+   *
+   */
+  function getPermissionsText() {
+    $permText = array();
+    $permsBySource = Permissions::getPermissionsBySource();
+    foreach ($permsBySource as $source => $permissions) {
+      foreach ($permissions as $permission) {
+	$text = split(' ',$permission[0],2);
+	if (count($text) == 2) {
+	  $plang = "can ".$text[0]." ".$source." ".$text[1];
+	} else {
+	  $plang = "can ".$text[0]." ".$source;
+	} // if
+	$permText[$source."-".preg_replace('/ /','_',$permission[0])] = lang($plang);
+      } // foreach
+    } // foreach
+    return $permText;
+  } //getPermissionsText
+
+  /*
+   * Add a permission source,name combination to the database
+   *
+   */
+  static function addPermission($source,$name) {
+    if (Permissions::findOne(array('conditions' => "`source` = '".$source."' and `permission` = '".$name."'"))) {
+      return false; // permission already exists
+    }
+    $permission = new Permission();
+    $permission->setSource($source);
+    $permission->setName($name);
+    return $permission->save();
+  } //addPermission
+
+  /*
+   * Remove a permission source,name combination from the database
+   *
+   */
+  static function removePermission($source,$name) {
+    $permission = Permissions::findOne(array('conditions' => "`source` = '".$source."' and `permission` = '".$name."'"));
+    if (isset($permission) && $permission instanceof Permission) {
+      $permission->delete();
+      return true; // permission already exists
+    }
+    return false; // permission does not exist
+  }
+
+  /*
+   * Remove all permissions from the specified source from the database
+   *
+   */  
+  static function removeSource($source) {
+    $permissions = Permissions::findAll(array('conditions' => "`source` = '".$source."'"));
+    if (is_array($permissions)) {
+      foreach ($permissions as $permission) {
+	$permission->delete();
+      }
+      return true; // permission already exists
+    }
+    return false; // permission source does not exist
+  }
+  
+}
+?>
\ No newline at end of file
Index: application/models/ProjectDataObject.class.php
===================================================================
--- application/models/ProjectDataObject.class.php	(revision 162)
+++ application/models/ProjectDataObject.class.php	(working copy)
@@ -220,7 +220,7 @@
         return false;
       }
       if ($this->isNew()) {
-        return $user->getProjectPermission($project, ProjectUsers::CAN_UPLOAD_FILES);
+        return $user->getProjectPermission($project, PermissionManager::CAN_UPLOAD_FILES);
       } else {
         return $this->canEdit($user);
       } // if
Index: application/models/plugins/Plugin.class.php
===================================================================
--- application/models/plugins/Plugin.class.php	(revision 0)
+++ application/models/plugins/Plugin.class.php	(revision 0)
@@ -0,0 +1,12 @@
+<?php
+
+  /**
+  * Plugin class
+  *
+  * @http://www.projectpier.org/
+  */
+  class Plugin extends BasePlugin {
+    
+  } // Plugin 
+
+?>
Index: application/models/plugins/base/BasePlugin.class.php
===================================================================
--- application/models/plugins/base/BasePlugin.class.php	(revision 0)
+++ application/models/plugins/base/BasePlugin.class.php	(revision 0)
@@ -0,0 +1,96 @@
+<?php
+
+  /**
+  * BasePlugin class
+  *
+  * @http://www.projectpier.org/
+  */
+  abstract class BasePlugin extends DataObject {
+  
+    // -------------------------------------------------------
+    //  Access methods
+    // -------------------------------------------------------
+  
+    /**
+    * Return value of 'plugin_id' field
+    *
+    * @access public
+    * @param void
+    * @return integer 
+    */
+    function getPluginId() {
+      return $this->getColumnValue('plugin_id');
+    } // getPluginId()
+    
+    /**
+    * Set value of 'plugin_id' field
+    *
+    * @access public   
+    * @param integer $value
+    * @return boolean
+    */
+    function setPluginId($value) {
+      return $this->setColumnValue('plugin_id', $value);
+    } // setPluginId() 
+    
+    /**
+    * Return value of 'name' field
+    *
+    * @access public
+    * @param void
+    * @return integer 
+    */
+    function getName() {
+      return $this->getColumnValue('name');
+    } // getName()
+    
+    /**
+    * Set value of 'name' field
+    *
+    * @access public   
+    * @param integer $value
+    * @return boolean
+    */
+    function setName($value) {
+      return $this->setColumnValue('name', $value);
+    } // setName() 
+    
+    /**
+    * Tell if a plugin is installed
+    *
+    * @access public   
+    * @return boolean
+    */
+    function isInstalled()
+    {
+    	return $this->getColumnValue('installed');
+    }
+    
+    /**
+    * Set the value of installed property
+    *
+    * @access public   
+    * @return boolean
+    */
+    function setInstalled($value)
+    {
+    	return $this->setColumnValue('installed', $value);
+    }
+    
+    /**
+    * Return manager instance
+    *
+    * @access protected
+    * @param void
+    * @return Plugins 
+    */
+    function manager() {
+      if (!($this->manager instanceof Plugins)) {
+        $this->manager = Plugins::instance();
+      }
+      return $this->manager;
+    } // manager
+  
+  } // BasePlugin 
+
+?>
Index: application/models/plugins/base/BasePlugins.class.php
===================================================================
--- application/models/plugins/base/BasePlugins.class.php	(revision 0)
+++ application/models/plugins/base/BasePlugins.class.php	(revision 0)
@@ -0,0 +1,234 @@
+<?php 
+
+  
+  /**
+  * Plugins class
+  *
+  * @http://www.projectpier.org/
+  */
+  abstract class BasePlugins extends DataManager {
+  
+    /**
+    * Column name => Column type map
+    *
+    * @var array
+    * @static
+    */
+    static private $columns = array('plugin_id' => DATA_TYPE_INTEGER, 'name' => DATA_TYPE_STRING, 'installed' => DATA_TYPE_BOOLEAN);
+  
+    /**
+    * Construct
+    *
+    * @return BasePlugins 
+    */
+    function __construct() {
+      parent::__construct('Plugin', 'plugins', true);
+    } // __construct
+    
+    // -------------------------------------------------------
+    //  Description methods
+    // -------------------------------------------------------
+    
+    /**
+    * Return array of object columns
+    *
+    * @access public
+    * @param void
+    * @return array
+    */
+    function getColumns() {
+      return array_keys(self::$columns);
+    } // getColumns
+    
+    /**
+    * Return column type
+    *
+    * @access public
+    * @param string $column_name
+    * @return string
+    */
+    function getColumnType($column_name) {
+      if (isset(self::$columns[$column_name])) {
+        return self::$columns[$column_name];
+      } else {
+        return DATA_TYPE_STRING;
+      } // if
+    } // getColumnType
+    
+    /**
+    * Return array of PK columns. If only one column is PK returns its name as string
+    *
+    * @access public
+    * @param void
+    * @return array or string
+    */
+    function getPkColumns() {
+      return 'plugin_id';
+    } // getPkColumns
+    
+    /**
+    * Return name of first auto_incremenent column if it exists
+    *
+    * @access public
+    * @param void
+    * @return string
+    */
+    function getAutoIncrementColumn() {
+      return 'plugin_id';
+    } // getAutoIncrementColumn
+    
+    // -------------------------------------------------------
+    //  Finders
+    // -------------------------------------------------------
+    
+    /**
+    * Do a SELECT query over database with specified arguments
+    *
+    * @access public
+    * @param array $arguments Array of query arguments. Fields:
+    * 
+    *  - one - select first row
+    *  - conditions - additional conditions
+    *  - order - order by string
+    *  - offset - limit offset, valid only if limit is present
+    *  - limit
+    * 
+    * @return one or Plugins objects
+    * @throws DBQueryError
+    */
+    function find($arguments = null) {
+      if (isset($this) && instance_of($this, 'Plugins')) {
+        return parent::find($arguments);
+      } else {
+        return Plugins::instance()->find($arguments);
+        //$instance =& Plugins::instance();
+        //return $instance->find($arguments);
+      } // if
+    } // find
+    
+    /**
+    * Find all records
+    *
+    * @access public
+    * @param array $arguments
+    * @return one or Plugins objects
+    */
+    function findAll($arguments = null) {
+      if (isset($this) && instance_of($this, 'Plugins')) {
+        return parent::findAll($arguments);
+      } else {
+        return Plugins::instance()->findAll($arguments);
+        //$instance =& Plugins::instance();
+        //return $instance->findAll($arguments);
+      } // if
+    } // findAll
+    
+    /**
+    * Find one specific record
+    *
+    * @access public
+    * @param array $arguments
+    * @return Plugin 
+    */
+    function findOne($arguments = null) {
+      if (isset($this) && instance_of($this, 'Plugins')) {
+        return parent::findOne($arguments);
+      } else {
+        return Plugins::instance()->findOne($arguments);
+        //$instance =& Plugins::instance();
+        //return $instance->findOne($arguments);
+      } // if
+    } // findOne
+    
+    /**
+    * Return object by its PK value
+    *
+    * @access public
+    * @param mixed $id
+    * @param boolean $force_reload If true cache will be skipped and data will be loaded from database
+    * @return Plugin 
+    */
+    function findById($id, $force_reload = false) {
+      if (isset($this) && instance_of($this, 'Plugins')) {
+        return parent::findById($id, $force_reload);
+      } else {
+        return Plugins::instance()->findById($id, $force_reload);
+        //$instance =& Plugins::instance();
+        //return $instance->findById($id, $force_reload);
+      } // if
+    } // findById
+    
+    /**
+    * Return number of rows in this table
+    *
+    * @access public
+    * @param string $conditions Query conditions
+    * @return integer
+    */
+    function count($condition = null) {
+      if (isset($this) && instance_of($this, 'Plugins')) {
+        return parent::count($condition);
+      } else {
+        return Plugins::instance()->count($condition);
+        //$instance =& Plugins::instance();
+        //return $instance->count($condition);
+      } // if
+    } // count
+    
+    /**
+    * Delete rows that match specific conditions. If $conditions is NULL all rows from table will be deleted
+    *
+    * @access public
+    * @param string $conditions Query conditions
+    * @return boolean
+    */
+    function delete($condition = null) {
+      if (isset($this) && instance_of($this, 'Plugins')) {
+        return parent::delete($condition);
+      } else {
+        return Plugins::instance()->delete($condition);
+        //$instance =& Plugins::instance();
+        //return $instance->delete($condition);
+      } // if
+    } // delete
+    
+    /**
+    * This function will return paginated result. Result is an array where first element is 
+    * array of returned object and second populated pagination object that can be used for 
+    * obtaining and rendering pagination data using various helpers.
+    * 
+    * Items and pagination array vars are indexed with 0 for items and 1 for pagination
+    * because you can't use associative indexing with list() construct
+    *
+    * @access public
+    * @param array $arguments Query argumens (@see find()) Limit and offset are ignored!
+    * @param integer $items_per_page Number of items per page
+    * @param integer $current_page Current page number
+    * @return array
+    */
+    function paginate($arguments = null, $items_per_page = 10, $current_page = 1) {
+      if (isset($this) && instance_of($this, 'Plugins')) {
+        return parent::paginate($arguments, $items_per_page, $current_page);
+      } else {
+        return Plugins::instance()->paginate($arguments, $items_per_page, $current_page);
+        //$instance =& Plugins::instance();
+        //return $instance->paginate($arguments, $items_per_page, $current_page);
+      } // if
+    } // paginate
+    
+    /**
+    * Return manager instance
+    *
+    * @return Plugins 
+    */
+    function instance() {
+      static $instance;
+      if (!instance_of($instance, 'Plugins')) {
+        $instance = new Plugins();
+      } // if
+      return $instance;
+    } // instance
+  
+  } // Plugins 
+
+?>
Index: application/models/plugins/Plugins.class.php
===================================================================
--- application/models/plugins/Plugins.class.php	(revision 0)
+++ application/models/plugins/Plugins.class.php	(revision 0)
@@ -0,0 +1,84 @@
+<?php
+
+  /**
+  * Plugins
+  *
+  * @http://www.projectpier.org/
+  */
+  class Plugins extends BasePlugins {
+  
+    /**
+    * Return array of all plugins based on plugin files on filesystem
+    *
+    * @param none
+    * @return array
+    */
+    static function getAllPlugins() {
+      
+      $results = array();
+      $dir = APPLICATION_PATH.'/plugins';
+      $dirs = get_dirs($dir,false);
+
+      foreach( (array)$dirs as $plugin) {
+	if (file_exists($dir.'/'.$plugin.'/init.php') && is_file($dir.'/'.$plugin.'/init.php')) {
+          $results[$plugin] = '-';
+        }
+      }
+      // now sort by name
+      ksort($results);
+      // now get activated plugins
+      $conditions = array('`installed` = 1');
+      $plugins = Plugins::findAll(array(
+        'conditions' => $conditions
+        ));
+      foreach((array)$plugins as $plugin) {
+        if( array_key_exists($plugin->getName(),$results) ) {
+          $results[$plugin->getName()] = $plugin->getPluginId();
+        } else {
+          // TODO : remove from DB here??
+        }
+      }
+      
+      return $results;
+    
+    } // getAllPlugins
+    
+    /**
+    * Return array of all activated plugins based on plugin files on filesystem
+    *
+    * @param none
+    * @return array
+    */
+    static function getActivatedPlugins() {
+      
+      $results = Plugins::getAllPlugins();
+      
+      foreach($results as $name => $id) {
+        if( '-' == $id )
+          unset($results[$name]);
+      }
+      
+      return $results;
+    
+    } // getActivatedPlugins
+    
+    /**
+    * Return array of all activated plugins
+    *
+    * @param none
+    * @return array
+    */
+    static function getNamesFromDB() {
+      $names = array();
+      $plugins = Plugins::findAll(array()); // findAll
+      if (is_array($plugins)) {
+        foreach ($plugins as $plugin) {
+          $names[] = $plugin->getName();
+        } // foreach
+      } // if
+      return $names;
+    } // getActivatedPlugins
+    
+  } // Plugins 
+
+?>
Index: application/models/project_folders/ProjectFolder.class.php
===================================================================
--- application/models/project_folders/ProjectFolder.class.php	(revision 162)
+++ application/models/project_folders/ProjectFolder.class.php	(working copy)
@@ -127,7 +127,7 @@
       if (!$user->isProjectUser($this->getProject())) {
         return false;
       }
-      return $user->getProjectPermission($this->getProject(), ProjectUsers::CAN_MANAGE_FILES);
+      return $user->getProjectPermission($this->getProject(), PermissionManager::CAN_MANAGE_FILES);
     } // canManage
     
     /**
@@ -151,7 +151,7 @@
       if (!$user->isProjectUser($project)) {
         return false;
       }
-      return $user->getProjectPermission($project, ProjectUsers::CAN_MANAGE_FILES);
+      return $user->getProjectPermission($project, PermissionManager::CAN_MANAGE_FILES);
     } // canAdd
     
     /**
Index: application/models/project_users/ProjectUser.class.php
===================================================================
--- application/models/project_users/ProjectUser.class.php	(revision 162)
+++ application/models/project_users/ProjectUser.class.php	(working copy)
@@ -7,7 +7,17 @@
   * @http://www.projectpier.org/
   */
   class ProjectUser extends BaseProjectUser {
+
+  private $permissions = array();
   
+  function getPermissions() {
+    if (count($this->permissions) == 0) {
+      $this->permissions = ProjectUserPermissions::getPermissionsForProjectUser($this);
+    }
+    return $this->permissions;
+    
+  } // getPermissions
+
   } // ProjectUser 
 
 ?>
Index: application/models/project_users/ProjectUsers.class.php
===================================================================
--- application/models/project_users/ProjectUsers.class.php	(revision 162)
+++ application/models/project_users/ProjectUsers.class.php	(working copy)
@@ -8,15 +8,6 @@
   */
   class ProjectUsers extends BaseProjectUsers {
     
-    /** All available user permissions **/
-    const CAN_MANAGE_MESSAGES   = 'can_manage_messages';
-    const CAN_MANAGE_TASKS      = 'can_manage_tasks';
-    const CAN_MANAGE_MILESTONES = 'can_manage_milestones';
-    const CAN_UPLOAD_FILES      = 'can_upload_files';
-    const CAN_MANAGE_FILES      = 'can_manage_files';
-    const CAN_ASSIGN_TO_OWNERS  = 'can_assign_to_owners';
-    const CAN_ASSIGN_TO_OTHER   = 'can_assign_to_other';
-  
     /**
     * Return all users that are involved in specific project
     *
@@ -109,45 +100,7 @@
     static function clearByUser(User $user) {
       return self::delete(array('`user_id` = ?', $user->getId()));
     } // clearByUser
-    
-    /**
-    * This function will return array of permission columns in table. Permission column name is 
-    * used as permission ID in rest of the script
-    *
-    * @access public
-    * @param void
-    * @return array
-    */
-    function getPermissionColumns() {
-      return array(
-        self::CAN_MANAGE_MESSAGES,
-        self::CAN_MANAGE_TASKS,
-        self::CAN_MANAGE_MILESTONES,
-        self::CAN_UPLOAD_FILES,
-        self::CAN_MANAGE_FILES,
-        self::CAN_ASSIGN_TO_OWNERS,
-        self::CAN_ASSIGN_TO_OTHER,
-      ); // array
-    } // getPermissionColumns
-    
-    /**
-    * Return permission name => permission text array
-    *
-    * @param void
-    * @return array
-    */
-    static function getNameTextArray() {
-      return array(
-        ProjectUsers::CAN_MANAGE_MESSAGES   => lang('can manage messages'),
-        ProjectUsers::CAN_MANAGE_TASKS      => lang('can manage tasks'),
-        ProjectUsers::CAN_MANAGE_MILESTONES => lang('can manage milestones'),
-        ProjectUsers::CAN_UPLOAD_FILES      => lang('can upload files'),
-        ProjectUsers::CAN_MANAGE_FILES      => lang('can manage files'),
-        ProjectUsers::CAN_ASSIGN_TO_OWNERS  => lang('can assign to owners'),
-        ProjectUsers::CAN_ASSIGN_TO_OTHER   => lang('can assign to other'),
-      ); // array
-    } // getNameTextArray
-    
+
   } // ProjectUsers 
 
 ?>
Index: application/models/project_users/base/BaseProjectUsers.class.php
===================================================================
--- application/models/project_users/base/BaseProjectUsers.class.php	(revision 162)
+++ application/models/project_users/base/BaseProjectUsers.class.php	(working copy)
@@ -14,7 +14,7 @@
     * @var array
     * @static
     */
-    static private $columns = array('project_id' => DATA_TYPE_INTEGER, 'user_id' => DATA_TYPE_INTEGER, 'created_on' => DATA_TYPE_DATETIME, 'created_by_id' => DATA_TYPE_INTEGER, 'can_manage_messages' => DATA_TYPE_BOOLEAN, 'can_manage_tasks' => DATA_TYPE_BOOLEAN, 'can_manage_milestones' => DATA_TYPE_BOOLEAN, 'can_upload_files' => DATA_TYPE_BOOLEAN, 'can_manage_files' => DATA_TYPE_BOOLEAN, 'can_assign_to_owners' => DATA_TYPE_BOOLEAN, 'can_assign_to_other' => DATA_TYPE_BOOLEAN);
+    static private $columns = array('project_id' => DATA_TYPE_INTEGER, 'user_id' => DATA_TYPE_INTEGER, 'created_on' => DATA_TYPE_DATETIME, 'created_by_id' => DATA_TYPE_INTEGER);
   
     /**
     * Construct
Index: application/models/project_files/ProjectFile.class.php
===================================================================
--- application/models/project_files/ProjectFile.class.php	(revision 162)
+++ application/models/project_files/ProjectFile.class.php	(working copy)
@@ -396,7 +396,7 @@
       if (!$user->isProjectUser($this->getProject())) {
         return false;
       } // if
-      return $user->getProjectPermission($this->getProject(), ProjectUsers::CAN_MANAGE_FILES);
+      return $user->getProjectPermission($this->getProject(), PermissionManager::CAN_MANAGE_FILES);
     } // canManage
     
     /**
@@ -410,7 +410,7 @@
       if (!$user->isProjectUser($project)) {
         return false;
       } // if
-      return $user->getProjectPermission($project, ProjectUsers::CAN_UPLOAD_FILES);
+      return $user->getProjectPermission($project, PermissionManager::CAN_UPLOAD_FILES);
     } // canUpload
     
     /**
Index: application/models/project_messages/ProjectMessage.class.php
===================================================================
--- application/models/project_messages/ProjectMessage.class.php	(revision 162)
+++ application/models/project_messages/ProjectMessage.class.php	(working copy)
@@ -206,7 +206,7 @@
       if (!$user->isProjectUser($this->getProject())) {
         return false;
       } // if
-      return $user->getProjectPermission($this->getProject(), ProjectUsers::CAN_MANAGE_MESSAGES);
+      return $user->getProjectPermission($this->getProject(), PermissionManager::CAN_MANAGE_MESSAGES);
     } // canManage
     
     /**
@@ -240,7 +240,7 @@
       if ($user->isAdministrator()) {
         return true; // administrator
       } // if
-      return $user->getProjectPermission($project, ProjectUsers::CAN_MANAGE_MESSAGES);
+      return $user->getProjectPermission($project, PermissionManager::CAN_MANAGE_MESSAGES);
     } // canAdd
     
     /**
Index: application/models/project_file_revisions/ProjectFileRevision.class.php
===================================================================
--- application/models/project_file_revisions/ProjectFileRevision.class.php	(revision 162)
+++ application/models/project_file_revisions/ProjectFileRevision.class.php	(working copy)
@@ -284,7 +284,7 @@
       if (!$user->isProjectUser($this->getProject())) {
         return false;
       }
-      return $user->getProjectPermission($this->getProject(), ProjectUsers::CAN_MANAGE_FILES);
+      return $user->getProjectPermission($this->getProject(), PermissionManager::CAN_MANAGE_FILES);
     } // canManage
     
     /**
Index: application/models/project_task_lists/ProjectTaskList.class.php
===================================================================
--- application/models/project_task_lists/ProjectTaskList.class.php	(revision 162)
+++ application/models/project_task_lists/ProjectTaskList.class.php	(working copy)
@@ -382,7 +382,7 @@
     * @return boolean
     */
     function canManage(User $user) {
-      return $user->getProjectPermission($this->getProject(), ProjectUsers::CAN_MANAGE_TASKS);
+      return $user->getProjectPermission($this->getProject(), PermissionManager::CAN_MANAGE_TASKS);
     } // canManage
     
     /**
@@ -412,7 +412,7 @@
       if ($user->isAccountOwner()) {
         return true;
       } // if
-      return $user->getProjectPermission($project, ProjectUsers::CAN_MANAGE_TASKS);
+      return $user->getProjectPermission($project, PermissionManager::CAN_MANAGE_TASKS);
     } // canAdd
     
     /**
Index: application/models/permissions/Permission.class.php
===================================================================
--- application/models/permissions/Permission.class.php	(revision 0)
+++ application/models/permissions/Permission.class.php	(revision 0)
@@ -0,0 +1,13 @@
+<?php
+
+  /**
+  * Permission class
+  *
+  * @author Brett Edgar (TheWalrus) True Digital Security, Inc. www.truedigitalsecurity.com
+  * @http://www.projectpier.org/
+  */
+  class Permission extends BasePermission {
+    
+  } // Permission 
+
+?>
Index: application/models/permissions/Permissions.class.php
===================================================================
--- application/models/permissions/Permissions.class.php	(revision 0)
+++ application/models/permissions/Permissions.class.php	(revision 0)
@@ -0,0 +1,70 @@
+<?php
+
+  /**
+  * Permissions
+  *
+  * @author Brett Edgar (TheWalrus) True Digital Security, Inc. www.truedigitalsecurity.com
+  * @http://www.projectpier.org/
+  */
+  class Permissions extends BasePermissions {
+  
+    /**
+    * Get an array of all Permission objects
+    * @param none
+    * @return array of Permission objects
+    */
+    static function getAllPermissions() {
+      $map = array();
+      $permissions = Permissions::findAll(); // findAll
+      if (is_array($permissions)) {
+        foreach ($permissions as $permission) {
+          $map[$permission->getId()] = array($permission->getSource(),$permission->getName());
+        } // foreach
+      } // if
+      return $map;
+    } // getAllPermissions
+
+    static function getPermission($permission_id) {
+      //$permission = Permissions::findOne(array('conditions' => '`id` = '.$permission_id));
+      $permission = Permissions::findById($permission_id);
+      return $permission;
+    } // getPermission
+
+    /*
+     * Gets the permission (source,permission) combination as a string.
+     * @return string in format "source-permission_name_with_underscores"
+     */
+    static function getPermissionString($permission_id) {
+      $permission = Permissions::findById($permission_id);
+      return $permission->getSource()."-".preg_replace('/ /','_',$permission->getName());
+    } // getPermissionString
+    
+    static function getPermissionsBySource() {
+      $sources = array();
+      $permissions = Permissions::findAll(); //findAll
+      if (is_array($permissions)) {
+	foreach ($permissions as $permission) {
+	  if (!isset($sources[$permission->getSource()])) {
+	    $sources[$permission->getSource()] = array();
+	  } // if
+	  $sources[$permission->getSource()][] = array($permission->getName(),$permission->getId());
+	} // foreach
+      } // if
+      return $sources;
+    } // getSources
+
+    static function getPermissionId($permission_string) {
+      $index = strrpos($permission_string,'-');
+      $source = substr($permission_string,0,$index);
+      $name = substr($permission_string,$index+1);
+      $name = preg_replace('/_/',' ',$name);
+      $permission = Permissions::findOne(array('conditions' => "`source` = '".$source."' and `permission` = '".$name."'"));
+      if (isset($permission)) {
+	return $permission->getId();
+      } // if
+      return false;
+    } // getPermissionId
+    
+  } // Permissions 
+
+?>
Index: application/models/permissions/base/BasePermissions.class.php
===================================================================
--- application/models/permissions/base/BasePermissions.class.php	(revision 0)
+++ application/models/permissions/base/BasePermissions.class.php	(revision 0)
@@ -0,0 +1,219 @@
+<?php 
+  /**
+  * BasePermissions class
+  *
+  * @author Brett Edgar (TheWalrus) True Digital Security, Inc. www.truedigitalsecurity.com
+  * @http://www.projectpier.org/
+  */
+  abstract class BasePermissions extends DataManager {
+  
+    /**
+    * Column name => Column type map
+    *
+    * @var array
+    * @static
+    */
+  static private $columns = array('id' => DATA_TYPE_INTEGER, 'source' => DATA_TYPE_STRING, 'permission' => DATA_TYPE_STRING);
+  
+    /**
+    * Construct
+    *
+    * @return BasePermissions 
+    */
+    function __construct() {
+      parent::__construct('Permission', 'permissions', true);
+    } // __construct
+    
+    // -------------------------------------------------------
+    //  Description methods
+    // -------------------------------------------------------
+    
+    /**
+    * Return array of object columns
+    *
+    * @access public
+    * @param void
+    * @return array
+    */
+    function getColumns() {
+      return array_keys(self::$columns);
+    } // getColumns
+    
+    /**
+    * Return column type
+    *
+    * @access public
+    * @param string $column_name
+    * @return string
+    */
+    function getColumnType($column_name) {
+      if (isset(self::$columns[$column_name])) {
+        return self::$columns[$column_name];
+      } else {
+        return DATA_TYPE_STRING;
+      } // if
+    } // getColumnType
+    
+    /**
+    * Return array of PK columns. If only one column is PK returns its name as string
+    *
+    * @access public
+    * @param void
+    * @return array or string
+    */
+    function getPkColumns() {
+      return 'id';
+    } // getPkColumns
+    
+    /**
+    * Return name of first auto_incremenent column if it exists
+    *
+    * @access public
+    * @param void
+    * @return string
+    */
+    function getAutoIncrementColumn() {
+      return 'id';
+    } // getAutoIncrementColumn
+    
+    // -------------------------------------------------------
+    //  Finders
+    // -------------------------------------------------------
+    
+    /**
+    * Do a SELECT query over database with specified arguments
+    *
+    * @access public
+    * @param array $arguments Array of query arguments. Fields:
+    * 
+    *  - one - select first row
+    *  - conditions - additional conditions
+    *  - order - order by string
+    *  - offset - limit offset, valid only if limit is present
+    *  - limit
+    * 
+    * @return one or Permissions objects
+    * @throws DBQueryError
+    */
+    function find($arguments = null) {
+      if (isset($this) && instance_of($this, 'Permissions')) {
+        return parent::find($arguments);
+      } else {
+        return Permissions::instance()->find($arguments);
+      } // if
+    } // find
+    
+    /**
+    * Find all records
+    *
+    * @access public
+    * @param array $arguments
+    * @return one or Permissions objects
+    */
+    function findAll($arguments = null) {
+      if (isset($this) && instance_of($this, 'Permissions')) {
+        return parent::findAll($arguments);
+      } else {
+        return Permissions::instance()->findAll($arguments);
+      } // if
+    } // findAll
+    
+    /**
+    * Find one specific record
+    *
+    * @access public
+    * @param array $arguments
+    * @return Permission
+    */
+    function findOne($arguments = null) {
+      if (isset($this) && instance_of($this, 'Permissions')) {
+        return parent::findOne($arguments);
+      } else {
+        return Permissions::instance()->findOne($arguments);
+      } // if
+    } // findOne
+    
+    /**
+    * Return object by its PK value
+    *
+    * @access public
+    * @param mixed $id
+    * @param boolean $force_reload If true cache will be skipped and data will be loaded from database
+    * @return Permission
+    */
+    function findById($id, $force_reload = false) {
+      if (isset($this) && instance_of($this, 'Permissions')) {
+        return parent::findById($id, $force_reload);
+      } else {
+        return Permissions::instance()->findById($id, $force_reload);
+      } // if
+    } // findById
+    
+    /**
+    * Return number of rows in this table
+    *
+    * @access public
+    * @param string $conditions Query conditions
+    * @return integer
+    */
+    function count($condition = null) {
+      if (isset($this) && instance_of($this, 'Permissions')) {
+        return parent::count($condition);
+      } else {
+        return Permissions::instance()->count($condition);
+      } // if
+    } // count
+    
+    /**
+    * Delete rows that match specific conditions. If $conditions is NULL all rows from table will be deleted
+    *
+    * @access public
+    * @param string $conditions Query conditions
+    * @return boolean
+    */
+    function delete($condition = null) {
+      if (isset($this) && instance_of($this, 'Permissions')) {
+        return parent::delete($condition);
+      } else {
+        return Permissions::instance()->delete($condition);
+      } // if
+    } // delete
+    
+    /**
+    * This function will return paginated result. Result is an array where first element is 
+    * array of returned object and second populated pagination object that can be used for 
+    * obtaining and rendering pagination data using various helpers.
+    * 
+    * Items and pagination array vars are indexed with 0 for items and 1 for pagination
+    * because you can't use associative indexing with list() construct
+    *
+    * @access public
+    * @param array $arguments Query argumens (@see find()) Limit and offset are ignored!
+    * @param integer $items_per_page Number of items per page
+    * @param integer $current_page Current page number
+    * @return array
+    */
+    function paginate($arguments = null, $items_per_page = 10, $current_page = 1) {
+      if (isset($this) && instance_of($this, 'Permissions')) {
+        return parent::paginate($arguments, $items_per_page, $current_page);
+      } else {
+        return Permissions::instance()->paginate($arguments, $items_per_page, $current_page);
+      } // if
+    } // paginate
+    
+    /**
+    * Return manager instance
+    *
+    * @return Permissions
+    */
+    function instance() {
+      static $instance;
+      if (!instance_of($instance, 'Permissions')) {
+        $instance = new Permissions();
+      } // if
+      return $instance;
+    } // instance
+  
+  } // Permissions
+
+?>
Index: application/models/permissions/base/BasePermission.class.php
===================================================================
--- application/models/permissions/base/BasePermission.class.php	(revision 0)
+++ application/models/permissions/base/BasePermission.class.php	(revision 0)
@@ -0,0 +1,97 @@
+<?php
+
+  /**
+  * BasePermission class
+  *
+  * @author Brett Edgar (TheWalrus) True Digital Security, Inc. www.truedigitalsecurity.com
+  * @http://www.projectpier.org/
+  */
+  abstract class BasePermission extends DataObject {
+  
+    // -------------------------------------------------------
+    //  Access methods
+    // -------------------------------------------------------
+  
+    /**
+    * Return value of 'id' field
+    *
+    * @access public
+    * @param void
+    * @return integer 
+    */
+    function getId() {
+      return $this->getColumnValue('id');
+    } // getId()
+    
+    /**
+    * Set value of 'id' field
+    *
+    * @access public   
+    * @param integer $value
+    * @return boolean
+    */
+    function setId($value) {
+      return $this->setColumnValue('id', $value);
+    } // setId() 
+
+    /**
+    * Return value of 'source' field
+    *
+    * @access public
+    * @param void
+    * @return integer 
+    */
+    function getSource() {
+      return $this->getColumnValue('source');
+    } // getSource()
+    
+    /**
+    * Set value of 'source' field
+    *
+    * @access public   
+    * @param integer $value
+    * @return boolean
+    */
+    function setSource($value) {
+      return $this->setColumnValue('source', $value);
+    } // setSource() 
+   
+    /**
+    * Return value of 'permission' field
+    *
+    * @access public
+    * @param void
+    * @return integer 
+    */
+    function getName() {
+      return $this->getColumnValue('permission');
+    } // getName()
+    
+    /**
+    * Set value of 'permission' field
+    *
+    * @access public   
+    * @param integer $value
+    * @return boolean
+    */
+    function setName($value) {
+      return $this->setColumnValue('permission', $value);
+    } // setName() 
+    
+    /**
+    * Return manager instance
+    *
+    * @access protected
+    * @param void
+    * @return Permissions 
+    */
+    function manager() {
+      if (!($this->manager instanceof Permissions)) {
+        $this->manager = Permissions::instance();
+      }
+      return $this->manager;
+    } // manager
+  
+  } // BasePermission
+
+?>
Index: application/controllers/AdministrationController.class.php
===================================================================
--- application/controllers/AdministrationController.class.php	(revision 162)
+++ application/controllers/AdministrationController.class.php	(working copy)
@@ -245,6 +245,83 @@
         } // try
       } // if
     } // tool_mass_mailer
+    
+    function plugins() {
+      
+      $plugins = Plugins::getAllPlugins();
+      tpl_assign('plugins',$plugins);
+      
+    } // index
+    
+    function update_plugins() {
+      
+      $plugins = array_var($_POST,'plugins');
+      $reference = Plugins::getAllPlugins();
+      $errors = array();
+      foreach($plugins as $name => $yes_no) {
+      	//If it is not a plugin continue
+      	$plugin_file_path = APPLICATION_PATH.'/plugins/'.$name.'/init.php';
+        if (!file_exists($plugin_file_path)) continue;
+        // get existing id
+        $id = $reference[$name];
+        $nicename = ucwords(str_replace('_',' ',$name));
+        if($yes_no && '-' == $id) {
+          try {
+          	//Check if plugin exists in database
+          	$plugin = Plugins::findOne(array('conditions' => array('`name` = ?', $name)));
+          	if ($plugin == NULL) $plugin = new Plugin();
+            $plugin->setName($name);
+            $plugin->setInstalled(true);
+            
+            DB::beginWork();
+            // get the file loaded here
+            include_once($plugin_file_path);
+            
+            // get activation routine ready
+            $activate = $name.'_activate';
+            if( function_exists($activate) ) {
+				$activate();
+            }
+            
+            // save to db now
+            $plugin->save();
+            DB::commit();
+          } catch(Exception $e) {
+            DB::rollback();
+            $errors[] = $nicename.' ('.$e->getMessage().')';
+          }
+        }
+        elseif(!$yes_no && '-' != $id) {
+          try
+          {
+            $plugin = Plugins::findById($id);
+            DB::beginWork();
+            $deactivate = $name.'_deactivate';
+            if( function_exists($deactivate) )
+            {
+              //Check if user choose to purge data
+              if ($plugins[$name."_data"]=="0")
+            	$deactivate(true);
+              else 
+              	$deactivate();
+            }
+            $plugin->setInstalled(false);
+            $plugin->save();
+            DB::commit();
+          } catch(Exception $e) {
+            DB::rollback();
+            $errors[] = $nicename.' ('.$e->getMessage().')';
+          }
+        }
+      }
+      
+      if( count($errors) )
+        flash_error(lang('plugin activation failed', implode(", ",$errors)));
+      else
+        flash_error(lang('plugins updated'));
+      $this->redirectTo('administration','plugins');
+      
+    } // update
   
   } // AdministrationController 
 
Index: application/controllers/AccountController.class.php
===================================================================
--- application/controllers/AccountController.class.php	(revision 162)
+++ application/controllers/AccountController.class.php	(working copy)
@@ -226,7 +226,7 @@
         $this->redirectToReferer($company->getViewUrl());
       } // if
       
-      $permissions = ProjectUsers::getNameTextArray();
+      $permissions = PermissionManager::getPermissionsText();
       
       $redirect_to = array_var($_GET, 'redirect_to');
       if ((trim($redirect_to)) == '' || !is_valid_url($redirect_to)) {
@@ -255,10 +255,9 @@
             } // if
             
             foreach ($permissions as $permission => $permission_text) {
-              $permission_value = array_var($_POST, 'project_permission_' . $project->getId() . '_' . $permission) == 'checked';
-              
-              $setter = 'set' . Inflector::camelize($permission);
-              $relation->$setter($permission_value);
+	      $permission_value = array_var($_POST, 'project_permission_' . $project->getId() . '_' . $permission) == 'checked';
+
+	      $user->setProjectPermission($project,$permission,$permission_value);
             } // foreach
             
             $relation->save();
@@ -274,6 +273,7 @@
         $this->redirectToUrl($redirect_to);
       } // if
     } // update_permissions
+
     
     /**
     * Edit logged user avatar
Index: application/controllers/PluginController.class.php
===================================================================
--- application/controllers/PluginController.class.php	(revision 0)
+++ application/controllers/PluginController.class.php	(revision 0)
@@ -0,0 +1,64 @@
+<?php
+
+  /**
+   * Base plugin controller
+   * (Need this for new "addPluginHelper" and "addPluginLibrary" functions
+   * so that plugin helpers & libraries can be kept inside the appropriate
+   * directory structure in the APPLICATION_ROOT/plugins/<plugin_name>
+   * folder).
+   *
+   * @author Brett Edgar (True Digital Security, Inc.)
+   * @version 1.0
+   * @http://www.projectpier.org/
+   */
+abstract class PluginController extends ApplicationController {
+  var $plugin_name;
+  var $libraries;
+  /**
+   * Add application level constroller
+   *
+   * @param void
+   * @return null
+   */
+  function __construct($name ) {
+    parent::__construct();
+    $this->plugin_name = $name;
+    $this->libraries = array();
+  } // __construct
+
+  /**
+   * Add one or many helpers
+   *
+   * @param string $helper This param can be array of helpers
+   * @return null
+   */
+  function addPluginHelper($helper) {
+    $args = func_get_args();
+    if (!is_array($args)) {
+      return false;
+    } // if
+      
+    foreach ($args as $helper) {
+      if (!in_array($helper, $this->helpers)) {
+	if (PluginManager::useHelper($this->plugin_name,$helper)) {
+	  $this->helpers[] = $helper;
+	}// if
+      } // if
+    } // foreach
+      
+    return true;
+  } // addHelper
+
+  function addPluginLibrary($library) {
+    if (isset($this->libraries[$library]) && $this->libraries[$library]) {
+      return true;
+    } // if
+
+    if (PluginManager::useLibrary($this->plugin_name,$library)) {
+      $this->libraries[] = $library;
+    } // if
+  }
+  
+} // PluginController
+
+?>
Index: application/controllers/ProjectController.class.php
===================================================================
--- application/controllers/ProjectController.class.php	(revision 162)
+++ application/controllers/ProjectController.class.php	(working copy)
@@ -142,7 +142,7 @@
       tpl_assign('project_companies', active_project()->getCompanies());
       tpl_assign('user_projects', logged_user()->getProjects());
       
-      $permissions = ProjectUsers::getNameTextArray();
+      $permissions = PermissionManager::getPermissionsText();
       tpl_assign('permissions', $permissions);
       
       $companies = array(owner_company());
@@ -194,10 +194,9 @@
                       
                       // Owner company members have all permissions
                       $permission_value = $company->isOwner() ? true : array_var($_POST, 'project_user_' . $user_id . '_' . $permission) == 'checked';
-                      
-                      $setter = 'set' . Inflector::camelize($permission);
-                      $project_user->$setter($permission_value);
-                      
+
+		      $user = Users::findById($project_user->getUserId());
+		      $user->setProjectPermission(active_project(),$permission,$permission_value);
                     } // if
                     
                     $project_user->save();
@@ -257,7 +256,7 @@
           DB::beginWork();
           $project->save();
           
-          $permissions = ProjectUsers::getPermissionColumns();
+	  $permissions = array_keys(PermissionManager::getPermissionsText());
           $auto_assign_users = owner_company()->getAutoAssignUsers();
           
           // We are getting the list of auto assign users. If current user is not in the list
@@ -282,7 +281,8 @@
             $project_user->setUserId($user->getId());
             if (is_array($permissions)) {
               foreach ($permissions as $permission) {
-                $project_user->setColumnValue($permission, true);
+		$user = Users::findById($project_user->getUserId());
+		$user->setProjectPermission(active_project(),$permission,true);
               }
             } // if
             $project_user->save();
Index: application/controllers/UserController.class.php
===================================================================
--- application/controllers/UserController.class.php	(revision 162)
+++ application/controllers/UserController.class.php	(working copy)
@@ -64,7 +64,7 @@
       } // if
       
       $projects = $company->getProjects();
-      $permissions = ProjectUsers::getNameTextArray();
+      $permissions = PermissionManager::getPermissionsText();
       
       tpl_assign('user', $user);
       tpl_assign('company', $company);
@@ -107,8 +107,7 @@
                 foreach ($permissions as $permission => $permission_text) {
                   $permission_value = array_var($user_data, 'project_permission_' . $project->getId() . '_' . $permission) == 'checked';
                   
-                  $setter = 'set' . Inflector::camelize($permission);
-                  $relation->$setter($permission_value);
+		  $this->setProjectPermission($project,$permission,$permission_value);
                 } // foreach
                 
                 $relation->save();
Index: application/plugins.php
===================================================================
--- application/plugins.php	(revision 0)
+++ application/plugins.php	(revision 0)
@@ -0,0 +1,50 @@
+<?php
+
+  /**
+  * PluginManager loader
+  *
+  * This file contains logic that has been borrowed from my favourite
+  *  publishing platform; WordPress
+  * The implementation is only a part reproduction and has been modified
+  *  to suit the ProjectPier application.
+  * @author Mark Brennand
+  * @link http://www.activeingredient.com.au
+  *
+  * The plugin architecture supports both actions and filters. The difference
+  * between these is a matter of input; all actions on the same hook receive
+  * the same input regardless of order, filters received modified input from
+  * previous filters on the same hook.
+  * 
+  * @see application/models/PluginManager.class.php
+  *  
+  * @version 1.0
+  * @http://www.projectpier.org/
+  */
+
+  // find the plugin manager
+  include_once 'models/PluginManager.class.php';
+  // init the plugin manager
+  PluginManager::instance()->init();
+  /*
+  * Convenience function for instance of PluginManager used by hooks throughout
+  */
+  function plugin_manager() {
+    return PluginManager::instance();
+  }
+  /*
+  * Convenience functions for plugin writers
+  */
+  function add_action($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
+    return plugin_manager()->add_filter($tag,$function_to_add,$priority,$accepted_args);
+  }
+  function add_filter($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
+    return plugin_manager()->add_filter($tag,$function_to_add,$priority,$accepted_args);
+  }
+  function remove_action($tag, $function_to_remove, $priority = 10) {
+    return plugin_manager()->remove_filter($tag,$function_to_remove,$priority);
+  }
+  function remove_filter($tag, $function_to_remove, $priority = 10) {
+    return plugin_manager()->remove_filter($tag,$function_to_remove,$priority);
+  }
+  
+?>
Index: application/views/administration/plugins.php
===================================================================
--- application/views/administration/plugins.php	(revision 0)
+++ application/views/administration/plugins.php	(revision 0)
@@ -0,0 +1,67 @@
+<?php
+
+  set_page_title(lang('plugins'));
+  administration_tabbed_navigation(ADMINISTRATION_TAB_PLUGINS);
+  administration_crumbs(lang('plugins'));
+  add_stylesheet_to_page('project/messages.css');
+?>
+<?php if (isset($plugins) && is_array($plugins) && count($plugins)) { ?>
+<script type="text/javascript">
+function toggleVisibility() {
+  for (var i=0; i<arguments.length; i++) {
+    if (arguments[i].style.display=="none"){
+      arguments[i].style.display="block";
+    } else {
+      arguments[i].style.display="none";
+    }
+  }
+}
+</script>
+<div id="plugins">
+  <form action="<?php echo get_url('administration', 'update_plugins') ?>" method="post">
+  <fieldset>
+    <legend><?php echo lang('list of plugins') ?></legend>
+  
+  <?php tpl_display(get_template_path('form_errors')) ?>
+  
+<?php foreach($plugins as $name=>$id) {  ?>
+    <div class="objectOption">
+      <div class="optionLabel"><label><?php echo ucwords(str_replace('_',' ',$name)) ?>:</label></div>
+      <div class="optionControl">
+	  <?php if ('-'==$id) { ?>
+	  	<input id="<?php echo $name; ?>Yes" class="yes_no" value="1" type="radio" name="plugins[<?php echo $name; ?>]" /> <label class="yes_no" for="<?php echo $name; ?>Yes"><?php echo lang('activated'); ?> </label> 
+	  	<input id="<?php echo $name; ?>No" class="yes_no" value="0" type="radio" checked="checked" name="plugins[<?php echo $name; ?>]" /> <label class="yes_no" for="<?php echo $name; ?>No"><?php echo lang('deactivated'); ?></label>
+	  <?php } else { ?>
+	    <input id="<?php echo $name; ?>Yes" onclick="javascript:toggleVisibility(document.getElementById('keep_data_<?php echo $name; ?>'),document.getElementById('<?php echo $name; ?>_plugin_description'))" checked="checked" class="yes_no" value="1" type="radio" name="plugins[<?php echo $name; ?>]" /> <label class="yes_no" for="<?php echo $name; ?>Yes"><?php echo lang('activated'); ?> </label> 
+	    <input id="<?php echo $name; ?>No" onclick="javascript:toggleVisibility(document.getElementById('keep_data_<?php echo $name; ?>'),document.getElementById('<?php echo $name; ?>_plugin_description'))" class="yes_no" value="0" type="radio" name="plugins[<?php echo $name; ?>]" /> <label class="yes_no" for="<?php echo $name; ?>No"><?php echo lang('deactivated'); ?> </label>
+	    <?php $configure_func = $name."_configure_url";
+		  if (function_exists($configure_func) && is_callable($configure_func)) { ?>
+	  &nbsp; &nbsp;<a href="<?php echo $configure_func() ?>">Configure</a>
+	  <?php } // if
+	      } // if ?>
+      </div>
+      <div id="keep_data_<?php echo $name; ?>" style="display:none" class="optionControl">
+      	<?php echo lang('what to do with data') ?><br /> 
+      	<?php echo yes_no_widget('plugins['.$name.'_data]', $name.'_data', true, lang('keep data'), lang('delete data')) ?> 
+      </div>
+      <?php $description = Localization::instance()->lang($name.' plugin description','NULL');
+      if ($description != 'NULL') { ?>
+      <div id="<?php echo $name; ?>_plugin_description">
+	<?php echo $description; ?>
+      </div>
+      <?php } // if ?>
+      
+      
+    </div>
+    
+<?php } ?>
+    <p><?php echo submit_button(lang('update plugins')) ?></p>
+  </fieldset>
+  </form>
+</div>
+
+<?php } else { ?>
+
+<p><?php echo lang('no plugins found') ?></p>
+
+<?php } // if ?>
Index: application/views/administration/index.php
===================================================================
--- application/views/administration/index.php	(revision 162)
+++ application/views/administration/index.php	(working copy)
@@ -17,6 +17,7 @@
       <li><a href="<?php echo get_url('administration', 'projects') ?>"><?php echo lang('projects') ?></a> (<a href="<?php echo get_url('project', 'add') ?>"><?php echo lang('add project') ?></a>)</li>
       <li><a href="<?php echo get_url('administration', 'configuration') ?>"><?php echo lang('configuration') ?></a></li>
       <li><a href="<?php echo get_url('administration', 'upgrade') ?>"><?php echo lang('upgrade') ?></a></li>
+      <li><a href="<?php echo get_url('administration', 'plugins') ?>"><?php echo lang('plugins') ?></a></li>
     </ul>
   </div>
 </div>
Index: application/views/account/update_permissions.php
===================================================================
--- application/views/account/update_permissions.php	(revision 162)
+++ application/views/account/update_permissions.php	(working copy)
@@ -72,7 +72,7 @@
               </div>
 <?php foreach ($permissions as $permission_name => $permission_text) { ?>
               <div class="projectPermission">
-                <?php echo checkbox_field('project_permission_' . $project->getId() . '_' . $permission_name, $user->hasProjectPermission($project, $permission_name), array('id' => 'projectPermission' . $project->getId() . $permission_name, 'onclick' => 'App.modules.updateUserPermissions.projectPermissionCheckboxClick(' . $project->getId() . ')')) ?> <label for="projectPermission<?php echo $project->getId() . $permission_name ?>" class="checkbox normal"><?php echo clean($permission_text) ?></label>
+                <?php echo checkbox_field('project_permission_' . $project->getId() . '_' . $permission_name, $user->hasProjectPermission($project, $permission_name), array('id' => 'projectPermission' . $project->getId() ."-". $permission_name, 'onclick' => 'App.modules.updateUserPermissions.projectPermissionCheckboxClick(' . $project->getId() . ')')) ?> <label for="projectPermission<?php echo $project->getId() . $permission_name ?>" class="checkbox normal"><?php echo clean($permission_text) ?></label>
               </div>
 <?php } // foreach ?>
             </div>
Index: application/views/application/user_box.php
===================================================================
--- application/views/application/user_box.php	(revision 162)
+++ application/views/application/user_box.php	(working copy)
@@ -54,6 +54,7 @@
       <li><a href="<?php echo get_url('administration', 'configuration') ?>"><?php echo lang('configuration') ?></a></li>
       <li><a href="<?php echo get_url('administration', 'tools') ?>"><?php echo lang('administration tools') ?></a></li>
       <li><a href="<?php echo get_url('administration', 'upgrade') ?>"><?php echo lang('upgrade') ?></a></li>
+      <li><a href="<?php echo get_url('administration', 'plugins') ?>"><?php echo lang('plugins') ?></a></li>
     </ul>
   </div>
   <script type="text/javascript">
Index: application/views/project/overview.php
===================================================================
--- application/views/project/overview.php	(revision 162)
+++ application/views/project/overview.php	(working copy)
@@ -15,6 +15,9 @@
   if (ProjectFile::canAdd(logged_user(), active_project())) {
     add_page_action(lang('add file'), get_url('files', 'add_file'));
   } // if
+  // PLUGIN HOOK
+  plugin_manager()->do_action('project_overview_page_actions');
+  // PLUGIN HOOK
   
   add_stylesheet_to_page('project/project_log.css');
 
Index: application/functions.php
===================================================================
--- application/functions.php	(revision 162)
+++ application/functions.php	(working copy)
@@ -227,6 +227,12 @@
       $controller->redirectTo('access', 'login', $ref_params);
     } // if
     
+    //Check that the active user can access the active project
+    if(active_project() instanceof Project && !logged_user()->isProjectUser(active_project())){
+     	flash_error(lang('no access permissions'));
+     	$this->redirectTo();
+    } // if
+    
     $controller->setLayout($layout);
     $controller->addHelper('form', 'breadcrumbs', 'pageactions', 'tabbednavigation', 'company_website', 'project_website');
   } // prepare_company_website_controller
Index: environment/functions/files.php
===================================================================
--- environment/functions/files.php	(revision 162)
+++ environment/functions/files.php	(working copy)
@@ -62,7 +62,46 @@
     } // if
   } // get_file_line
   
-  /**
+function get_dirs($dir, $full_path = true) {
+    // Check dir...
+    if (!is_dir($dir)) {
+      return false;
+    } // if
+    
+    // Prepare input data...
+    $dir = with_slash($dir);
+    // We have a dir...
+    if (!is_dir($dir)) {
+      return null;
+    } // if
+    
+    // Open dir and prepare result
+    $d = dir($dir);
+    $dirs = array();
+    
+    // Loop dir entries
+    while (false !== ($entry = $d->read())) {
+      
+      // Valid entry?
+      if (($entry <> '.') && ($entry <> '..')) {
+      	
+      	// Get file path...
+        $path = $dir . $entry;
+        
+        // Check if we have a valid directory
+        if (is_dir($path)) {
+	  $dirs[] = $full_path ? $path : $entry;
+        } // if
+      } // if
+    } // while
+    
+    // Done... close dir...
+    $d->close();
+    // And return...
+    return count($dirs) > 0 ? $dirs : null;
+  } // get_dirs
+
+/**
   * Return the files from specific directory. This function can filter result
   * by file extension (accepted param is single extension or array of extensions)
   *
Index: environment/classes/Env.class.php
===================================================================
--- environment/classes/Env.class.php	(revision 162)
+++ environment/classes/Env.class.php	(working copy)
@@ -28,16 +28,17 @@
       if (isset($included[$library]) && $included[$library]) {
         return;
       } // if
+	  
       
       $library_path = ENVIRONMENT_PATH . "/library/$library/";
       if (!file_exists($library_path)) {
         $library_path = ROOT . "/library/$library/";
       } // if
-      
+
       if (!is_dir($library_path)) {
         throw new LibraryDnxError($library);
       } // if
-      
+
       // Call init library file if it exists
       $library_init_file = $library_path . $library . '.php';
       if (is_file($library_init_file)) {
@@ -133,7 +134,7 @@
         return true;
       } // if
       
-      $controller_file = APPLICATION_PATH . "/controllers/$controller_class.class.php";
+      $controller_file = Env::getControllerPath($controller_name);
       if (is_file($controller_file)) {
         include_once $controller_file;
         return true;
@@ -143,6 +144,24 @@
     } // useController
     
     /**
+    * Get Controller File Path, looks for controller file and returns the path 
+    *
+    * @access public
+    * @param string $controller_name
+    * @return boolean
+    * @throws FileDnxError if controller file does not exists
+    */
+    static function getControllerPath($controller_name) {
+      $controller_class = Env::getControllerClass($controller_name);
+      $controller_file = APPLICATION_PATH . "/controllers/$controller_class.class.php";
+      $controller_file_plugin = APPLICATION_PATH . "/plugins/$controller_name/controllers/$controller_class.class.php";
+      if (is_file($controller_file)) return $controller_file;
+      else if (is_file($controller_file_plugin)) return $controller_file_plugin;
+      else throw new FileDnxError($controller_file, "Controller '$controller_name' does not exists (expected location '$controller_file' or '$controller_file_plugin')");
+      
+    } // getControllerFilePath
+    
+    /**
     * Use specific helper
     *
     * @access public
@@ -205,7 +224,12 @@
     */
     static function getTemplatePath($template, $controller_name = null) {
       if ($controller_name) {
-        return APPLICATION_PATH . "/views/$controller_name/$template.php";
+      	//Look for template file path into core and plugins directories
+      	$template_path=APPLICATION_PATH . "/views/$controller_name/$template.php";
+      	$template_path_plugin=APPLICATION_PATH . "/plugins/$controller_name/views/$template.php";
+      	if (file_exists($template_path)) return $template_path;
+      	else if (file_exists($template_path_plugin)) return $template_path_plugin;
+      	else throw new FileDnxError($template, "Template '$template' does not exists (expected location '$template_path' or '$template_path_plugin')");
       } else {
         return APPLICATION_PATH . "/views/$template.php";
       } // if
@@ -230,7 +254,9 @@
     * @return string
     */
     static function getHelperPath($helper) {
-      return APPLICATION_PATH . "/helpers/$helper.php";
+      //Look for helper file path into core and plugins directories
+      $helper_path = APPLICATION_PATH . "/helpers/$helper.php";
+      if (is_file($helper_path)) return $helper_path;
     } // getHelperPath
     
     /**
Index: environment/classes/controller/PageController.class.php
===================================================================
--- environment/classes/controller/PageController.class.php	(revision 162)
+++ environment/classes/controller/PageController.class.php	(working copy)
@@ -29,7 +29,7 @@
     *
     * @var array
     */
-    private $helpers = array();
+    protected $helpers = array();
     
     /**
     * Automaticly render template / layout if action ends without exit
Index: environment/classes/localization/Localization.class.php
===================================================================
--- environment/classes/localization/Localization.class.php	(revision 162)
+++ environment/classes/localization/Localization.class.php	(working copy)
@@ -160,11 +160,30 @@
             } // if
           } // foreach
         } // if
-        
+       
       } else {
         throw new DirDnxError($langs_dir);
       } // if
       
+      // load plugins lang files
+      $dir = APPLICATION_PATH.'/plugins';
+      $dirs = get_dirs($dir,false);
+      foreach ($dirs as $plugin_dir) {
+	$langs_dir_pl = ROOT . '/application/plugins/'.$plugin_dir.'/language/' . $this->getLocale();
+	if (is_dir($langs_dir_pl)) {
+	  $files_pl = get_files($langs_dir_pl, 'php');
+	  
+	  // Loop through files and add langs
+	  if (is_array($files_pl)) {
+	    foreach ($files_pl as $file) {
+	      $langs = include_once $file;
+	      if (is_array($langs)) {
+		$this->langs->append($langs);
+	      } // if
+	    } // foreach
+	  } // if
+	} // if
+      } // foreach
       // Done!
       return true;
       
Index: version.php
===================================================================
--- version.php	(revision 162)
+++ version.php	(working copy)
@@ -13,6 +13,6 @@
   * 
   */
 
-  return '0.8.0';
+  return '0.8.1';
   
 ?>
Index: public/install/installation/templates/sql/mysql_schema.php
===================================================================
--- public/install/installation/templates/sql/mysql_schema.php	(revision 162)
+++ public/install/installation/templates/sql/mysql_schema.php	(working copy)
@@ -142,6 +142,20 @@
   PRIMARY KEY  (`message_id`,`user_id`)
 ) ENGINE=InnoDB <?php echo $default_charset ?>;
 
+CREATE TABLE `<?php echo $table_prefix ?>permissions` (
+  `id` int(10) unsigned NOT NULL auto_increment,
+  `source` varchar(50) $default_collation NOT NULL default '',
+  `permission` varchar(100) NOT NULL default '',
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB <?php echo $default_charset ?>;
+
+CREATE TABLE `<?php echo $table_prefix ?>plugins` (
+  `plugin_id` int(10) unsigned NOT NULL auto_increment,
+  `name` varchar(100) <?php echo $default_collation ?> NOT NULL default '',
+  `installed` tinyint NOT NULL default '1',
+  PRIMARY KEY  (`plugin_id`)
+) ENGINE=InnoDB <?php echo $default_charset ?>;
+
 CREATE TABLE `<?php echo $table_prefix ?>project_companies` (
   `project_id` int(10) unsigned NOT NULL default '0',
   `company_id` smallint(5) unsigned NOT NULL default '0',
@@ -299,18 +313,18 @@
   KEY `order` (`order`)
 ) ENGINE=InnoDB <?php echo $default_charset ?>;
 
+CREATE TABLE `<?php echo $table_prefix ?>project_user_permissions` (
+  `user_id` int(10) unsigned NOT NULL,
+  `project_id` int(10) unsigned NOT NULL,
+  `permission_id` int(10) unsigned NOT NULL,
+  PRIMARY KEY(`user_id`,`project_id`,`permission_id`)
+) ENGINE=InnoDB <?php echo $default_charset ?>;
+
 CREATE TABLE `<?php echo $table_prefix ?>project_users` (
   `project_id` int(10) unsigned NOT NULL default '0',
   `user_id` int(10) unsigned NOT NULL default '0',
   `created_on` datetime default NULL,
   `created_by_id` int(10) unsigned NOT NULL default '0',
-  `can_manage_messages` tinyint(1) unsigned default '0',
-  `can_manage_tasks` tinyint(1) unsigned default '0',
-  `can_manage_milestones` tinyint(1) unsigned default '0',
-  `can_upload_files` tinyint(1) unsigned default '0',
-  `can_manage_files` tinyint(1) unsigned default '0',
-  `can_assign_to_owners` tinyint(1) unsigned NOT NULL default '0',
-  `can_assign_to_other` tinyint(1) unsigned NOT NULL default '0',
   PRIMARY KEY  (`project_id`,`user_id`)
 ) ENGINE=InnoDB <?php echo $default_charset ?>;
 
Index: public/install/installation/templates/sql/mysql_initial_data.php
===================================================================
--- public/install/installation/templates/sql/mysql_initial_data.php	(revision 162)
+++ public/install/installation/templates/sql/mysql_initial_data.php	(working copy)
@@ -63,3 +63,11 @@
 INSERT INTO `<?php echo $table_prefix ?>im_types` (`name`, `icon`) VALUES ('Yahoo!', 'yahoo.gif');
 INSERT INTO `<?php echo $table_prefix ?>im_types` (`name`, `icon`) VALUES ('Skype', 'skype.gif');
 INSERT INTO `<?php echo $table_prefix ?>im_types` (`name`, `icon`) VALUES ('Jabber', 'jabber.gif');
+
+INSERT INTO `<?php echo $table_prefix ?>permissions` (`id`,`source`,`permission`) VALUES (1,'files','manage');
+INSERT INTO `<?php echo $table_prefix ?>permissions` (`id`,`source`,`permission`) VALUES (2,'files','upload');
+INSERT INTO `<?php echo $table_prefix ?>permissions` (`id`,`source`,`permission`) VALUES (3,'milestones','manage');
+INSERT INTO `<?php echo $table_prefix ?>permissions` (`id`,`source`,`permission`) VALUES (4,'messages','manage');
+INSERT INTO `<?php echo $table_prefix ?>permissions` (`id`,`source`,`permission`) VALUES (5,'tasks','manage');
+INSERT INTO `<?php echo $table_prefix ?>permissions` (`id`,`source`,`permission`) VALUES (6,'tasks','assign to other clients');
+INSERT INTO `<?php echo $table_prefix ?>permissions` (`id`,`source`,`permission`) VALUES (7,'tasks','assign to owner company');
Index: public/upgrade/scripts/QuinceUpgradeScript.class.php
===================================================================
--- public/upgrade/scripts/QuinceUpgradeScript.class.php	(revision 0)
+++ public/upgrade/scripts/QuinceUpgradeScript.class.php	(revision 0)
@@ -0,0 +1,303 @@
+<?php
+
+  /**
+  * Upgrade from 0.8.0.x to 0.8.1
+  *
+  * @package ScriptUpgrader.scripts
+  * @http://www.projectpier.org/
+  */
+  class QuinceUpgradeScript extends ScriptUpgraderScript {
+  
+    /**
+    * Database connection link
+    *
+    * @var resource
+    */
+  private $database_connection = null;
+  private $default_collation = '';
+  private $default_charset = '';
+  
+    /**
+    * Construct the QuinceUpgradeScript
+    *
+    * @param Output $output
+    * @return QuinceUpgradeScript
+    */
+    function __construct(Output $output) {
+      parent::__construct($output);
+      $this->setVersionFrom('0.8.0');
+      $this->setVersionTo('0.8.1');
+    } // __construct
+    
+    /**
+    * Execute the script
+    *
+    * @param void
+    * @return boolean
+    */
+    function execute() {
+      define('ROOT', realpath(dirname(__FILE__) . '/../../../'));
+      
+      // ---------------------------------------------------
+      //  Load config
+      // ---------------------------------------------------
+      
+      $config_is_set = require_once INSTALLATION_PATH . '/config/config.php';
+      if (!$config_is_set) {
+        $this->printMessage('Valid config files was not found!', true);
+        return false;
+      } else {
+        $this->printMessage('Config file found and loaded.');
+      } // if
+      
+      if (PRODUCT_VERSION == '0.8.1') {
+        $this->printMessage('You are already running ProjectPier 0.8.1');
+        return true;
+      } // if
+      
+      if ((strlen(PRODUCT_VERSION) > 3 && substr(PRODUCT_VERSION, 0, 5) !== '0.8.0') || (strlen(PRODUCT_VERSION) <= 3 && substr(PRODUCT_VERSION,0,3) != '0.8')) {
+        $this->printMessage('This upgrade script can be used only to upgrade 0.8.0.x to 0.8.1', true);
+        return false;
+      } // if
+      
+      // ---------------------------------------------------
+      //  Connect to database
+      // ---------------------------------------------------
+      
+      if ($this->database_connection = mysql_connect(DB_HOST, DB_USER, DB_PASS)) {
+        if (mysql_select_db(DB_NAME, $this->database_connection)) {
+          $this->printMessage('Upgrade script has connected to the database.');
+        } else {
+          $this->printMessage('Failed to select database ' . DB_NAME);
+          return false;
+        } // if
+      } else {
+        $this->printMessage('Failed to connect to database');
+        return false;
+      } // if
+      
+      // ---------------------------------------------------
+      //  Check MySQL version
+      // ---------------------------------------------------
+      
+      $mysql_version = mysql_get_server_info($this->database_connection);
+      if ($mysql_version && version_compare($mysql_version, '4.1', '>=')) {
+        $constants['DB_CHARSET'] = 'utf8';
+        mysql_query("SET NAMES 'utf8'", $this->database_connection);
+        tpl_assign('default_collation', $this->default_collation = 'collate utf8_unicode_ci');
+        tpl_assign('default_charset', $this->default_charset = 'DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci');
+      } else {
+        tpl_assign('default_collation', $this->default_collation = '');
+        tpl_assign('default_charset', $this->default_charset = '');
+      } // if
+      
+      tpl_assign('table_prefix', TABLE_PREFIX);
+      
+      // ---------------------------------------------------
+      //  Check test query
+      // ---------------------------------------------------
+      
+      $test_table_name = TABLE_PREFIX . 'test_table';
+      $test_table_sql = "CREATE TABLE `$test_table_name` (
+        `id` int(10) unsigned NOT NULL auto_increment,
+        `name` varchar(50) $this->default_collation NOT NULL default '',
+        PRIMARY KEY  (`id`)
+      ) ENGINE=InnoDB $this->default_charset;";
+      
+      if (mysql_query($test_table_sql, $this->database_connection)) {
+        $this->printMessage('Test query has been executed. Its safe to proceed with database migration.');
+        mysql_query("DROP TABLE `$test_table_name`", $this->database_connection);
+      } else {
+        $this->printMessage('Failed to executed test query. MySQL said: ' . mysql_error($this->database_connection), true);
+        return false;
+      } // if
+
+      if (!file_is_writable(INSTALLATION_PATH . '/config/config.php')) {
+	$this->printMessage('Configuration file is not writable.',true);
+	return false;
+      } // if
+      $this->printMessage('Configureation file is writable.');
+
+      // ---------------------------------------------------
+      //  Execute migration
+      // ---------------------------------------------------
+      
+      mysql_query('BEGIN WORK');
+      
+      if ($this->upgradePermissions() === false) {
+        mysql_query('ROLLBACK');
+        $this->printMessage('Upgrade process failed!', true);
+        return false;
+      } // if
+      if ($this->addPluginsTable() === false) {
+        mysql_query('ROLLBACK');
+        $this->printMessage('Upgrade process failed!', true);
+        return false;
+      } // if
+       if ($this->fixConfigFile() === false) {
+         mysql_query('ROLLBACK');
+         $this->printMessage('Upgrade process failed!', true);
+         return false;
+      } // if
+      
+      if (mysql_query('COMMIT')) {
+        $this->printMessage('ProjectPier has been upgraded. You are now running ProjectPier 0.8.1(dev) Enjoy!');
+        return true;
+      } else {
+        $this->printMessage('Failed to commit updates. Upgrade process failed!', true);
+        return false;
+      } // if
+    } // execute
+    
+    function upgradePermissions() {
+      $this->printMessage('Migrating to new permissions system.');
+      $permissions_table = TABLE_PREFIX . 'permissions';
+      $project_user_permissions_table = TABLE_PREFIX . 'project_user_permissions';
+      $project_users_table = TABLE_PREFIX . 'project_users';
+			       
+      $permissionMap = array();
+      $permissionMap["can_manage_files"] = 1;
+      $permissionMap["can_upload_files"] = 2;
+      $permissionMap["can_manage_milestones"] = 3;
+      $permissionMap["can_manage_messages"] = 4;
+      $permissionMap["can_manage_tasks"] = 5;
+      $permissionMap["can_assign_to_owners"] = 6;
+      $permissionMap["can_assign_to_other"] = 7;
+
+      $insert_permissions_query = "INSERT INTO `$permissions_table` (id,source,permission) VALUES
+(1,'files','manage'),
+(2,'files','upload'),
+(3,'milestones','manage'),
+(4,'messages','manage'),
+(5,'tasks','manage'),
+(6,'tasks','assign to other clients'),
+(7,'tasks','assign to owner company')";
+
+      $create_project_user_permissions_table_query = "CREATE TABLE `$project_user_permissions_table` (
+`user_id` int(10) unsigned NOT NULL,
+`project_id` int(10) unsigned NOT NULL,
+`permission_id` int(10) unsigned NOT NULL,
+PRIMARY KEY(`user_id`,`project_id`,`permission_id`)
+) ENGINE=InnoDB $default_charset";
+
+      $create_permissions_table_query = "CREATE TABLE `$permissions_table` (
+        `id` int(10) unsigned NOT NULL auto_increment,
+        `source` varchar(50) $default_collation NOT NULL default '',
+        `permission` varchar(100) NOT NULL default '',
+        PRIMARY KEY  (`id`)
+      ) ENGINE=InnoDB $default_charset";
+      
+      //test for existence of 'can_manage_time' permission
+      $test_res = mysql_query("select can_manage_time from project_users");
+      if ($test_res != FALSE) {
+	$insert_permissions_query .= ",(8,'time','manage')";
+	$permissionMap["can_manage_time"] = 8;
+      } // if
+
+      if (!mysql_query($create_permissions_table_query)) {
+	$this->printMessage("Failed to create permissions table. Error ".mysql_errno($this->database_connection) . ": " . mysql_error($this->database_connection),true);
+	  return false;
+      } // if
+      
+      if (!mysql_query($insert_permissions_query)) {
+	$this->printMessage("Failed to insert permissions tuples. Error ".mysql_errno($this->database_connection) . ": " . mysql_error($this->database_connection),true);
+	return false;
+      } // if
+
+      if (!mysql_query($create_project_user_permissions_table_query)) {
+	$this->printMessage("Failed to create project_user_permissions table. Error ".mysql_errno($this->database_connection) . ": " . mysql_error($this->database_connection),true);
+	return false;
+      } // if
+
+      $pup_query = "select project_id, user_id, project_users.* FROM project_users";
+      if ($result = mysql_query($pup_query)) {
+	while ($row = mysql_fetch_assoc($result)) {
+	  $project_id = array_shift($row);
+	  $user_id = array_shift($row);
+	  foreach ($row as $permission => $value) {
+	    if ($value == 1) {
+	      if ($permission == 'created_by_id') {
+		continue;
+	      } // if
+	      if (!isset($permissionMap[$permission])) {
+		$this->printMessage("Ignoring permission $permission.  Migrate it yourself.\n");
+		continue;
+	      } // if
+	      $sql = sprintf("INSERT INTO `%s` (`project_id`,`user_id`,`permission_id`) VALUES (%d,%d,%d)",$project_user_permissions_table,$project_id,$user_id,$permissionMap[$permission]);
+	      if(!mysql_query($sql)) {
+		$this->printMessage("Failed to insert a (project,user,permission) tuple. Error ".mysql_errno($this->database_connection) . ": " . mysql_error($this->database_connection),true);
+		return false;
+	      } // if
+	    } // if
+	  } // foreach
+	} // while
+	foreach (array_keys($permissionMap) as $column) {
+	  $alter_query = "ALTER TABLE `$project_users_table` drop column $column";
+	  if (!mysql_query($alter_query)) {
+	    $this->printMessage("Failed to drop permission columns from project_users table. Error ".mysql_errno($this->database_connection) . ": " . mysql_error($this->database_connection),true);
+	    return false;
+	  } // if
+	} // foreach
+      } else {
+	$this->printMessage("Failed to retrieve current (project,user) permissions. Error ".mysql_errno($this->database_connection) . ": " . mysql_error($this->database_connection),true);
+	return false;
+      } // if
+      return true;
+    } // upgradePermissions
+
+
+    function addPluginsTable() {
+      $this->printMessage('Adding plugins table.');
+      $plugins_table = TABLE_PREFIX.'plugins';
+      $create_plugins_table_query = "CREATE TABLE `$plugins_table` (
+  `plugin_id` int(10) unsigned NOT NULL auto_increment,
+  `name` varchar(100) $default_collation NOT NULL default '',
+  `installed` tinyint NOT NULL default '1',
+  PRIMARY KEY  (`plugin_id`)
+) ENGINE=InnoDB $default_charset";
+
+      if (!mysql_query($create_plugins_table_query)) {
+	return false;
+      } // if
+      return true;
+    } // addPluginTable
+    
+    /**
+    * This function will fix configuration file
+    *
+    * @param void
+    * @return null
+    */
+     function fixConfigFile() {
+       $this->printMessage('Updating configuration file');
+       $constants = array(
+         'DB_ADAPTER'           => DB_ADAPTER,
+         'DB_HOST'              => DB_HOST,
+         'DB_USER'              => DB_USER,
+         'DB_PASS'              => DB_PASS,
+         'DB_NAME'              => DB_NAME,
+         'DB_PERSIST'           => true,
+         'TABLE_PREFIX'         => TABLE_PREFIX,
+         'ROOT_URL'             => ROOT_URL,
+         'DEFAULT_LOCALIZATION' => DEFAULT_LOCALIZATION,
+         'DEBUG'                => false,
+         'PRODUCT_VERSION'      => require INSTALLATION_PATH . '/version.php',
+	 'SHOW_MESSAGE_BODY'	=> SHOW_MESSAGE_BODY, 
+	 'SHOW_COMMENT_BODY'	=> SHOW_COMMENT_BODY,
+	 'SHOW_MILESTONE_BODY'	=> SHOW_MILESTONE_BODY,
+	 'TOKEN_COOKIE_NAME'	=> TOKEN_COOKIE_NAME,
+	 'DB_CHARSET'		=> DB_CHARSET,
+       ); // array
+       tpl_assign('config_file_constants', $constants);
+       if (file_put_contents(INSTALLATION_PATH . '/config/config.php', tpl_fetch(get_template_path('config_file')))) {
+         $this->printMessage('Configuration file updated');
+         return true;
+       } else {
+         $this->printMessage('Failed to update configuration file', true);
+         return false;
+       } // if
+     } // fixConfigFile
+  
+  } // QuinceUpgradeScript
+
+?>