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

Oops.

このコミットが含まれているのは:
テクニカル諏訪子 2018-08-03 14:27:19 +09:00
親 c358ddf540
コミット 3755a71ce6
2個のファイルの変更、15行の追加、11行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

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

@ -163,12 +163,14 @@ class AuthController extends Controller {
$merge1 = array();
$merge2 = array();
$merge3 = array();
$merge4 = array();
$merge1 = array_merge($blgarr, $forarr);
$merge2 = array_merge($strarr, $usrarr);
$merge3 = array_merge($merge1, $merge2);
$merge4 = array_merge($merge3, $invarr);
$merge = array_merge($merge3, $invarr);
$merge = array_merge($merge4, $imgarr);
return $merge;
}
@ -226,12 +228,14 @@ class AuthController extends Controller {
$merge1 = array();
$merge2 = array();
$merge3 = array();
$merge4 = array();
$merge1 = array_merge((array)$grouppermblg[0], (array)$grouppermfor[0]);
$merge2 = array_merge((array)$grouppermstr[0], (array)$grouppermusr[0]);
$merge3 = array_merge($merge1, $merge2);
$merge4 = array_merge($merge3, (array)$groupperminv[0]);
$merge = array_merge($merge3, (array)$groupperminv[0]);
$merge = array_merge($merge4, (array)$grouppermimg[0]);
return $merge;
}

18
app/Http/Controllers/ImageController.php
ファイルの表示

@ -26,7 +26,7 @@ class ImageController extends Controller {
public function getUserWithUploads(Request $request) { // /api/rpc/image/get/userwithuploads
$valid = $this->objAuth->getPermissions($request->username, $request->password);
if ($valid['img_view'] == 1) {
if ($valid['img_viewimg'] == 1) {
$cols = $this->objUser->getGroupColours()->toArray();
$imgs = File::directories('storage/assets/images');
@ -81,7 +81,7 @@ class ImageController extends Controller {
public function getAll(Request $request) { // /api/rpc/image/get/all
$valid = $this->objAuth->getPermissions($request->username, $request->password);
if ($valid['img_view'] == 1) {
if ($valid['img_viewimg'] == 1) {
$cols = $this->objUser->getGroupColours()->toArray();
$imgs = File::files('storage/assets/images/*');
@ -144,7 +144,7 @@ class ImageController extends Controller {
else {
$valid = $this->objAuth->getPermissions($request->username, $request->password);
if ($valid['img_view'] == 1) {
if ($valid['img_viewimg'] == 1) {
$cols = $this->objUser->getGroupColours()->toArray();
$imgs = File::files('storage/assets/images/'.$check);
@ -210,7 +210,7 @@ class ImageController extends Controller {
public function getUser($id, Request $request) { // /api/rpc/image/get/user/id
$valid = $this->objAuth->getPermissions($request->username, $request->password);
if ($valid['img_view'] == 1) {
if ($valid['img_viewimg'] == 1) {
$cols = $this->objUser->getGroupColours()->toArray();
$imgs = File::files('storage/assets/images/'.$id);
@ -273,7 +273,7 @@ class ImageController extends Controller {
else {
$valid = $this->objAuth->getPermissions($request->username, $request->password);
if ($valid['img_view'] == 1) {
if ($valid['img_viewimg'] == 1) {
$cols = $this->objUser->getGroupColours()->toArray();
$dirs = File::directories('storage/assets/images');
@ -347,7 +347,7 @@ class ImageController extends Controller {
public function viewImage(Request $request) { // /api/rpc/image/view
$valid = $this->objAuth->getPermissions($request->username, $request->password);
if ($valid['img_view'] == 1) {
if ($valid['img_viewimg'] == 1) {
$protocol = isset($_SERVER["HTTPS"]) ? 'https' : 'http';
if (!isset($request->id) || !isset($request->name)) {
@ -370,7 +370,7 @@ class ImageController extends Controller {
else {
$valid = $this->objAuth->getPermissions($request->username, $request->password);
if ($valid['img_add'] == 1) {
if ($valid['img_addimg'] == 1) {
if (isset($request->filename)) {
if (!is_dir("assets/images/".$check)) {
if (!mkdir("assets/images/".$check, 0755, true)) {
@ -417,7 +417,7 @@ class ImageController extends Controller {
else {
$valid = $this->objAuth->getPermissions($request->username, $request->password);
if ($valid['img_delother'] == 1) {
if ($valid['img_delotherimg'] == 1) {
if (isset($request->name)) {
$fname = 'assets/images/'.$request->id.'/'.$request->name;
unlink('storage/'.$fname);
@ -429,7 +429,7 @@ class ImageController extends Controller {
else {
if (isset($request->name)) {
if ($check == $request->id) {
if ($valid['img_delown'] == 1) {
if ($valid['img_delownimg'] == 1) {
$fname = 'assets/images/'.$check.'/'.$request->name;
unlink('storage/'.$fname);
if ($this->is_dir_empty('storage/assets/images/'.$check)) rmdir('storage/assets/images/'.$check);