Support aliases in ARO table

Config/acl_manager.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Acl Manager Config File
+ *
+ * This will be loaded by the AclManger plugin and merged into its configuration
+ *
+ * copy this file to your App/Config/ folder
+ */
+
+$config['AclManager'] = array(
+	/**
+	 * List of AROs (Class aliases)
+	 * Order is important! Parent to Children
+	 */
+	'aros' => array('Role', 'User'),
+
+	/**
+	 * Aliases to write into ARO table
+	 */
+	// 'aro_aliases' => array('Group' => 'name', 'User' => 'username'),
+
+	/**
+	 * Limit used to paginate AROs
+	 * Replace {alias} with ARO alias
+	 * '{alias}' => array('limit' => 3)
+	 */
+	// 'Role' => array('limit' => 3),
+
+	/**
+	 * Routing Prefix
+	 * Set the prefix you would like to restrict the plugin to
+	 * @see Configure::read('Routing.prefixes')
+	 */
+	// 'prefix' => 'admin',
+
+	/**
+	 * Ugly identation?
+	 * Turn off when using CSS
+	 */
+	'uglyIdent' => true,
+
+	/**
+	 * Actions to ignore when looking for new ACOs
+	 * Format: 'action', 'Controller/action' or 'Plugin.Controller/action'
+	 */
+	'ignoreActions' => array('isAuthorized'),
+
+	/**
+	 * List of ARO models to load
+	 * Use only if AclManager.aros aliases are different from model name
+	 */
+	// 'models' => array('Group', 'Customer'),
+
+	'version' => "1.3.1"
+);

Config/bootstrap.php

@@ -13,55 +13,20 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-/**
- * List of AROs (Class aliases)
- * Order is important! Parent to Children
- */
-Configure::write('AclManager.aros', array('Role', 'User'));
-
-/**
- * Limit used to paginate AROs
- * Replace {alias} with ARO alias
- * Configure::write('AclManager.{alias}.limit', 3)
- */
-// Configure::write('AclManager.Role.limit', 3);
-
-/**
- * Routing Prefix
- * Set the prefix you would like to restrict the plugin to
- * @see Configure::read('Routing.prefixes')
- */
-// Configure::write('AclManager.prefix', 'admin');
-
-/**
- * Ugly identation?
- * Turn off when using CSS
- */
-Configure::write('AclManager.uglyIdent', true);
-
-/**
- * Actions to ignore when looking for new ACOs
- * Format: 'action', 'Controller/action' or 'Plugin.Controller/action'
- */
-Configure::write('AclManager.ignoreActions', array('isAuthorized'));
+// Default to Plugin config which can be overwritten by local app config
+Configure::load('AclManager.acl_manager');
+$defaultConfig = Configure::read('AclManager');
 
-/**
- * List of ARO models to load
- * Use only if AclManager.aros aliases are different than model name
- */
-// Configure::write('AclManager.models', array('Group', 'Customer'));
+$config = array();
+// Local app config
+if (file_exists(APP . 'Config' . DS . 'acl_manager.php')) {
+	Configure::load('acl_manager', 'default', false);
+	$config = Configure::read('AclManager');
+}
 
-/**
- * END OF USER SETTINGS
- */
+$config = array_merge($defaultConfig, $config);
+Configure::write('AclManager', $config);
 
-Configure::write("AclManager.version", "1.2.5");
-if (!is_array(Configure::read('AclManager.aros'))) {
-	Configure::write('AclManager.aros', array(Configure::read('AclManager.aros')));
-}
-if (!is_array(Configure::read('AclManager.ignoreActions'))) {
-	Configure::write('AclManager.ignoreActions', array(Configure::read('AclManager.ignoreActions')));
-}
 if (!Configure::read('AclManager.models')) {
 	Configure::write('AclManager.models', Configure::read('AclManager.aros'));
 }