Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
orvice committed Apr 9, 2016
1 parent e56681d commit ce95163
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions app/Controllers/AdminController.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
class AdminController extends UserController
{

public function index()
public function index($request, $response, $args)
{
$sts = new Analytics();
return $this->view()->assign('sts', $sts)->display('admin/index.tpl');
}

public function invite()
public function invite($request, $response, $args)
{
$codes = InviteCode::where('user_id', '=', '0')->get();
return $this->view()->assign('codes', $codes)->display('admin/invite.tpl');
Expand Down
12 changes: 6 additions & 6 deletions app/Controllers/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function view()
return parent::view()->assign('userFooter',$userFooter);
}

public function index()
public function index($request, $response, $args)
{
$msg = DbConfig::get('user-index');
if($msg == null ){
Expand All @@ -37,7 +37,7 @@ public function index()
return $this->view()->assign('msg',$msg)->display('user/index.tpl');
}

public function node()
public function node($request, $response, $args)
{
$msg = DbConfig::get('user-node');
$user = Auth::getUser();
Expand Down Expand Up @@ -73,18 +73,18 @@ public function nodeInfo($request, $response, $args)
return $this->view()->assign('json', $json)->assign('json_show', $json_show)->assign('ssqr', $ssqr)->assign('surge_base', $surge_base)->assign('surge_proxy', $surge_proxy)->display('user/nodeinfo.tpl');
}

public function profile()
public function profile($request, $response, $args)
{
return $this->view()->display('user/profile.tpl');
}

public function edit()
public function edit($request, $response, $args)
{
return $this->view()->display('user/edit.tpl');
}


public function invite()
public function invite($request, $response, $args)
{
$codes = $this->user->inviteCodes();
return $this->view()->assign('codes', $codes)->display('user/invite.tpl');
Expand All @@ -110,7 +110,7 @@ public function doInvite($request, $response, $args)
return $this->echoJson($response, $res);
}

public function sys()
public function sys($request, $response, $args)
{
return $this->view()->assign('ana', "")->display('user/sys.tpl');
}
Expand Down

0 comments on commit ce95163

Please sign in to comment.