空白
このコミットが含まれているのは:
コミット
1259fdd2d0
ファイル差分が大きすぎるため省略します
差分を読み込み
|
@ -7,7 +7,7 @@ use Illuminate\Http\Request;
|
|||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
class BashController extends Controller {
|
||||
public function ls($pwd) { // /api/rpc/bash/ls/pwd
|
||||
return 'page forum store user';
|
||||
}
|
||||
public function ls($pwd) { // /api/rpc/bash/ls/pwd
|
||||
return 'page forum store user';
|
||||
}
|
||||
}
|
||||
|
|
|
@ -8,5 +8,5 @@ use Illuminate\Foundation\Validation\ValidatesRequests;
|
|||
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
|
||||
|
||||
class Controller extends BaseController {
|
||||
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
|
||||
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
|
||||
}
|
||||
|
|
|
@ -6,23 +6,21 @@ use Illuminate\Http\Request;
|
|||
|
||||
class HomeController extends Controller
|
||||
{
|
||||
/**
|
||||
* Create a new controller instance.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('auth');
|
||||
}
|
||||
/**
|
||||
* Create a new controller instance.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function __construct() {
|
||||
$this->middleware('auth');
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the application dashboard.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function index()
|
||||
{
|
||||
return view('home');
|
||||
}
|
||||
/**
|
||||
* Show the application dashboard.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function index() {
|
||||
return view('home');
|
||||
}
|
||||
}
|
||||
|
|
|
@ -7,36 +7,36 @@ use Illuminate\Http\Request;
|
|||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
class PermissionController extends Controller {
|
||||
public function getPermissionsFromModule() { // /api/rpc/permission/getpermissionsfrommodule
|
||||
return DB::table('usr_perm_module')
|
||||
->select('*')
|
||||
->get();
|
||||
}
|
||||
public function getPermissionsFromModule() { // /api/rpc/permission/getpermissionsfrommodule
|
||||
return DB::table('usr_perm_module')
|
||||
->select('*')
|
||||
->get();
|
||||
}
|
||||
|
||||
public function getPermissionFromModule($id) { // /api/rpc/permission/getpermissionsfrommodule/id
|
||||
return DB::table('usr_perm_module')
|
||||
->select('*')
|
||||
->where('id', $id)
|
||||
->get();
|
||||
}
|
||||
public function getPermissionFromModule($id) { // /api/rpc/permission/getpermissionsfrommodule/id
|
||||
return DB::table('usr_perm_module')
|
||||
->select('*')
|
||||
->where('id', $id)
|
||||
->get();
|
||||
}
|
||||
|
||||
public function getPermissions($mdl) { // /api/rpc/permission/getpermissions/mdl
|
||||
return DB::table($mdl.'_permissions')
|
||||
->select('*')
|
||||
->get();
|
||||
}
|
||||
public function getPermissions($mdl) { // /api/rpc/permission/getpermissions/mdl
|
||||
return DB::table($mdl.'_permissions')
|
||||
->select('*')
|
||||
->get();
|
||||
}
|
||||
|
||||
public function getPermissionGroup($mdl, $id) { // /api/rpc/permission/getpermissiongroup/mdl/id
|
||||
return DB::table($mdl.'_permissions')
|
||||
->select('*')
|
||||
->where('id', $id)
|
||||
->get();
|
||||
}
|
||||
public function getPermissionGroup($mdl, $id) { // /api/rpc/permission/getpermissiongroup/mdl/id
|
||||
return DB::table($mdl.'_permissions')
|
||||
->select('*')
|
||||
->where('id', $id)
|
||||
->get();
|
||||
}
|
||||
|
||||
public function getPermissionUser($mdl, $id) { // /api/rpc/permission/getpermissionuser/mdl/id
|
||||
return DB::table($mdl.'_user_permissions')
|
||||
->select('*')
|
||||
->where('user_id', $id)
|
||||
->get();
|
||||
}
|
||||
public function getPermissionUser($mdl, $id) { // /api/rpc/permission/getpermissionuser/mdl/id
|
||||
return DB::table($mdl.'_user_permissions')
|
||||
->select('*')
|
||||
->where('user_id', $id)
|
||||
->get();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -814,7 +814,6 @@ class SiteController extends Controller {
|
|||
'id' => $i->id,
|
||||
'title' => $i->title,
|
||||
'slug' => $i->slug,
|
||||
'public_status' => $i->public_status,
|
||||
'message' => $i->message
|
||||
]);
|
||||
}
|
||||
|
@ -833,16 +832,13 @@ class SiteController extends Controller {
|
|||
$valid = $this->objAuth->getPermissions($request->username, $request->password);
|
||||
|
||||
if ($valid['blg_addpage'] == 1) {
|
||||
$pubdate = 0;
|
||||
$lorder = DB::table('blg_content')
|
||||
->select('sortorder')
|
||||
->where('isPost', 0)
|
||||
->sortBy('sortorder', 'desc')
|
||||
->first()->sortorder;
|
||||
|
||||
if ($request->public_status == 1) {
|
||||
if ($request->publish_date <= time()) {
|
||||
return \Response::json(array('error' => 'Publish date can\'t be older than post date.'));
|
||||
}
|
||||
}
|
||||
|
||||
if ($request->public_status == 1) $pubdate = $request->publish_date;
|
||||
else $pubdate = time();
|
||||
dd(lorder);
|
||||
|
||||
$add = DB::table('blg_content')
|
||||
->insert([
|
||||
|
@ -851,8 +847,8 @@ class SiteController extends Controller {
|
|||
'title' => $request->title,
|
||||
'slug' => $request->slug,
|
||||
'post_date' => 0,
|
||||
'publish_date' => $pubdate,
|
||||
'sortorder' => $request->sortorder,
|
||||
'publish_date' => 0,
|
||||
'sortorder' => ($request->isMenu == 1 ? $lorder : 0),
|
||||
'public_status' => $request->public_status,
|
||||
'isMenu' => $request->isMenu,
|
||||
'message' => $request->message
|
||||
|
|
|
@ -842,4 +842,3 @@ class UserController extends Controller {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
新しいイシューから参照