lib/model/CmsPermission.php @@ -1 +1,2 @@ .DS_Store +._* .gitignore @@ -27,7 +27,7 @@ class CMSAdminHomeController extends AdminComponent { * @return String url to redirect to **/ protected function process_login() { - $auth = new WaxAuthDb(array("db_table"=>$this->model_name, "session_key"=>"wildfire_user_cookie")); + $auth = new WaxAuthDb(array("db_table"=>$this->model_name, "session_key"=>"wildfire_user_cookie", 'encrypt'=>false)); if( $auth->verify($_POST['username'], $_POST['password'])){ $log = new WildfireLog; $log->action="login"; lib/controller/CMSAdminHomeController.php @@ -13,6 +13,7 @@ class WildfireUser extends WaxModel { $this->define("password", "CharField", array("required"=>true)); $this->define("usergroup", "CharField"); $this->define("allowed_sections", "ManyToManyField", array('target_model' => 'CmsSection')); + $this->define("permissions", "HasManyField", array('target_model' => 'CmsPermission')); } lib/model/WildfireUser.php @@ -14,7 +14,7 @@ <?endif?> <?endif?> - <?if($params["link"]):?> <?=link_to(truncate($row->$column, 60), array("action"=>"edit", "id"=>$row->id))?> + <?if($params["link"]):?> <?=link_to(substr($row->$column, 35), array("action"=>"edit", "id"=>$row->id))?> <?else:?> <?=$row->$column?> <?endif;?> view/CMSAdminContentController/_list.html aaf119d090e9d4b0f957a817aba932302eb6bdb4 charlesmarshall charles@oneblackbear.com http://github.com/phpwax/wildfire/commit/c2dd1c628c0d6cedd366921033c215235ae7a86f c2dd1c628c0d6cedd366921033c215235ae7a86f 2009-06-22T02:06:58-07:00 2009-06-22T02:06:58-07:00 wildfire user mods - permissions join a7466ff3fb839586fe0a6521ea87b84b19953840 charlesmarshall charles@oneblackbear.com