suwako
/
076server
アーカイブ
1
0
フォーク 0
コード イシュー プルリクエスト プロジェクト リリース Wiki アクティビティ

Demand for Docs and ODB were too low, so they got removed.

このコミットが含まれているのは:
テクニカル諏訪子 2018-03-12 16:07:16 +01:00
親 0d2bafca79
コミット 9eafdbdaac
5個のファイルの変更、2行の追加、66行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

40
app/Http/Controllers/AuthController.php
ファイルの表示

@ -53,22 +53,12 @@ class AuthController extends Controller {
// $grouppermimg = $this->objPermission->getPermissionGroup('img', $perm[0]->perm_id);
// $userpermimg = $this->objPermission->getPermissionUser('img', $uid);
// Document permissions.
// $grouppermdoc = $this->objPermission->getPermissionGroup('doc', $perm[0]->perm_id);
// $userpermdoc = $this->objPermission->getPermissionUser('doc', $uid);
// ODB permissions.
// $grouppermodb = $this->objPermission->getPermissionGroup('odb', $perm[0]->perm_id);
// $userpermodb = $this->objPermission->getPermissionUser('odb', $uid);
// Now provide an array of user overwritten permissions if it exists. Otherwise, give its group permissions.
$blgarr = array();
$forarr = array();
$strarr = array();
$usrarr = array();
// $imgarr = array();
// $docarr = array();
// $odbarr = array();
if (!empty($userpermblg[0])) {
$blgarr = (array)$userpermblg[0];
@ -123,20 +113,6 @@ class AuthController extends Controller {
}
else {
$imgarr = (array)$grouppermimg[0];
}
if (!empty($userpermdoc[0])) {
$docarr = (array)$userpermdoc[0];
}
else {
$docarr = (array)$grouppermdoc[0];
}
if (!empty($userpermodb[0])) {
$odbarr = (array)$userpermodb[0];
}
else {
$odbarr = (array)$grouppermodb[0];
} */
$merge = array();
@ -166,12 +142,6 @@ class AuthController extends Controller {
// Image permissions.
// $grouppermimg = $this->objPermission->getPermissionGroup('img', 6);
// Document permissions.
// $grouppermdoc = $this->objPermission->getPermissionGroup('doc', 6);
// ODB permissions.
// $grouppermodb = $this->objPermission->getPermissionGroup('odb', 6);
// Since guests don't have user overwritten permissions, simply return the group permissions.
(array)$grouppermblg[0] = array_combine(
array_map(function($k){ return 'blg_'.$k; }, array_keys((array)$grouppermblg[0])),
@ -196,16 +166,6 @@ class AuthController extends Controller {
/* (array)$grouppermimg[0] = array_combine(
array_map(function($k){ return 'img_'.$k; }, array_keys((array)$grouppermimg[0])),
(array)$grouppermimg[0]
);
(array)$grouppermdoc[0] = array_combine(
array_map(function($k){ return 'doc_'.$k; }, array_keys((array)$grouppermdoc[0])),
(array)$grouppermdoc[0]
);
(array)$grouppermodb[0] = array_combine(
array_map(function($k){ return 'odb_'.$k; }, array_keys((array)$grouppermodb[0])),
(array)$grouppermodb[0]
); */
$merge = array();

10
routes/class/document.php
ファイルの表示

@ -1,10 +0,0 @@
<?php
/*
|--------------------------------------------------------------------------
| Document class
|--------------------------------------------------------------------------
|
| These are the API routes corresponding to document.
|
*/

10
routes/class/odb.php
ファイルの表示

@ -1,10 +0,0 @@
<?php
/*
|--------------------------------------------------------------------------
| ODB class
|--------------------------------------------------------------------------
|
| These are the API routes corresponding to odb.
|
*/

2
routes/web.php
ファイルの表示

@ -12,9 +12,7 @@
*/
require(__DIR__.'/class/board.php');
// require(__DIR__.'/class/document.php');
// require(__DIR__.'/class/image.php');
// require(__DIR__.'/class/odb.php');
// require(__DIR__.'/class/page.php');
require(__DIR__.'/class/store.php');
require(__DIR__.'/class/user.php');

6
yb2db.sql
ファイルの表示

@ -55,9 +55,7 @@ CREATE TABLE IF NOT EXISTS `usr_perm_id` (
`blg_per_id` int(10) NOT NULL DEFAULT 4,
`for_per_id` int(10) NOT NULL DEFAULT 4,
`sbx_per_id` int(10) NOT NULL DEFAULT 4,
`str_per_id` int(10) NOT NULL DEFAULT 4,
`doc_per_id` int(10) NOT NULL DEFAULT 4,
`odb_per_id` int(10) NOT NULL DEFAULT 4
`str_per_id` int(10) NOT NULL DEFAULT 4
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
CREATE TABLE IF NOT EXISTS `str_category_loc` (
@ -91,7 +89,7 @@ CREATE TABLE IF NOT EXISTS `str_locale` (
INSERT INTO `users` SELECT `id`, `username`, `email`, `password`, NULL, NULL, NULL FROM `for_users`;
INSERT INTO `usr_details` SELECT `id`, `total_posts`, `total_threads`, `reg_date`, `last_post_date`, `last_post_location`, `ontime`, `strikes` FROM `for_users`;
INSERT INTO `usr_profile` SELECT `id`, `gender`, `member_title`, `website_address`, `website_name`, `location`, `birthday`, `bio`, `ip_address`, `avatar`, `ostatus`, `header`, `footer`, NULL, NULL, `name_colour`, `display_name`, `yt_channel`, `country`, `curDF`, NULL, NULL, NULL FROM `for_users`;
INSERT INTO `usr_perm_id` SELECT `id`, `perm_id`, `usr_per_id`, `blg_per_id`, `for_per_id`, `sbx_per_id`, `str_per_id`, `doc_per_id`, `odb_per_id` FROM `for_users`;
INSERT INTO `usr_perm_id` SELECT `id`, `perm_id`, `usr_per_id`, `blg_per_id`, `for_per_id`, `sbx_per_id`, `str_per_id` FROM `for_users`;
-- Add game support.
INSERT INTO `str_games` (`id`, `name`) VALUES (NULL, 'MKDS'), (NULL, 'MK7');
-- Change parents into games, and add support for that..