diff --git a/plugin.php b/plugin.php index 7a6508f..05ecd94 100644 --- a/plugin.php +++ b/plugin.php @@ -1,6 +1,7 @@ 'ahib::user_register', 'uses' => 'Amuz\XePlugin\ApplicationHelper\InAppBrowsers\RegisterController@getRegister']); Route::post('/ib/user/register/{group_id?}', ['as' => 'ahib::user_register.store', 'uses' => 'Amuz\XePlugin\ApplicationHelper\InAppBrowsers\RegisterController@postRegister']); // for store Route::post('/ib/user/group_select', ['as' => 'ahib::post_group_select', 'uses' => 'Amuz\XePlugin\ApplicationHelper\InAppBrowsers\RegisterController@postGroupSelect']); // for store - + Route::post('/ib/user/term_agree', ['as' => 'ahib::post_term_agree', 'uses' => 'Amuz\XePlugin\ApplicationHelper\InAppBrowsers\RegisterController@postTermAgree']); // for store + // Route::get('/ib/board/{instance_id}', ['as' => 'ahib::board', 'uses' => 'Amuz\XePlugin\ApplicationHelper\InAppBrowsers\BoardController@index']); Route::get('/ib/board/{instance_id}/create', ['as' => 'ahib::board_create', 'uses' => 'Amuz\XePlugin\ApplicationHelper\InAppBrowsers\BoardController@create']); @@ -103,6 +107,7 @@ function () { //get Board Comment Data Route::get('/comment/getItem', ['as' => 'ah::get_comment', 'uses' => 'Amuz\XePlugin\ApplicationHelper\BoardApiController@getItem']); Route::get('/banner/getItem', ['as' => 'application_helper.get.banner.item', 'uses' => 'Amuz\XePlugin\ApplicationHelper\Controller@bannerItemData']); + Route::get('/banner/{banner_key}', ['as' => 'ah::banner_list', 'uses' => 'Amuz\XePlugin\ApplicationHelper\Controller@getBanner']); //이것은 마치 나의 필살기 Route::any('/syncDocuments', [ @@ -119,7 +124,7 @@ function () { Route::get('/auth/user_groups',['as' => 'ah::user_groups','uses' => 'Amuz\XePlugin\ApplicationHelper\Controller@user_groups']); Route::any('/auth/update',['as' => 'ah::user_update','uses' => 'Amuz\XePlugin\ApplicationHelper\Controller@userUpdate']); - }); + }); } public function settingsRoute(){ @@ -291,22 +296,28 @@ public function interceptDynamicField() { if(!$query) return $query; //배너 아이템문서에 업데이트 발생할 경우 어댑핏 어플리케이션 배너 정보 업데이트 - $banner_list = app('xe.config')->get('application_helper.app_config')->get('banner_list'); - - foreach($banner_list as $key => $banner) { - if($banner['id'] === $query->id) { - $banner_list[$key]['title'] = $query->title; - $banner_list[$key]['group_id'] = $query->group_id; - $banner_list[$key]['image_path'] = $query->image['path']; - $banner_list[$key]['image_id'] = $query->image['id']; - $banner_list[$key]['content'] = $query->content; - $banner_list[$key]['link'] = $query->link; - $banner_list[$key]['link_target'] = $query->link_target; - $banner_list[$key]['group'] = $query->group; + $xe_config = app('xe.config'); + $ah_config = $xe_config->get('application_helper'); + if($ah_config == null){ + $xe_config->set('application_helper',[]); + $ah_config = $xe_config->get('application_helper'); + } + $ah_banner_groups = $ah_config->get('banner',[]); + + $banner_data = []; + foreach($ah_banner_groups as $key => $item) { + $banner_config = $ah_banner_groups[$key]; + $group_id = $banner_config['group']; + $group = Group::find($group_id); + $banner_items = $this->getItems($group); + foreach($banner_items as $banner) { + if($banner->image === "") continue; + $banner->slide_time = (int) $banner_config['slide_time']; + $banner_data[$key][] = $banner->toArray(); } } app('xe.config')->set('application_helper.app_config', [ - 'banner_list' => $banner_list + 'ah_banner_config' => $banner_data ]); return $query; }); @@ -376,4 +387,27 @@ public function checkUpdated() return parent::checkUpdated(); } + + public function getItems($group, $count = null, $onlyVisible = false) + { + $query = Item::where('group_id', $group->id); + + if ($onlyVisible) { + $query->where('status', 'show') + ->where(function ($query) { + $query->where('use_timer', 0) + ->orWhere(function ($query) { + $now = Carbon::now(); + $query->where('ended_at', '>', $now); + $query->where('started_at', '<', $now); + }); + }); + } + + if ($count !== null) { + $query->take($count); + } + + return $query->orderBy('order', 'desc')->orderBy('created_at', 'desc')->get(); + } } diff --git a/src/1 b/src/1 new file mode 100644 index 0000000..9f434b8 --- /dev/null +++ b/src/1 @@ -0,0 +1,946 @@ +auth = app('auth'); + $this->handler = app('xe.user'); + $this->emailBroker = app('xe.auth.email'); + $this->keygen = $keygen; + + + $this->xeDynamicField = app('xe.dynamicField'); + $this->userTypeHandler = app('amuz.usertype.handler'); + } + + public function index() + { + $title = '애플리케이션 API 헬퍼'; + + // set browser title + XeFrontend::title($title); + return \XePresenter::make('ApplicationHelper::views.index', []); + } + + public function getLang($locale = 'ko'){ + $lang_list = \DB::table('translation')->where('locale',$locale)->whereNotIn('namespace',['logic_builder'])->get(); + $retObj = new BaseObject(); + $retObj->set('translation',$lang_list); + return $retObj->output(); + } + + public function getConfig(){ + $site_key = \XeSite::getCurrentSiteKey(); + $config_list = \DB::table('config')->select('name','vars')->where('site_key',$site_key)->get(); + $retObj = new BaseObject(); + $retObj->set('site_key',$site_key); + $retObj->set('config_list',$config_list); + return $retObj->output(); + } + + public function getNavigator(BoardService $boardService,ConfigHandler $boardConfigHandler, CptModuleConfigHandler $cptModuleConfigHandler, $menu_key){ + $site_key = \XeSite::getCurrentSiteKey(); + $xe_config = app('xe.config'); + $ah_config = $xe_config->get('application_helper'); + $deliver_menus = $ah_config->get('navigator'); + $menu_id = array_get($deliver_menus,$menu_key); + if($menu_id == null) return; + + $instance_configs = $ah_config->get('instances'); + + $menu_list = \DB::table('menu_item')->where('menu_id',$menu_id)->where('site_key',$site_key)->orderBy('ordering','asc')->get(); + foreach($menu_list as $menu){ + $skin = array_get(array_get($instance_configs,$menu->id,[]),'skin','list'); + $menu->skin = $skin; + + switch($menu->type){ + case "board@board" : + $config = $boardConfigHandler->get($menu->id); + $menu->categories = [ + 'category' => [ + 'group' => 'tax_category', + 'items' => $boardService->getCategoryItemsTree($config) + ] + ]; + $menu->create_url = route('ahib::board_create',['instance_id' => $menu->id],false); + $menu->edit_url = route('ahib::board_edit',['instance_id' => $menu->id],false); + $menu->delete_url = route('ahib::board_delete',['instance_id' => $menu->id],false); + break; + case "cpt@cpt" : + $config = $cptModuleConfigHandler->get($menu->id); + $taxonomyHandler = app('overcode.df.taxonomyHandler'); + $taxonomies = $taxonomyHandler->getTaxonomies($config->get('cpt_id')); + $categories = []; + + foreach($taxonomies as $taxonomy) { + $categories[$taxonomy->extra->slug]['group'] = $taxonomyHandler->getTaxFieldGroup($taxonomy->id); + $categories[$taxonomy->extra->slug]['items'] = $taxonomyHandler->getCategoryItemsTree($taxonomy->id,$categories[$taxonomy->extra->slug]['group']); + } + $menu->categories = $categories; + + $menu->create_url = route('ahib::cpt_create',['slug' => $menu->url],false); + $menu->edit_url = route('ahib::cpt_edit',['slug' => $menu->url],false); + $menu->delete_url = route('ahib::cpt_delete',['slug' => $menu->url],false); +// $menu->create_url = route('ahib::cpt_create',['cpt_id'=>$config->get('cpt_id')],false); + case "widgetpage@widgetpage" : + break; + default : + break; + } + } + + $retObj = new BaseObject(); + $retObj->set('site_key',$site_key); + $retObj->set('menu_list',$menu_list); +// dd($retObj); + return $retObj->output(); + } + + public function getBanner(BannerHandler $handler,$banner_key) { + $site_key = \XeSite::getCurrentSiteKey(); + $xe_config = app('xe.config'); + $ah_config = $xe_config->get('application_helper'); + if($ah_config == null){ + $xe_config->set('application_helper',[]); + $ah_config = $xe_config->get('application_helper'); + } + + $ah_banner_groups = $ah_config->get('banner',[]); + $banner_config = $ah_banner_groups[$banner_key]; + $group_id = $banner_config['group']; + $group = Group::find($group_id); + $banner_items = $handler->getItems($group); + $banner_data = []; + foreach($banner_items as $banner) { + if($banner->image === "") continue; + $banner->slide_time = $banner_config['slide_time']; + $banner_data[] = $banner->toArray(); + } + + $retObj = new BaseObject(); + $retObj->set('site_key',$site_key); + $retObj->set('banner_key',$banner_key); + $retObj->set('banner_group_id',$group_id); + $retObj->set('banner_items',$banner_data); + return $retObj->output(); + } + + //for dynamic factory + public function getTaxonomiesByTaxonomyId($taxonomyKey) { + $taxonomy = CategoryExtra::find($taxonomyKey); + if($taxonomy == null) $taxonomy = CategoryExtra::where('slug',$taxonomyKey)->first(); + + $taxonomyHandler = app('overcode.df.taxonomyHandler'); + $items = $taxonomyHandler->getCategoryItemsTree($taxonomy->category_id)->toArray(); + sort($items); + + return XePresenter::makeApi(['error' => 0, 'message' => 'Complete', 'data' => [ + 'tree' => $items, + 'items' => $taxonomyHandler->getCategoryItemAttributes($taxonomy->category_id)->keyBy('id') + ] + ]); + } + + public function getTaxonomiesByCptId($cpd_id) { + $taxonomyHandler = app('overcode.df.taxonomyHandler'); + $taxonomies = $taxonomyHandler->getTaxonomies($cpd_id); + if($taxonomies == null) return; + + foreach($taxonomies as $taxonomy) { + $taxonomy->name = xe_trans($taxonomy->name); + $items = $taxonomyHandler->getCategoryItemsTree($taxonomy->id)->toArray(); + sort($items); + + $taxonomy->item = $items; + } + + return XePresenter::makeApi(['error' => 0, 'message' => 'Complete', 'data' => $taxonomies]); + } + + public function getPermission(){ + $site_key = \XeSite::getCurrentSiteKey(); + $permission_list = \DB::table('permissions')->select('name','grants')->where('site_key',$site_key)->get(); + $retObj = new BaseObject(); + $retObj->set('site_key',$site_key); + $retObj->set('permission_list',$permission_list); + return $retObj->output(); + } + + public function get_videos_vimeo(){ +// ->select('id','directory_id','name','video_duration','thumbnail','thumbnail_overlay') + $vimeo_list = \DB::table('vimeo_video')->where('delete_status','N')->get(); + $retObj = new BaseObject(); + $retObj->set('vimeo_list',$vimeo_list); + return $retObj->output(); + } + + public function get_keychain(){ + try{ + $keychain = app('amuz.keychain'); + $retObj = new BaseObject(); + $retObj->set('key_list',$keychain->getUniqueKeys()); + return $retObj->output(); + }catch (\Exception $e){ + throw new \Exception("키체인 플러그인이 설치되지 않았습니다."); + } + } + + public function getInstance(){ + $site_key = \XeSite::getCurrentSiteKey(); + $config_list = \DB::table('instance_route')->select('url','module','instance_id')->where('site_key',$site_key)->get(); + $retObj = new BaseObject(); + $retObj->set('site_key',$site_key); + $retObj->set('instance_list',$config_list); + return $retObj->output(); + } + + public function closer(Request $request){ + $retObj = new BaseObject(); + $retObj->set('request',$request->all()); + return $retObj->output(); + } + + /** + * Handle a login request to the application. + * + * @param \Illuminate\Http\Request $request request + * @return \Illuminate\Http\JsonResponse + */ + public function tokenLogin(Request $request) + { + $retObj = $this->checkDeviceConnect($request); + if($request->hasHeader('X-AMUZ-REMEMBER-TOKEN') && $request->hasHeader('X-AMUZ-DEVICE-UUID')){ + $login_token = $request->get('login_token', ''); + $user_id = $request->get('user_id', ''); + + //소셜로그인을 통한 최초 토큰로그인시 단한번 저장을 해준다 + if($login_token != '' && $user_id != ''){ + $token_info = AhUserToken::where('device_id',$request->header('X-AMUZ-DEVICE-UUID'))->where('user_id',$user_id)->where('token',$login_token)->first(); + }else{ + $token_info = AhUserToken::where('device_id',$request->header('X-AMUZ-DEVICE-UUID'))->where('token',$request->header('X-AMUZ-REMEMBER-TOKEN'))->first(); + } + + if($token_info == null){ + $retObj->addError('ERR_BROKEN_SESSION','잘못된 토큰이 전달되었습니다.'); + }else{ + $user = User::find($token_info->user_id); + $this->auth->login($user); + + $deviceInfo = $retObj->get('deviceInfo'); + //같은기기의 푸시토큰 업데이트 + $token_info->push_token = $deviceInfo['push_token']; + $token_info->save(); + + //샌드버드플러그인이 설치되어있으면 토큰정보를 업데이트 해 준다. + $this->updateSendbirdToken($token_info); + + $retObj->setMessage("로그인에 성공하였습니다."); + $retObj->set('user',$this->arrangeUserInfo($user,$request)); + $retObj->set('remember_token',$token_info->token); + } + }else{ + $retObj->addError('ERR_BROKEN_SESSION','잘못된 토큰이 전달되었습니다.'); + } + + return $retObj->output(); + } + + /** + * Handle a login request to the application. + * + * @param \Illuminate\Http\Request $request request + * @return \Illuminate\Http\JsonResponse + */ + public function postLogin(Request $request) + { + $retObj = $this->checkDeviceConnect($request); + + $this->checkCaptcha(); + + $credentials = $request->only('email', 'password'); + + $credentials['email'] = trim($credentials['email']); + + $credentials['status'] = [User::STATUS_ACTIVATED, User::STATUS_PENDING_ADMIN, User::STATUS_PENDING_EMAIL]; + + + if ($this->auth->attempt($credentials, true)) { + $user = $this->auth->user(); + $retObj = $this->doLogin($request, $retObj,$user); + }else{ + $retObj->addError('ERR_AccountNotFoundOrDisabled',xe_trans('xe::msgAccountNotFoundOrDisabled')); + } + return $retObj->output(); + } + + public function socialLogin(Request $request,Handler $socialLoginHandler,Socialite $socialite, $provider){ + $retObj = $this->checkDeviceConnect($request); + + $requestHeader = base64_decode($request->header('postData')); + $postData = json_dec($requestHeader,true); + $retObj->set('provider',$provider); + + $authedUser = json_dec(array_get($postData,'user'),true); + $authedToken = json_dec(array_get($postData,'token'),true); + + switch($provider){ + case "kakao" : + $is_email_valid = Arr::get($authedUser, 'kakao_account.is_email_valid'); + $is_email_verified = Arr::get($authedUser, 'kakao_account.is_email_verified'); + + $userContract = (new \Laravel\Socialite\Two\User())->setRaw($authedUser)->map([ + 'id' => $authedUser['id'], + 'nickname' => Arr::get($authedUser, 'properties.nickname'), + 'name' => Arr::get($authedUser, 'properties.nickname'), + 'email' => $is_email_valid && $is_email_verified ? Arr::get($authedUser, 'kakao_account.email') : null, + 'avatar' => Arr::get($authedUser, 'properties.profile_image'), + ]); + $userContract->setToken(Arr::get($authedToken, 'access_token')) + ->setRefreshToken(Arr::get($authedToken, 'refresh_token')) + ->setExpiresIn(Arr::get($authedToken, 'access_token_expires_at')); + break; + case "apple" : + $savedAppleInfo = AhUserAppleInfo::find($authedUser["user_id"]); + if($savedAppleInfo !== null){ + $authedUser = (array) json_dec($savedAppleInfo->user); + }else{ + $savedAppleInfo = new AhUserAppleInfo(); + $savedAppleInfo->id = $authedUser["user_id"]; + $savedAppleInfo->user = json_enc($authedUser); + $savedAppleInfo->save(); + } + + $providerInstance = $socialite->driver($provider); + $providerInstance->stateless(); + + if (array_key_exists("name", $authedUser) || array_key_exists("name", $authedUser)) { + $user["name"] = $authedUser["name"]; + $fullName = trim( + ($user["name"]['firstName'] ?? "") + . " " + . ($user["name"]['lastName'] ?? "") + ); + } + + $userContract = (new \Laravel\Socialite\Two\User()) + ->setRaw($authedUser) + ->map([ + "id" => $authedUser["user_id"], + "name" => $fullName ?? null, + "email" => $authedUser["email"] ?? null, + ]); + + $userContract->setToken(Arr::get($authedToken, 'access_token')); + break; + } + + if (app('xe.config')->getVal('user.register.joinable') === false) { + return redirect()->back()->with( + ['alert' => ['type' => 'danger', 'message' => xe_trans('xe::joinNotAllowed')]] + ); + } + + //social 계정 이메일 같은경우 연결 + $userAccount = $socialLoginHandler->getRegisteredUserAccount($userContract, $provider); + if($userAccount == null && $userContract->email){ + $signedUser = XeUser::where('email',$userContract->email)->first(); + if($signedUser != null){ + try { + $socialLoginHandler->connectAccount($signedUser, $userContract, $provider); + } catch (ExistsAccountException $e) { + $this->throwHttpException(xe_trans('social_login::alreadyRegisteredAccount'), 409, $e); + } + + $userAccount = $socialLoginHandler->getRegisteredUserAccount($userContract, $provider); + } + } + + if ($userAccount !== null) { + $user = $userAccount->user; + $retObj = $this->doLogin($request, $retObj, $user); + return redirect()->route('ah::closer',['remember_token'=>$retObj->get('remember_token'),'user'=>$retObj->get('user')]); + } + + //가입된 계정이 없을 경우 회원가입 + if (app('xe.config')->getVal('social_login.registerType', 'simple') === 'step' && + $socialLoginHandler->checkNeedRegisterForm($userContract) === false) { + + $userData = [ + 'email' => $userContract->getEmail(), + 'contract_email' => $userContract->getEmail(), + 'display_name' => $userContract->getNickname() ?: $userContract->getName(), + 'account_id' => $userContract->getId(), + 'provider_name' => $provider, + 'token' => $userContract->token, + 'token_secret' => $userContract->tokenSecret ?? '' + ]; + + XeDB::beginTransaction(); + try { + $user = $socialLoginHandler->registerUser($userData); + } catch (ExistsAccountException $e) { + XeDB::rollback(); + $this->throwHttpException(xe_trans('social_login::alreadyRegisteredAccount'), 409, $e); + } catch (ExistsEmailException $e) { + XeDB::rollback(); + $this->throwHttpException(xe_trans('social_login::alreadyRegisteredEmail'), 409, $e); + } catch (\Throwable $e) { + XeDB::rollback(); + throw $e; + } + XeDB::commit(); + + $retObj = $this->doLogin($request, $retObj, $user); + return redirect()->route('ah::closer',['remember_token'=>$retObj->get('remember_token'),'user'=>$retObj->get('user')]); + } + + $request->session()->put('userContract', $userContract); + $request->session()->put('provider', $provider); + + return redirect()->route('ahib::user_register'); + } + + protected function checkDeviceConnect(Request $request){ + $retObj = new BaseObject(); + $deviceInfo = [ + 'device_name' => $request->header('X-AMUZ-DEVICE-NAME'), + 'device_version' => $request->header('X-AMUZ-DEVICE-VERSION'), + 'device_id' => $request->header('X-AMUZ-DEVICE-UUID') + ]; + foreach($deviceInfo as $key => $val){ + if($val == null){ + $retObj->addError('ERR_NONE_ALLOW',sprintf('허용되지 않은 접근입니다. %s가 필요합니다.',$key)); + return $retObj->output(); + } + } + + if($request->hasHeader('X-AMUZ-PUSH-TOKEN')) $deviceInfo['push_token'] = $request->header('X-AMUZ-PUSH-TOKEN'); + $retObj->set('deviceInfo',$deviceInfo); + return $retObj; + } + + + /** + * Check captcha + * + * @return void + */ + protected function checkCaptcha() + { + $config = app('xe.config')->get('user.register'); + if ($config->get('useCaptcha', false) === true) { + if (app('xe.captcha')->verify() !== true) { + throw new HttpException(Response::HTTP_FORBIDDEN, xe_trans('xe::msgFailToPassCAPTCHA')); + } + } + } + + public function bannerItemData(Request $request) { + $this->validate($request, [ + 'item_id' => 'required' + ]); + + $item_id = $request->get('item_id'); + $bannerHandler = app('xe.banner'); + $item = $bannerHandler->getItem($item_id); + + return XePresenter::makeApi(['item' => $item]); + } + +// 이것은 마치 나의 필살기 by xiso + public function syncDocuments(Request $request, ConfigHandler $boardConfigHandler, CptModuleConfigHandler $cptModuleConfigHandler){ + $target_slug = $request->get('target_slug'); + if(!$target_slug){ + $target_instances = $request->get('target_instances','[]'); + $target_instances = json_dec($target_instances) ?? $request->get('target_instances'); + }else{ + $target_instance = new \stdClass(); + $target_instance->slug = $target_slug; + $target_instance->last_updated_at = "1970-01-01 00:00:00"; + $target_instances = [$target_instance]; + } + $site_key = \XeSite::getCurrentSiteKey(); + + //호출 가능성이 있는 모든 텍소노미를 동기화한다. + $taxonomyHandler = app('overcode.df.taxonomyHandler'); + $archives = []; + $returnDocuments = []; + + foreach($target_instances as $target_instance){ + $menu = MenuItem::where('url',$target_instance->slug)->first(); + if(!$menu) continue; + + $model = null; + switch($menu->type){ + case "board@board" : + $config = $boardConfigHandler->get($menu->id); + $model = Board::division($menu->id); + $model = $model->where('instance_id', $config->get('boardId')); + + //TODO Board Category 들어올때 대응해야함. 준비안되있음 ^^* 보드카테고리 동작하면 에러날거임 :) 분명. + break; + case "cpt@cpt" : + $config = $cptModuleConfigHandler->get($menu->id); + $model = CptDocument::division($config->get('cpt_id'), $site_key); + $model = $model->where('instance_id', $config->get('cpt_id')); + + $archive = $taxonomyHandler->getTaxonomies($config->get('cpt_id')); + foreach($archive as $taxonomy){ + $archives[$taxonomy->extra->slug] = $taxonomy; + $archives[$taxonomy->extra->slug]->items = $taxonomyHandler->getCategoryItemAttributes($taxonomy->id)->keyBy('id'); + } + break; + default : + break; + } + $model = $model->where('site_key', $site_key)->where('updated_at', '>=', $target_instance->last_updated_at); + $documents = $model->get(); + + //텍소노미를 붙이기 전에 부모 <-> 자식간의 데이터를 오버라이드 하여 싱크해준다. + $archives = arrangeTaxonomyItemsOverride($archives); + + //arrange + foreach($documents as $document){ + $selectedTaxonomyItems = $taxonomyHandler->getItemOnlyTargetId($document->id); + $result = []; + foreach($selectedTaxonomyItems as $taxonomyItem) { + $category_Extra = CategoryExtra::where('category_id', $taxonomyItem->category_id)->first(); + $taxonomyItem->slug = $category_Extra->slug; + + $archive = $archives[$taxonomyItem->slug]; + $taxonomyItem->archive_title = $archive->name; + if(!isset($result[$taxonomyItem->slug])) $result[$taxonomyItem->slug] = []; + $result[$taxonomyItem->slug][] = array_merge((array)$taxonomyItem,$archive->items[$taxonomyItem->id]); + } + $document->selectedTaxonomyItems = json_encode($result); + //fortest +// unset($document->content,$document->pure_content); + } + $returnDocuments[$menu->url] = $documents ?: []; + } + return XePresenter::makeApi([ + 'last_updated_server_time' => Carbon::now()->format('Y-m-d H:i:s'), + 'documents' => $returnDocuments ?: [] + ]); + } + + public function userList(Request $request) { + $targetUserIds = $request->get('target_user_ids', ''); + $userGroupId = $request->get('group_id', ''); + $perPage = $request->get('perPage', 30); + $page = $request->get('page', 1); + + $query = XeUser::where('status', 'activated'); + + if($request->get('user_ids','') != ''){ + $userIds = is_array($request->get('user_ids')) ? $request->get('user_ids') : json_dec($request->get('user_ids')); + $query->whereIn('id', $userIds); + } + + //그룹찾기 + if($userGroupId !== '' && $userGroupId != 'user') { + $query->whereHas('groups', function($q) use ($userGroupId){ + $q->where('group_id',$userGroupId); + }); + } + + if($request->get('exclude_auth','N') == "Y"){ + $query->where('id', '!=', $this->auth->user()->id); + } + + if($request->get('near_target','') != '' && $request->get('lat','') != '' && $request->get('lng','') != ''){ + $near = [ + 'field_id' => $request->get('near_target'), + 'lat' => $request->get('lat'), + 'lng' => $request->get('lng'), + 'group' => $request->get('group_id'), + 'limit_distance' => $request->get('limit_distance',20), + ]; + +// if($near['group'] != 'user'){ + $query->join('field_dynamic_field_extend_location as types_' . $near['field_id'], function ($join) use ($near){ + $join->on('user.id', '=', 'types_'.$near['field_id'] . '.target_id') + ->where('types_'.$near['field_id'] . '.group',$near['group']) + ->where('types_'.$near['field_id'] . '.field_id',$near['field_id']); + }); +// } + + $haversine = "(6371 * acos(cos(radians(" . $near['lat'] . ")) + * cos(radians(`xe_types_".$near['field_id']."`.`lat`)) + * cos(radians(`xe_types_".$near['field_id']."`.`lng`) + - radians(" . $near['lng'] . ")) + + sin(radians(" . $near['lat'] . ")) + * sin(radians(`xe_types_".$near['field_id']."`.`lat`))))"; + + $query->select("*") + ->selectRaw("{$haversine} AS distance") + ->whereRaw("{$haversine} < ?", [$near['limit_distance']]); + } + + if($request->get('only_has_profile','N') == "Y"){ + $query->whereNotNull("profile_image_id"); + } + + if($request->get('search_taxonomy','') != ''){ + //{allow_category_item_item_id: [313, 312, 311, 309, 351, 349], current_status_item_id: [], gender_boolean: []} + $searchTargets = json_dec($request->get('search_taxonomy','[]')); + foreach($searchTargets as $fieldId => $fieldInfo){ + $fieldType = $fieldInfo[0]; + $selectedValues = $fieldInfo[1]; + switch($fieldType){ + case "category" : + foreach($selectedValues as $val){ + $query->where($fieldId . '.item_id','like',"%" . $val . "%"); + } + break; + case "boolean" : + $query->where(function($q) use ($fieldId,$selectedValues){ + foreach($selectedValues as $val){ + $q->orWhere($fieldId . '.boolean',$val); + } + }); + break; + } + + } + } + + $query->with('groups'); + $this->makeOrder($query, $request); + + $paginate = $query->paginate($perPage, ['*'], 'page', $page); + dd($paginate); + $total = $paginate->total(); + $currentPage = $paginate->currentPage(); + $count = 0; + + $userList = $paginate->getCollection()->keyBy('id'); + if($request->get('write_cpt_count','N') == 'Y'){ + $cpt_ids = json_dec($request->get('cpt_ids', '[]')); + foreach($userList as $key => $user) { + foreach($cpt_ids as $cpt_id) { + $count_name = $cpt_id.'_count'; + $user->addVisible($count_name); + + $user->$count_name = CptDocument::where('instance_id', $cpt_id)->where('user_id', $user->id)->count(); + } + } + } + + foreach($userList as $key => $user) $userList[$key] = $this->arrangeUserInfo($user,$request); + $paginate->setCollection($userList); + + // 순번 필드를 추가하여 transform + $paginate->getCollection()->transform(function ($paginate) use ($total, $perPage, $currentPage, &$count) { + $paginate->seq = ($total - ($perPage * ($currentPage - 1))) - $count; + $count++; + return $paginate; + }); + + return XePresenter::makeApi(['error' => 0, 'message' => 'Complete', 'paginate' => $paginate]); + } + + public function user_groups() { + $userGorups = UserGroup::get()->keyBy('name'); + return $userGorups; + } + + //간단하게 스스로의 정보를 받은필드찾아서 업데이트한다. + public function userUpdate(Request $request){ + $loggedUser = $this->auth->user(); + + $inputs = $request->except('_token'); + $target_update_datas = []; + foreach($inputs as $key => $val){ +// if(!isset($loggedUser->{$key})) continue; + $target_update_datas[$key] = $val; + } + $result = $loggedUser->update($target_update_datas); + + $retObj = new BaseObject(); + $retObj->set('updated',$target_update_datas); + $retObj->set('result',$result); + + return $retObj->output(); + } + + public function makeOrder($query, $request) + { + $orderType = $request->get('order_type', ''); + + if ($orderType == '') { + // order_type 이 없을때만 dyFac Config 의 정렬을 우선 적용한다. + $orders = $request->get('orders', []); + foreach ($orders as $order) { + $arr_order = explode('|@|',$order); + $query->orderBy($arr_order[0], $arr_order[1]); + } + + } elseif ($orderType == 'display_name_asc') { + $query->orderBy('display_name', 'asc'); + } elseif ($orderType == 'display_name_desc') { + $query->orderBy('display_name', 'desc'); + } elseif ($orderType == 'email_asc') { + $query->orderBy('email', 'asc'); + } elseif ($orderType == 'email_desc') { + $query->orderBy('email', 'desc'); + } elseif ($orderType == 'login_id_asc') { + $query->orderBy('login_id', 'asc'); + } elseif ($orderType == 'login_id_desc') { + $query->orderBy('login_id', 'desc'); + } elseif ($orderType == 'created_at_asc') { + $query->orderBy('created_at', 'asc'); + } elseif ($orderType == 'created_at_desc') { + $query->orderBy('created_at', 'desc'); + } + $query->getProxyManager()->orders($query->getQuery(), $request->all()); + + return $query; + } + + private function updateSendbirdToken($tokenInfo){ + //토큰이 있으면 + if($tokenInfo->push_token == '' || $tokenInfo->push_token == null) return; + + // 필요한 플러그인이 활성화 되어있는지 검사한다. + $pluginHandler = app('xe.plugin'); + $sendbirdChat = $pluginHandler->getPlugin('sendbird_chat'); + if (!$sendbirdChat || $sendbirdChat->getStatus() != 'activated') return; + + $tokenType = "gcm"; + if(str_starts_with($tokenInfo->device_name,"iPhone") || str_starts_with($tokenInfo->device_name,"iPad")) $tokenType = "apns"; + app('amuz.sendbird.chat')->updateUserPushToken($tokenInfo->user_id,$tokenType,$tokenInfo->push_token); + } + + private function doLogin($request, $retObj, $user){ + switch ($user->status) { + case User::STATUS_PENDING_ADMIN: + $retObj->addError('ERR_PENDING_ADMIN','관리자 승인 대기중입니다.'); + break; + + case User::STATUS_PENDING_EMAIL: + $retObj->addError('ERR_PENDING_EMAIL','메일 인증이 완료되지 않았습니다.'); + break; + + default: + $token = $this->keygen->generate(); + $deviceInfo = $retObj->get('deviceInfo'); + $deviceInfo['token'] = $token; + $deviceInfo['user_id'] = $user->id; + $user_token = AhUserToken::firstOrNew(['device_id' => $deviceInfo['device_id'], 'user_id' => $user->id]); + foreach($deviceInfo as $key => $val) $user_token->{$key} = $val; + + $user_token->save(); + + //샌드버드플러그인이 설치되어있으면 토큰정보를 업데이트 해 준다. + $this->updateSendbirdToken($user_token); + + $retObj->setMessage("로그인에 성공하였습니다."); + $retObj->set('user',$this->arrangeUserInfo($user,$request)); + $retObj->set('remember_token',$token); + break; + } + + //로그인 시점에 샌드버드와 회원정보 동기화 + if(Schema::hasTable('sendbird_user_token')){ + $sendBirdChatApp = app('amuz.sendbird.chat'); + $sendBirdChatApp->syncUserData($user->id); + } + + return $retObj; + } + + private function arrangeUserInfo($user,$request){ + $user->addVisible('email'); + $user->addVisible('login_id'); + + $user_groups = $user->groups; + $user->setRelation('groups', $user->groups->keyBy('id')); + $user->addVisible('groups'); + + if($request->get('near_target','') != '' && $request->get('lat','') != '' && $request->get('lng','') != ''){ + $user->addVisible('field_id'); + $user->addVisible('distance'); + } + + $userFieldTypes = $this->xeDynamicField->gets('user'); + + // 그룹별 필드 데이터 불러와서 넣기 + $dummy = $this->userTypeHandler->getDynamicFieldData($userFieldTypes, 'user', $user->id); + foreach($dummy as $key => $val){ + $user->$key = $val; + $user->addVisible($key); + } + + foreach ($user_groups as $user_group) { + $user_group->fieldTypes = $this->xeDynamicField->gets($user_group->id); + $fieldValues = []; + + // 그룹별 필드 데이터 불러와서 넣기 + $dummy = $this->userTypeHandler->getDynamicFieldData($user_group->fieldTypes, $user_group->id, $user->id); + + foreach($dummy as $key => $val){ + $fieldValues[$key] = $val; + $user->$key = $val; + $user->addVisible($key); + } + $user_group->fieldValues = $fieldValues; + } + + $user->addVisible("review_total"); + $user->addVisible("designer_contract_count"); + $user->addVisible("model_contract_count"); + $user->addVisible("has_user_favorite"); + $user->review_total = 0; + $user->model_contract_count = 0; + $user->designer_contract_count = 0; + $user->has_user_favorite = false; + + //내가 좋아요한 회원 체크 + if(\Auth::check()) { + $user_id = \Auth::user()->getId(); + if($user_id !== $user->id) { + $favorite = FavoriteUser::where('user_id', $user_id)->where('favorite_target', $user->id)->first(); + if($favorite) $user->has_user_favorite = true; + } + } + + //별점 총 합 + if(CptDocument::where('instance_id', 'contract_details')->where('user_id', $user->id)->first()) { + $contract_details = CptDocument::where('instance_id', 'contract_details')->where('user_id', $user->id)->pluck('id'); + if(Target::whereIn('target_id', $contract_details)->pluck('doc_id')->first()) { + $comment_list = Target::whereIn('target_id', $contract_details)->pluck('doc_id'); + $sum_total = 0; + $comment_count = 0; + if(\XeDB::table('field_xpressengine_number')->whereIn('target_id', $comment_list)->first()) { + $comments = \XeDB::table('field_xpressengine_number')->whereIn('target_id', $comment_list)->get(); + $sum_total = $comments->sum('num'); + $comment_count = $comments->count(); + } + if($sum_total > 0 && $comment_count > 0) { + $user->review_total = round($sum_total / $comment_count, 1); + } + } + } + + //모델 계약건수 + if(CptDocument::where('instance_id', 'contract_details')->where('user_id',$user->id)->first()) { + $model_contract_count = CptDocument::where('instance_id', 'contract_details')->where('user_id',$user->id)->count(); + $user->model_contract_count = $model_contract_count; + } + + //디자이너 계약건수 + $belong_document_id = $user->id; + $target_field = 'belong_designer'; + $target_document = 'contract_details'; + $targetDocument = XeUsers::where('id', $belong_document_id)->first(); + if ($targetDocument) { + if($targetDocument->hasDocument($target_field, $target_document)->first()) { + $targetDocumentIds = $targetDocument->hasDocument($target_field, $target_document)->pluck('id'); + $listCount = CptDocument::where('instance_id', 'contract_details')->whereIn('id', $targetDocumentIds)->count(); + $user->designer_contract_count = $listCount; + } + } + + if(Schema::hasTable('sendbird_user_token')){ + $sendBirdChatApp = app('amuz.sendbird.chat'); + $user->sendBird = $sendBirdChatApp->getSbToken($user->id); + $user->addVisible("sendBird"); + } + return $user; + } + + /** + * throw http exception + * + * @param string $msg massage + * @param null $code code + * @param null $previous previous + * + * @return void + * @throws HttpXpressengineException + */ + protected function throwHttpException($msg, $code = null, $previous = null) + { + $e = new HttpXpressengineException([], $code, $previous); + $e->setMessage($msg); + + throw $e; + } + public function isJson($string) { + return ((is_string($string) && + (is_object(json_decode($string)) || + is_array(json_decode($string))))) ? true : false; + } +} diff --git a/src/Controller.php b/src/Controller.php index 4fe35d2..d51464f 100644 --- a/src/Controller.php +++ b/src/Controller.php @@ -3,6 +3,7 @@ use Amuz\XePlugin\ApplicationHelper\Models\AhUserToken; use Amuz\XePlugin\ApplicationHelper\Models\AhUserAppleInfo; +use Amuz\XePlugin\Mimong\Models\FavoriteUser; use Carbon\Carbon; use Illuminate\Foundation\Auth\AuthenticatesUsers; use Illuminate\Http\Request; @@ -20,6 +21,7 @@ use App\Http\Controllers\Controller as BaseController; use Xpressengine\Keygen\Keygen; use Xpressengine\Menu\Models\MenuItem; +use Xpressengine\Plugins\Banner\Models\Group; use Xpressengine\Plugins\Board\ConfigHandler; use Xpressengine\Plugins\Board\Models\Board; use Xpressengine\Plugins\Board\Services\BoardService; @@ -33,8 +35,11 @@ use Xpressengine\User\Models\User; use Xpressengine\User\Models\UserGroup; use Xpressengine\User\UserHandler; +use Xpressengine\Plugins\Banner\Handler as BannerHandler; +use Xpressengine\Plugins\Comment\Models\Target; use Xpressengine\User\Models\User as XeUser; +use Overcode\XePlugin\DynamicFactory\Models\User as XeUsers; class Controller extends BaseController { @@ -162,6 +167,35 @@ public function getNavigator(BoardService $boardService,ConfigHandler $boardConf return $retObj->output(); } + public function getBanner(BannerHandler $handler,$banner_key) { + $site_key = \XeSite::getCurrentSiteKey(); + $xe_config = app('xe.config'); + $ah_config = $xe_config->get('application_helper'); + if($ah_config == null){ + $xe_config->set('application_helper',[]); + $ah_config = $xe_config->get('application_helper'); + } + + $ah_banner_groups = $ah_config->get('banner',[]); + $banner_config = $ah_banner_groups[$banner_key]; + $group_id = $banner_config['group']; + $group = Group::find($group_id); + $banner_items = $handler->getItems($group); + $banner_data = []; + foreach($banner_items as $banner) { + if($banner->image === "") continue; + $banner->slide_time = $banner_config['slide_time']; + $banner_data[] = $banner->toArray(); + } + + $retObj = new BaseObject(); + $retObj->set('site_key',$site_key); + $retObj->set('banner_key',$banner_key); + $retObj->set('banner_group_id',$group_id); + $retObj->set('banner_items',$banner_data); + return $retObj->output(); + } + //for dynamic factory public function getTaxonomiesByTaxonomyId($taxonomyKey) { $taxonomy = CategoryExtra::find($taxonomyKey); @@ -369,6 +403,16 @@ public function socialLogin(Request $request,Handler $socialLoginHandler,Sociali $userContract->setToken(Arr::get($authedToken, 'access_token')); break; + case "google" : + $userContract = (new \Laravel\Socialite\Two\User())->setRaw($authedUser)->map([ + 'id' => $authedUser['id'], + 'nickname' => Arr::get($authedUser, 'displayName'), + 'name' => Arr::get($authedUser, 'displayName'), + 'email' => Arr::get($authedUser, 'email'), + 'avatar' => Arr::get($authedUser, 'photoUrl'), + ]); + $userContract->setToken(Arr::get($authedToken, 'access_token')); + break; } if (app('xe.config')->getVal('user.register.joinable') === false) { @@ -397,6 +441,7 @@ public function socialLogin(Request $request,Handler $socialLoginHandler,Sociali $retObj = $this->doLogin($request, $retObj, $user); return redirect()->route('ah::closer',['remember_token'=>$retObj->get('remember_token'),'user'=>$retObj->get('user')]); } + //가입된 계정이 없을 경우 회원가입 if (app('xe.config')->getVal('social_login.registerType', 'simple') === 'step' && $socialLoginHandler->checkNeedRegisterForm($userContract) === false) { @@ -620,7 +665,7 @@ public function userList(Request $request) { if($request->get('search_taxonomy','') != ''){ //{allow_category_item_item_id: [313, 312, 311, 309, 351, 349], current_status_item_id: [], gender_boolean: []} $searchTargets = json_dec($request->get('search_taxonomy','[]')); - + $booleanTable = 'field_xpressengine_boolean'; foreach($searchTargets as $fieldId => $fieldInfo){ $fieldType = $fieldInfo[0]; $selectedValues = $fieldInfo[1]; @@ -631,12 +676,20 @@ public function userList(Request $request) { } break; case "boolean" : - $query->where(function($q) use ($fieldId,$selectedValues){ - foreach($selectedValues as $val){ - $q->orWhere($fieldId . '.boolean',$val); - } - }); - break; + foreach($selectedValues as $val) { + $table_name = 'boolean_'.$fieldId; + $query->join($booleanTable . ' as ' . $table_name, function ($join) use ($table_name, $fieldId, $val) { + $join->on('user.id', '=', $table_name.'.target_id')-> + where($table_name.'.field_id', $fieldId)-> + where($table_name.'.boolean', $val); + }); + } +// $query->where(function($q) use ($fieldId,$selectedValues){ +// foreach($selectedValues as $val){ +// $q->orWhere($fieldId . '.boolean',$val); +// } +// }); + break; } } @@ -651,6 +704,17 @@ public function userList(Request $request) { $count = 0; $userList = $paginate->getCollection()->keyBy('id'); + if($request->get('write_cpt_count','N') == 'Y'){ + $cpt_ids = json_dec($request->get('cpt_ids', '[]')); + foreach($userList as $key => $user) { + foreach($cpt_ids as $cpt_id) { + $count_name = $cpt_id.'_count'; + $user->addVisible($count_name); + + $user->$count_name = CptDocument::where('instance_id', $cpt_id)->where('user_id', $user->id)->count(); + } + } + } foreach($userList as $key => $user) $userList[$key] = $this->arrangeUserInfo($user,$request); $paginate->setCollection($userList); @@ -788,6 +852,15 @@ private function arrangeUserInfo($user,$request){ $user->addVisible('distance'); } + $userFieldTypes = $this->xeDynamicField->gets('user'); + + // 그룹별 필드 데이터 불러와서 넣기 + $dummy = $this->userTypeHandler->getDynamicFieldData($userFieldTypes, 'user', $user->id); + foreach($dummy as $key => $val){ + $user->$key = $val; + $user->addVisible($key); + } + foreach ($user_groups as $user_group) { $user_group->fieldTypes = $this->xeDynamicField->gets($user_group->id); $fieldValues = []; @@ -803,6 +876,82 @@ private function arrangeUserInfo($user,$request){ $user_group->fieldValues = $fieldValues; } + $user->addVisible("review_total"); + $user->addVisible("designer_contract_count"); + $user->addVisible("model_contract_count"); + $user->addVisible("has_user_favorite"); + $user->review_total = 0; + $user->model_contract_count = 0; + $user->designer_contract_count = 0; + $user->has_user_favorite = false; + + //내가 좋아요한 회원 체크 + if(\Auth::check()) { + $user_id = \Auth::user()->getId(); + if($user_id !== $user->id) { + $favorite = FavoriteUser::where('user_id', $user_id)->where('favorite_target', $user->id)->first(); + if($favorite) $user->has_user_favorite = true; + } + } + + //별점 총 합 + if(CptDocument::where('instance_id', 'contract_details')->where('user_id', $user->id)->first()) { + $contract_details = CptDocument::where('instance_id', 'contract_details')->where('user_id', $user->id)->pluck('id'); + if(Target::whereIn('target_id', $contract_details)->pluck('doc_id')->first()) { + $comment_list = Target::whereIn('target_id', $contract_details)->pluck('doc_id'); + $sum_total = 0; + $comment_count = 0; + + $check = \XeDB::table('field_xpressengine_number')-> + leftjoin('documents', 'field_xpressengine_number.target_id', 'documents.id')-> + where('field_xpressengine_number.num', '>', 0)-> + where('documents.user_id', '!=', $user->id)-> + where('documents.status', 30)-> + whereIn('field_xpressengine_number.target_id', $comment_list)->first(); + + if($check) { + $comments = \XeDB::table('field_xpressengine_number')-> + leftjoin('documents', 'field_xpressengine_number.target_id', 'documents.id')-> + where('field_xpressengine_number.num', '>', 0)-> + where('documents.user_id', '!=', $user->id)-> + where('documents.status', 30)-> + whereIn('field_xpressengine_number.target_id', $comment_list)->get(); + + $sum_total = $comments->sum('num'); + $comment_count = $comments->count(); + } + if($sum_total > 0 && $comment_count > 0) { + $user->review_total = round($sum_total / $comment_count, 1); + } + } + } + + //모델 계약건수 + if(CptDocument::where('instance_id', 'contract_details')->where('user_id',$user->id)->first()) { + $model_contract_count = CptDocument::where('instance_id', 'contract_details')->where('user_id',$user->id)->count(); + $user->model_contract_count = $model_contract_count; + } + + //디자이너 계약건수 + $belong_document_id = $user->id; + $target_field = 'belong_designer'; + $target_document = 'contract_details'; + $targetDocument = XeUsers::where('id', $belong_document_id)->first(); + if ($targetDocument) { + if($targetDocument->hasDocument($target_field, $target_document)->first()) { + $targetDocumentIds = $targetDocument->hasDocument($target_field, $target_document)->pluck('id'); + $listCount = CptDocument::where('instance_id', 'contract_details')->whereIn('id', $targetDocumentIds)->count(); + $user->designer_contract_count = $listCount; + } + } + + //노쇼 신고당한 횟수 + $user->addVisible("no_show_count"); + $user->no_show_count = 0; + + if(XeUsers::where('id', $user->id)->first()->hasDocument('target_user')->where('instance_id', 'cb05daaf')->first()) + $user->no_show_count = XeUsers::where('id', $user->id)->first()->hasDocument('target_user')->where('instance_id', 'cb05daaf')->count(); + if(Schema::hasTable('sendbird_user_token')){ $sendBirdChatApp = app('amuz.sendbird.chat'); $user->sendBird = $sendBirdChatApp->getSbToken($user->id); diff --git a/src/InAppBrowsers/RegisterController.php b/src/InAppBrowsers/RegisterController.php index 32dec7c..fa29b21 100644 --- a/src/InAppBrowsers/RegisterController.php +++ b/src/InAppBrowsers/RegisterController.php @@ -80,12 +80,66 @@ public function postGroupSelect(Request $request) if(empty($request->get('select_group_id'))) { return redirect()->back()->with('alert', ['type' => 'error', 'message' => '가입 회원 유형을 선택 해 주세요.']); }else{ +// dd($request->get('select_group_id')); $request->session()->put('select_group_id', $request->get('select_group_id')); } // return redirect()->route('ahib::user_register', $request->except('_token')); return $this->userTypesGetRegister($request); } + public function postTermAgree(Request $request) + { + $terms = $this->termsHandler->fetchRequireEnabled(); + + // 선택된 그룹에 매칭된 약관 id 를 가져온다 + $group_id = $request->session()->get('select_group_id'); + $group_config = app('amuz.usertype.config')->get($group_id); + if($group_config !== null) { + $selected_terms = $group_config->get('selected_terms') ? $group_config->get('selected_terms') : []; + + // 선택 안된 약관은 삭제 + foreach ($terms as $key => $term) { + if (!in_array($term->id, $selected_terms)) { + unset($terms[$key]); + } + } + } + + $rule = []; + foreach ($terms as $term) { + $rule[$term->id] = 'bail|accepted'; + } + + $this->validate( + $request, + $rule, + ['*.accepted' => xe_trans('xe::pleaseAcceptRequireTerms')] + ); + + $userAgreeTerms = []; + $enableTerms = $this->termsHandler->fetchEnabled(); + foreach ($enableTerms as $enableTerm) { + if ($request->has($enableTerm->id) === true) { + $userAgreeTerms[] = $enableTerm->id; + } + } + + $request->session()->put('user_agree_terms', $userAgreeTerms); + $request->session()->flash('pass_agree'); + $request->session()->forget('select_group_id'); + $request = $request->merge(['select_group_id' => $group_id]); + + $pluginHandler = app('xe.plugin'); + $user_types = $pluginHandler->getPlugin('user_types'); + + if (!$user_types || $user_types->getStatus() != 'activated') { + return parent::getRegister($request); // TODO: Change the autogenerated stub + } else{ + return $this->userTypesGetRegister($request, $group_id); + } + } + + /** * Show the application registration form. * @@ -215,9 +269,10 @@ protected function userTypesGetRegisterForm(Request $request) $userTypesPlugin = true; } + $terms = $this->termsHandler->fetchEnabled(); return \XePresenter::make('register.create', compact( - 'config', 'parts', 'groupConfig', 'select_group_id', 'userContract', 'providerName', 'isEmailDuplicated', 'userTypesPlugin' + 'config', 'parts', 'groupConfig', 'select_group_id', 'userContract', 'providerName', 'isEmailDuplicated', 'userTypesPlugin', 'terms' ) ); } @@ -275,7 +330,8 @@ public function userTypesPostRegister(Request $request) $requireTerms = app('xe.terms')->fetchRequireEnabled(); $termAgreeType = app('xe.config')->getVal('user.register.term_agree_type'); - if ($requireTerms->count() > 0 && $termAgreeType !== UserRegisterHandler::TERM_AGREE_NOT) { + // UserRegisterHandler::TERM_AGREE_PRE = 회원약관 동의가 회원정보 입력전에 출력 될 경우 + if ($requireTerms->count() > 0 && $termAgreeType !== UserRegisterHandler::TERM_AGREE_PRE) { $requireTermValidator = Validator::make( $request->all(), [], @@ -309,6 +365,9 @@ function ($input) use ($requireTerms) { $user = $this->registerUser($request->except(['_token'])); $userData['id'] = $user->id; // 생성된 user id app('amuz.usertype.handler')->insertDf($userData); // 회원 그룹별 확장 필드 저장 + if(isset($request->profile_img_id) && $request->profile_img_id !== '' && $request->profile_img_id) { + \XeDB::table('user')->where('id', $user->id)->update(['profile_image_id' => $request->profile_img_id]); + }; } catch (ExistsAccountException $e) { XeDB::rollback(); $this->throwHttpException(xe_trans('user_types::alreadyRegisteredAccount'), 409, $e); @@ -331,6 +390,9 @@ function ($input) use ($requireTerms) { $user = $this->handler->create($userData); $userData['id'] = $user->id; // 생성된 user id app('amuz.usertype.handler')->insertDf($userData); // 회원 그룹별 확장 필드 저장 + if(isset($request->profile_img_id) && $request->profile_img_id !== '' && $request->profile_img_id) { + \XeDB::table('user')->where('id', $user->id)->update(['profile_image_id' => $request->profile_img_id]); + }; } catch (\Exception $e) { XeDB::rollback(); throw $e; diff --git a/src/Middleware/AmuzApiHelpers.php b/src/Middleware/AmuzApiHelpers.php index 610ca6f..4b1adaf 100644 --- a/src/Middleware/AmuzApiHelpers.php +++ b/src/Middleware/AmuzApiHelpers.php @@ -29,6 +29,10 @@ public function handle(Request $request, Closure $next) // return $retObj->output(); }else{ $auth->login($user); + + if(\Schema::hasTable('sendbird_user_token')) { + $this->updateSendbirdToken($token); + } } // }else{ // $retObj = new BaseObject(); @@ -38,4 +42,19 @@ public function handle(Request $request, Closure $next) } return $next($request); } + + private function updateSendbirdToken($tokenInfo){ + //토큰이 있으면 + if($tokenInfo->push_token == '' || $tokenInfo->push_token == null) return; + + // 필요한 플러그인이 활성화 되어있는지 검사한다. + $pluginHandler = app('xe.plugin'); + $sendbirdChat = $pluginHandler->getPlugin('sendbird_chat'); + if (!$sendbirdChat || $sendbirdChat->getStatus() != 'activated') return; + + $tokenType = "gcm"; + if(str_starts_with($tokenInfo->device_name,"iPhone") || str_starts_with($tokenInfo->device_name,"iPad")) $tokenType = "apns"; + app('amuz.sendbird.chat')->updateUserPushToken($tokenInfo->user_id,$tokenType,$tokenInfo->push_token); + if(\Schema::hasTable('sendbird_user_token')) app('amuz.sendbird.chat')->syncUserData($tokenInfo->user_id); + } } diff --git a/src/SettingsController.php b/src/SettingsController.php index b8e6741..4ec6e6d 100644 --- a/src/SettingsController.php +++ b/src/SettingsController.php @@ -9,8 +9,9 @@ use Illuminate\Support\Str; use Xpressengine\Http\Request; use Xpressengine\Menu\Models\Menu; +use Xpressengine\Plugins\Banner\Models\Group; use Xpressengine\Routing\InstanceRoute; -use Xpressengine\Plugins\Banner\Handler; +use Xpressengine\Plugins\Banner\Handler as BannerHandler; class SettingsController extends BaseController { @@ -174,20 +175,42 @@ public function saveConfig(Request $request, $type){ $xe_config->setVal('application_helper.'.$type,$options); break; + case "banner" : + $keys = $request->get('keys'); + $groups = $request->get('groups'); + $slide_time = $request->get('slide_time'); + $bannerGroup = []; + foreach($keys as $key => $groupKeyId) { + $bannerGroup[$groupKeyId] = [ + 'group' => $groups[$key], + 'slide_time' => $slide_time[$key] + ]; + } + $xe_config->setVal('application_helper.'.$type,$bannerGroup); + + break; } return redirect()->back()->with('alert', ['type' => 'success', 'message' => xe_trans('xe::saved')]); } - public function banner_config_index(Handler $handler, Request $request) { + public function banner_config_index(BannerHandler $handler, Request $request) { $title = '어플리케이션 배너 설정'; $description = '어플리케이션 배너 설정입니다'; // set browser title XeFrontend::title($title); - $banner_group = $handler->getGroups(); + $xe_config = app('xe.config'); + $ah_config = $xe_config->get('application_helper'); + if($ah_config == null){ + $xe_config->set('application_helper',[]); + $ah_config = $xe_config->get('application_helper'); + } + $ah_banner_groups = $ah_config->get('banner',[]); + $groups = app('xe.banner')->getGroups(); + $banner_group = $handler->getGroups(); $app_config = app('xe.config')->get('application_helper.app_config'); if(!$app_config->get('groups') || count($app_config->get('groups')) <= 0) { $app_config['groups'] = [ @@ -198,68 +221,82 @@ public function banner_config_index(Handler $handler, Request $request) { 'groups' => $app_config['groups'] ]); } - $app_banner_groups = $app_config['groups']; - - $menus = Menu::where('site_key',\XeSite::getCurrentSiteKey())->get(); - $main_banner = $app_config->get('banner_list'); - $idx = 0; - $str = Str::random(8); - foreach($main_banner as $key => $banner_item) { - $idx++; - $item = $this->setBannerOptions($banner_item); - - if(!isset($item['idx']) || $item['idx'] === '') { - $item['idx'] = $str.'_'.$idx; - } - - if($item === null) { - unset($main_banner[$key]); - continue; +// +// $menus = Menu::where('site_key',\XeSite::getCurrentSiteKey())->get(); +// $main_banner = $app_config->get('banner_list'); +// $idx = 0; +// $str = Str::random(8); +// foreach($main_banner as $key => $banner_item) { +// $idx++; +// $item = $this->setBannerOptions($banner_item); +// +// if(!isset($item['idx']) || $item['idx'] === '') { +// $item['idx'] = $str.'_'.$idx; +// } +// +// if($item === null) { +// unset($main_banner[$key]); +// continue; +// } +// +// $menus = Menu::where('site_key',\XeSite::getCurrentSiteKey())->get(); +// if(!isset($banner_item['menu'])) $item['menu'] = $menus[0]->id; +// else if($banner_item['menu'] === '') $item['menu'] = $menus[0]->id; +// else $item['menu'] = $banner_item['menu']; +// $main_banner[$key] = $item; +// } +// +// $sortArr = array(); +// foreach($main_banner as $res) $sortArr [] = $res['menu']; +// array_multisort($sortArr , SORT_ASC, $main_banner); +// +// $content_banner = $app_config->get('content_banner_list'); +// foreach($content_banner as $key => $banner_item) { +// $item = $this->setBannerOptions($banner_item); +// $idx++; +// +// if($item === null) { +// unset($content_banner[$key]); +// continue; +// } +// +// if(!isset($item['idx'])) { +// $item['idx'] = $str.'_'.$idx; +// } +// +// $menus = Menu::where('site_key',\XeSite::getCurrentSiteKey())->get(); +// if(!isset($banner_item['menu'])) $item['menu'] = $menus[0]->id; +// else if($banner_item['menu'] === '') $item['menu'] = $menus[0]->id; +// else $item['menu'] = $banner_item['menu']; +// $content_banner[$key] = $item; +// } +// $sortArr = array(); +// foreach($content_banner as $res) $sortArr [] = $res['menu']; +// array_multisort($sortArr , SORT_ASC, $content_banner); + $banner_data = []; + foreach($ah_banner_groups as $key => $item) { + $banner_config = $ah_banner_groups[$key]; + $group_id = $banner_config['group']; + $group = Group::find($group_id); + $banner_items = $handler->getItems($group); + foreach($banner_items as $banner) { + if($banner->image === "") continue; + $banner->slide_time = (int) $banner_config['slide_time']; + $banner_data[$key][] = $banner->toArray(); } - - $menus = Menu::where('site_key',\XeSite::getCurrentSiteKey())->get(); - if(!isset($banner_item['menu'])) $item['menu'] = $menus[0]->id; - else if($banner_item['menu'] === '') $item['menu'] = $menus[0]->id; - else $item['menu'] = $banner_item['menu']; - $main_banner[$key] = $item; } - - $sortArr = array(); - foreach($main_banner as $res) $sortArr [] = $res['menu']; - array_multisort($sortArr , SORT_ASC, $main_banner); - - $content_banner = $app_config->get('content_banner_list'); - foreach($content_banner as $key => $banner_item) { - $item = $this->setBannerOptions($banner_item); - $idx++; - - if($item === null) { - unset($content_banner[$key]); - continue; - } - - if(!isset($item['idx'])) { - $item['idx'] = $str.'_'.$idx; - } - - $menus = Menu::where('site_key',\XeSite::getCurrentSiteKey())->get(); - if(!isset($banner_item['menu'])) $item['menu'] = $menus[0]->id; - else if($banner_item['menu'] === '') $item['menu'] = $menus[0]->id; - else $item['menu'] = $banner_item['menu']; - $content_banner[$key] = $item; - } - $sortArr = array(); - foreach($content_banner as $res) $sortArr [] = $res['menu']; - array_multisort($sortArr , SORT_ASC, $content_banner); - app('xe.config')->set('application_helper.app_config', [ - 'banner_list' => $main_banner, - 'content_banner_list' => $content_banner + 'ah_banner_config' => $banner_data ]); +// dd(app('xe.config')->get('application_helper.app_config')); + // output return XePresenter::make('ApplicationHelper::views.settings.banner.index', - compact('title', 'description', 'banner_group', 'app_config', 'main_banner', 'content_banner', 'app_banner_groups', 'menus', 'str')); + compact('title', 'description', 'banner_group', 'groups', 'ah_banner_groups')); + return XePresenter::make('ApplicationHelper::views.settings.banner.index', + compact('title', 'description', 'banner_group', 'groups', 'ah_banner_groups', + 'app_config', 'main_banner', 'content_banner', 'app_banner_groups', 'menus', 'str')); } public function config_update(Request $request) { diff --git a/src/.Controller.php.swp b/src/swap.backup similarity index 100% rename from src/.Controller.php.swp rename to src/swap.backup diff --git a/views/settings/banner/index.blade.php b/views/settings/banner/index.blade.php index aaa80ba..0b92825 100644 --- a/views/settings/banner/index.blade.php +++ b/views/settings/banner/index.blade.php @@ -1,8 +1,8 @@ -@php - $link = route('banner::group.edit', ['group_id' => '']); - $bannerGroupEditLink = str_replace('//edit', '', $link); - $idx = count($main_banner) + count($content_banner); -@endphp + +{{-- $link = route('banner::group.edit', ['group_id' => '']);--}} +{{-- $bannerGroupEditLink = str_replace('//edit', '', $link);--}} +{{-- $idx = count($main_banner) + count($content_banner);--}} + @section('page_title')

{{$title}}

@@ -11,9 +11,32 @@ @section('page_description') {!! $description !!} @endsection - - - + + + + + + + +
+ + + + + + + 삭제 +
+ +{{----}} +{{----}} +{{----}}
@@ -23,127 +46,51 @@
-
+ - - - -
-
-
-

- 앱 메인 배너 선택 -

-
-
- 배너 선택 -
-
- - - - - - + + + + - - @foreach($main_banner as $banner) - - - + + + + + + + @foreach($ah_banner_groups as $key => $item) + - - - - @endforeach - - -
제목배너이미지그룹슬라이드시간(초)생성일관리배너키배너그룹 선택슬라이드 시간기능
{{$banner['title']}}
+ 추가 +
- -{{-- --}} + {{$banner['created_at']}} - 배너그룹 관리 - 리스트 삭제 +
-
-
-
-
-
-
- -
-
-
-
-
-
-
-

- 앱 컨텐츠 배너 선택 -

-
-
- 배너 선택 -
-
- -
- - - - - - - - - - - - - @foreach($content_banner as $banner) - - - - - @endforeach @@ -156,7 +103,6 @@ -
@@ -165,237 +111,389 @@
- - - -
제목배너이미지그룹슬라이드시간(초)생성일관리
{{$banner['title']}} - -{{-- --}} + {{$banner['created_at']}} - 배너그룹 관리 - 리스트 삭제 + 삭제
--}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- @foreach($main_banner as $banner)--}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- @endforeach--}} -
- -
제목배너이미지그룹슬라이드시간(초)생성일관리
{{$banner['title']}}--}} +{{-- --}} +{{-- --}} +{{-- {{$banner['created_at']}}--}} +{{-- 배너그룹 관리--}} +{{-- 리스트 삭제--}} +{{--
- - - - - - - - - - - - - - - - - - - -
제목상태생성일관리
-
-
-
- 취소 +{{-- --}} +{{-- --}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} + +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--

--}} +{{-- 앱 컨텐츠 배너 선택--}} +{{--

--}} +{{--
--}} +{{--
--}} +{{-- 배너 선택--}} +{{--
--}} +{{--
--}} + +{{--
--}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- @foreach($content_banner as $banner)--}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- @endforeach--}} + +{{-- --}} +{{--
제목배너이미지그룹슬라이드시간(초)생성일관리
{{$banner['title']}}--}} +{{-- --}} +{{-- --}} +{{-- {{$banner['created_at']}}--}} +{{-- 배너그룹 관리--}} +{{-- 리스트 삭제--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}} + +{{--
--}} +{{--
--}} +{{-- --}} +{{--
--}} +{{--
--}} +{{--
--}} +{{-- --}}
- - +{{-- +{{-- }--}} +{{-- });--}} +{{-- }--}} +{{-- function getItemMenu(item, idx, target) {--}} +{{-- var banner_list = '';--}} + +{{-- if(target === 'main') banner_list = JSON.parse($('input[name=banner_list]').val());--}} +{{-- else banner_list = JSON.parse($('input[name=content_banner_list]').val());--}} +{{-- for(let banner of banner_list) {--}} +{{-- if(banner.idx === idx) {--}} +{{-- banner.menu = item.value;--}} +{{-- break;--}} +{{-- }--}} +{{-- }--}} +{{-- if(target === 'main') $('input[name=banner_list]').val(JSON.stringify(banner_list));--}} +{{-- else $('input[name=content_banner_list]').val(JSON.stringify(banner_list));--}} +{{-- }--}} + +{{-- function setBannerTimer(item, idx, target) {--}} +{{-- var banner_list = '';--}} + +{{-- if(target === 'main') banner_list = JSON.parse($('input[name=banner_list]').val());--}} +{{-- else banner_list = JSON.parse($('input[name=content_banner_list]').val());--}} + +{{-- for(let banner of banner_list) {--}} +{{-- if(banner.idx === idx) {--}} +{{-- banner.slide_time = item.value;--}} +{{-- break;--}} +{{-- }--}} +{{-- }--}} + +{{-- if(target === 'main') $('input[name=banner_list]').val(JSON.stringify(banner_list));--}} +{{-- else $('input[name=content_banner_list]').val(JSON.stringify(banner_list));--}} +{{-- }--}} +{{-- function removeBannerItem(Banner_target, idx) {--}} +{{-- $('#' + Banner_target + '_' + idx).remove();--}} + +{{-- var banner_list = '';--}} + +{{-- if(Banner_target === 'main') banner_list = JSON.parse($('input[name=banner_list]').val());--}} +{{-- else banner_list = JSON.parse($('input[name=content_banner_list]').val());--}} + +{{-- for(let i = 0; i < banner_list.length; i++) {--}} +{{-- if(banner_list[i].idx === idx) {--}} +{{-- banner_list.splice(i, 1);--}} +{{-- break;--}} +{{-- }--}} +{{-- }--}} + +{{-- if(Banner_target === 'main') $('input[name=banner_list]').val(JSON.stringify(banner_list));--}} +{{-- else $('input[name=content_banner_list]').val(JSON.stringify(banner_list));--}} +{{-- }--}} +{{----}}