Updates from lnApp

This commit is contained in:
Deon George
2011-07-14 08:59:32 +10:00
parent 5c9750e957
commit 46c3b9a075
31 changed files with 991 additions and 434 deletions

View File

@@ -21,14 +21,7 @@ class Controller_Tree extends Controller_lnApp_Tree {
*
* @param id
*/
public function action_json($id=null) {
if ($this->_auth_required()) {
$this->output = array('attr'=>array('id'=>'a_login'),
'data'=>array('title'=>_('Please Login').'...','attr'=>array('id'=>'N_login','href'=>URL::site('/login'))));
return;
}
public function action_json($id=null,array $data=array()) {
// Get the user details
$id = (is_null($id) && isset($_REQUEST['id'])) ? substr($_REQUEST['id'],2) : $id;
$user = Auth::instance()->get_user();
@@ -85,6 +78,8 @@ class Controller_Tree extends Controller_lnApp_Tree {
)
);
}
return parent::action_json($id,$data);
}
}
?>