diff --git a/app/Config/Routes.php b/app/Config/Routes.php index de5bb61..17c681f 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -26,35 +26,35 @@ $routes->group('cli', ['namespace' => 'App\Controllers\CLI'], function ($routes) }); $routes->group('admin', ['namespace' => 'App\Controllers\Admin', 'filter' => 'authFilter:manager'], function ($routes) { $routes->get('/', 'Home::index'); - $routes->group('mapurl', function ($routes) { - $routes->get('/', 'MapurlController::index'); - $routes->get('create', 'MapurlController::create_form'); - $routes->post('create', 'MapurlController::create'); - $routes->get('modify/(:num)', 'MapurlController::modify_form/$1'); - $routes->post('modify/(:num)', 'MapurlController::modify/$1'); - $routes->get('delete/(:num)', 'MapurlController::delete/$1'); - $routes->get('toggle/(:num)/(:any)', 'MapurlController::toggle/$1/$2'); - $routes->post('batchjob', 'MapurlController::batcjob'); - $routes->get('download/(:alpha)', 'MapurlController::download/$1'); - }); }); -$routes->group('admin/user', ['namespace' => 'App\Controllers\Admin'], function ($routes) { - $routes->get('/', 'UserController::index', ['filter' => 'authFilter:manager']); - $routes->get('create', 'UserController::create_form', ['filter' => 'authFilter:master']); - $routes->post('create', 'UserController::create', ['filter' => 'authFilter:master']); - $routes->get('modify/(:num)', 'UserController::modify_form/$1', ['filter' => 'authFilter:master']); - $routes->post('modify/(:num)', 'UserController::modify/$1', ['filter' => 'authFilter:master']); - $routes->get('delete/(:num)', 'UserController::delete/$1', ['filter' => 'authFilter:master']); - $routes->get('toggle/(:num)/(:any)', 'UserController::toggle/$1/$2', ['filter' => 'authFilter:manager']); - $routes->post('batchjob', 'UserController::batcjob', ['filter' => 'authFilter:manager']); - $routes->get('download/(:alpha)', 'UserController::download/$1', ['filter' => 'authFilter:manager']); +$routes->group('admin/mapurl', ['namespace' => 'App\Controllers\Admin', 'filter' => 'authFilter:manager'], function ($routes) { + $routes->get('/', 'MapurlController::index'); + $routes->get('create', 'MapurlController::create_form'); + $routes->post('create', 'MapurlController::create'); + $routes->get('modify/(:num)', 'MapurlController::modify_form/$1'); + $routes->post('modify/(:num)', 'MapurlController::modify/$1'); + $routes->get('delete/(:num)', 'MapurlController::delete/$1'); + $routes->get('toggle/(:num)/(:any)', 'MapurlController::toggle/$1/$2'); + $routes->post('batchjob', 'MapurlController::batcjob'); + $routes->get('download/(:alpha)', 'MapurlController::download/$1'); }); -$routes->group('admin/usersns', ['namespace' => 'App\Controllers\Admin'], function ($routes) { - $routes->get('/', 'UserSNSController::index', ['filter' => 'authFilter:master']); - $routes->get('delete/(:num)', 'UserSNSController::delete/$1', ['filter' => 'authFilter:master']); - $routes->get('toggle/(:num)/(:any)', 'UserSNSController::toggle/$1/$2', ['filter' => 'authFilter:master']); - $routes->post('batchjob', 'UserSNSController::batcjob', ['filter' => 'authFilter:master']); - $routes->get('download/(:alpha)', 'UserSNSController::download/$1', ['filter' => 'authFilter:master']); +$routes->group('admin/user', ['namespace' => 'App\Controllers\Admin', 'filter' => 'authFilter:master'], function ($routes) { + $routes->get('/', 'UserController::index', []); + $routes->get('create', 'UserController::create_form'); + $routes->post('create', 'UserController::create'); + $routes->get('modify/(:num)', 'UserController::modify_form/$1'); + $routes->post('modify/(:num)', 'UserController::modify/$1'); + $routes->get('delete/(:num)', 'UserController::delete/$1'); + $routes->get('toggle/(:num)/(:any)', 'UserController::toggle/$1/$2'); + $routes->post('batchjob', 'UserController::batcjob'); + $routes->get('download/(:alpha)', 'UserController::download/$1'); +}); +$routes->group('admin/usersns', ['namespace' => 'App\Controllers\Admin', 'filter' => 'authFilter:master'], function ($routes) { + $routes->get('/', 'UserSNSController::index'); + $routes->get('delete/(:num)', 'UserSNSController::delete/$1'); + $routes->get('toggle/(:num)/(:any)', 'UserSNSController::toggle/$1/$2'); + $routes->post('batchjob', 'UserSNSController::batcjob'); + $routes->get('download/(:alpha)', 'UserSNSController::download/$1'); }); $routes->group('admin/cloudflare', ['namespace' => 'App\Controllers\Admin\Cloudflare', 'filter' => 'authFilter:cloudflare'], function ($routes) { diff --git a/app/Controllers/CommonController.php b/app/Controllers/CommonController.php index a850b55..406e09b 100644 --- a/app/Controllers/CommonController.php +++ b/app/Controllers/CommonController.php @@ -34,14 +34,14 @@ abstract class CommonController extends BaseController final protected function pushCurrentUrl() { - $urlStack = $this->session->get('url_stack', []) ?? []; - $urlStack[] = current_url() . ($this->request->getUri()->getQuery() ? "?" . $this->request->getUri()->getQuery() : ""); + $urlStack = $this->session->get('url_stack') ?? []; + $urlStack[] = current_url() . $this->request->getUri()->getQuery() ? "?" . $this->request->getUri()->getQuery() : ""; $this->session->set('url_stack', $urlStack); } final protected function popPreviousUrl() { - $urlStack = $this->session->get('url_stack', []); + $urlStack = $this->session->get('url_stack') ?? []; if (!empty($urlStack)) { return array_pop($urlStack); } diff --git a/app/Filters/AuthFilter.php b/app/Filters/AuthFilter.php index 6b64bb4..4622bf7 100644 --- a/app/Filters/AuthFilter.php +++ b/app/Filters/AuthFilter.php @@ -2,9 +2,10 @@ namespace App\Filters; -use CodeIgniter\Filters\FilterInterface; -use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; +use CodeIgniter\HTTP\RequestInterface; +use CodeIgniter\HTTP\RedirectResponse; +use CodeIgniter\Filters\FilterInterface; class AuthFilter implements FilterInterface { @@ -29,8 +30,8 @@ class AuthFilter implements FilterInterface // log_message("debug", var_export($arguments, true)); // 로그인 않했으면 if (!$auth->isLoggedIn()) { - $urlStack = session()->get('url_stack', []) ?? []; - $urlStack[] = current_url() . ($request->getUri()->getQuery() ? "?" . $request->getUri()->getQuery() : "");; + $urlStack = session()->get('url_stack') ?? []; + $urlStack[] = current_url() . $request->getUri()->getQuery() ? "?" . $request->getUri()->getQuery() : ""; session()->set('url_stack', $urlStack); return redirect()->to(URLS['LOGIN'])->with('error', '로그인을하셔야합니다.'); } diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php index 3b3dabb..0040c8d 100644 --- a/app/Helpers/CommonHelper.php +++ b/app/Helpers/CommonHelper.php @@ -4,7 +4,9 @@ namespace App\Helpers; abstract class CommonHelper { - protected function __construct() {} + protected function __construct() + { + } final public function getRandomString($length = 10, $characters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789") { return substr(str_shuffle($characters), 0, $length); @@ -231,7 +233,7 @@ abstract class CommonHelper break; case 'modify': $pk = $viewDatas['entity']->getPK(); - $oldBatchJobUids = old("batchjob_uids", []); + $oldBatchJobUids = old("batchjob_uids", null); $oldBatchJobUids = is_array($oldBatchJobUids) ? $oldBatchJobUids : [$oldBatchJobUids]; $checkbox = form_checkbox([ "id" => "checkbox_uid_{$pk}", diff --git a/public/mapurl/index.html b/public/mapurl/index.html index 478ae34..bfefd66 100644 --- a/public/mapurl/index.html +++ b/public/mapurl/index.html @@ -1,4 +1,4 @@ - + @@ -82,7 +82,7 @@ case 'http://1004dk.com': window.location.href='https://twitter.com/ok1004tv'; b case 'http://1004doc.com': window.location.href='http://2023.1004safe.com'; break; case 'http://1004doll.com': window.location.href='http://1004cors.com'; break; case 'http://1004easy.com': window.location.href='http://gogo.1004see.com'; break; -case 'http://1004etc.com': window.location.href='https://1004poki.com'; break; +case 'http://1004etc.com': window.location.href='http://1004fur.com'; break; case 'http://1004eve.com': window.location.href='http://1004.1004cute.com'; break; case 'http://1004fan.com': window.location.href='http://1004eve.com'; break; case 'http://1004fb.com': window.location.href='http://gogo.1004see.com'; break; @@ -263,10 +263,11 @@ case 'http://19hey.com': window.location.href='http://1004eve.com'; break; case 'http://19hun.com': window.location.href='http://1004eve.com'; break; case 'http://19hunt.com': window.location.href='https://twitter.com/_19hunter'; break; case 'http://19hunter.com': window.location.href='https://twitter.com/_19hunter'; break; -case 'http://19hunters.com': window.location.href='https://twitter.com/_19hunter333'; break; +case 'http://19hunters.com': window.location.href='https://twitter.com/_19hunter'; break; case 'http://19hunts.com': window.location.href='https://twitter.com/_19hunter'; break; case 'http://19kor.com': window.location.href='https://twitter.com/_19hunter'; break; case 'http://19mini.com': window.location.href='https://twitter.com/_19hunter'; break; +case 'http://19nomo.com': window.location.href='https://twitter.com/_19hunter'; break; case 'http://19sns.com': window.location.href='https://twitter.com/_19hunter'; break; case 'http://19tab.com': window.location.href='https://twitter.com/_19hunter'; break; case 'http://19wiz.com': window.location.href='https://twitter.com/_19hunter'; break; @@ -1416,7 +1417,6 @@ case 'http://tc-79.com': window.location.href='http://mgmg55.com'; break; case 'http://te300ny.com': window.location.href='https://sam100kr.com'; break; case 'http://telm247.com': window.location.href='http://shot88-k77.com'; break; case 'http://tesdm.com': window.location.href='http://naver.com'; break; -case 'http://test.co.kr': window.location.href='https://test1.co.kr'; break; case 'http://test1.co.kr': window.location.href='https://ttt.com'; break; case 'http://test2.co.kr': window.location.href='https://ttt.com'; break; case 'http://tf-24.com': window.location.href='http://nt-2424.com'; break; @@ -2249,7 +2249,7 @@ case 'https://1004come.com': window.location.href='https://1004dear.com'; break; case 'https://1004conan.com': window.location.href='https://1004poki.com'; break; case 'https://1004ct.com': window.location.href='https://1004dear.com'; break; case 'https://1004cube.com': window.location.href='http://new.1004spo.com'; break; -case 'https://1004etc.com': window.location.href='https://1004poki.com'; break; +case 'https://1004etc.com': window.location.href='https://1004fur.com'; break; case 'https://1004fire.com': window.location.href='https://1004mac.com'; break; case 'https://1004for.com': window.location.href='http://1004host.com'; break; case 'https://1004fruit.com': window.location.href='https://1004dear.com'; break; @@ -2688,4 +2688,4 @@ case 'link.mgr-ip.com': window.location.href='http://ch-yyxx.com'; break; - +