From 444c07dd2c91e898a3f71b042de6a36275590b17 Mon Sep 17 00:00:00 2001 From: Christian Bohollo Date: Mon, 18 Nov 2019 11:50:03 +0100 Subject: [PATCH] Fix session --- src/admin/accions/AuthController.php | 2 +- src/admin/accions/admin_default.php | 2 + src/admin/accions/admin_delete_image.php | 36 ++++++------ src/admin/accions/admin_delete_image2.php | 1 + .../admin_delete_relation_instance_all.php | 49 +++++++++-------- src/admin/accions/admin_get_main.php | 1 + src/admin/accions/admin_list_class_export.php | 8 +-- src/admin/accions/admin_list_class_import.php | 55 +++++-------------- src/admin/accions/admin_new_instance.php | 6 +- src/admin/accions/admin_order_down.php | 48 ++++++++-------- src/admin/accions/admin_order_down_bottom.php | 48 ++++++++-------- src/admin/accions/admin_order_up.php | 48 ++++++++-------- src/admin/accions/admin_order_up_top.php | 48 ++++++++-------- src/admin/accions/admin_unlinked_images.php | 1 + src/admin/accions/admin_upload_crop.php | 3 +- 15 files changed, 169 insertions(+), 187 deletions(-) diff --git a/src/admin/accions/AuthController.php b/src/admin/accions/AuthController.php index 6b79f5d..2218b34 100644 --- a/src/admin/accions/AuthController.php +++ b/src/admin/accions/AuthController.php @@ -5,7 +5,7 @@ use Omatech\Editora\Admin\Middleware\EditoraAuth; use Omatech\Editora\Admin\Middleware\EditoraLocale; use Omatech\Editora\Admin\Models\layout; - +use Illuminate\Support\Facades\Session; class AuthController extends BaseController { diff --git a/src/admin/accions/admin_default.php b/src/admin/accions/admin_default.php index 4e66779..7c17108 100755 --- a/src/admin/accions/admin_default.php +++ b/src/admin/accions/admin_default.php @@ -2,6 +2,8 @@ namespace Omatech\Editora\Admin\Accions; +use Illuminate\Support\Facades\Session; + class AdminDefault extends BaseController { public function render() diff --git a/src/admin/accions/admin_delete_image.php b/src/admin/accions/admin_delete_image.php index 77577b8..e143a75 100755 --- a/src/admin/accions/admin_delete_image.php +++ b/src/admin/accions/admin_delete_image.php @@ -1,24 +1,24 @@ testSession()==0) { - $sc->endSession(); - } - else { - $params=get_params_info(); +use Illuminate\Support\Facades\Session; - $ly=new layout(); - $in=new instances(); - $at=new attributes(); - $ly_t=new layout_template(); - $in_t=new instances_template(); + $sc=new security(); +if ($sc->testSession()==0) { + $sc->endSession(); +} else { + $params=get_params_info(); - $params['p_mode']='V'; + $ly=new layout(); + $in=new instances(); + $at=new attributes(); + $ly_t=new layout_template(); + $in_t=new instances_template(); - $title=EDITORA_NAME." -> ".getMessage('info_delete_image'); - $ly_t->pinta_CommonLayout($top_menu, $buscador, $last_accessed, $favorites, $special, $ly, $in, $lg, $params); - $body=$in_t->imagesConfirm(); + $params['p_mode']='V'; - $_REQUEST['view']='container'; - } -?> \ No newline at end of file + $title=EDITORA_NAME." -> ".getMessage('info_delete_image'); + $ly_t->pinta_CommonLayout($top_menu, $buscador, $last_accessed, $favorites, $special, $ly, $in, $lg, $params); + $body=$in_t->imagesConfirm(); + + $_REQUEST['view']='container'; +} diff --git a/src/admin/accions/admin_delete_image2.php b/src/admin/accions/admin_delete_image2.php index 6a8470f..43220e7 100755 --- a/src/admin/accions/admin_delete_image2.php +++ b/src/admin/accions/admin_delete_image2.php @@ -4,6 +4,7 @@ use Omatech\Editora\Admin\Models\Instances; use Omatech\Editora\Admin\Templates\InstancesTemplate; +use Illuminate\Support\Facades\Session; class AdminDeleteImage2 extends AuthController { diff --git a/src/admin/accions/admin_delete_relation_instance_all.php b/src/admin/accions/admin_delete_relation_instance_all.php index cd4d30f..432e159 100755 --- a/src/admin/accions/admin_delete_relation_instance_all.php +++ b/src/admin/accions/admin_delete_relation_instance_all.php @@ -1,28 +1,31 @@ testSession()==0) { - $sc->endSession(); - } - else { - $params=get_params_info(); + use Illuminate\Support\Facades\Session; - $ly=new layout(); - $in=new instances(); - $at=new attributes(); - $ly_t=new layout_template(); - $at_t=new attributes_template(); + $sc=new security(); +if ($sc->testSession()==0) { + $sc->endSession(); +} else { + $params=get_params_info(); - $in->deleteRelationInstance($params); - $in->refreshCache($params); - if ($in) $message=html_message_ok(getMessage('info_word_deletejoin')); - else $message=html_message_ok(getMessage('info_word_deletejoin_error')); - - $title=EDITORA_NAME." -> ".getMessage('info_view_object'); - $ly_t->pinta_CommonLayout($top_menu, $buscador, $last_accessed, $favorites, $special, $ly, $in, $lg, $params); - $body=$at_t->instanceAttributes_view($at->getInstanceAttributes('V', $params), $params); - $parents=$ly_t->paintParentsList($in->getParents($params),$params); + $ly=new layout(); + $in=new instances(); + $at=new attributes(); + $ly_t=new layout_template(); + $at_t=new attributes_template(); - $_REQUEST['view']='container'; - } -?> \ No newline at end of file + $in->deleteRelationInstance($params); + $in->refreshCache($params); + if ($in) { + $message=html_message_ok(getMessage('info_word_deletejoin')); + } else { + $message=html_message_ok(getMessage('info_word_deletejoin_error')); + } + + $title=EDITORA_NAME." -> ".getMessage('info_view_object'); + $ly_t->pinta_CommonLayout($top_menu, $buscador, $last_accessed, $favorites, $special, $ly, $in, $lg, $params); + $body=$at_t->instanceAttributes_view($at->getInstanceAttributes('V', $params), $params); + $parents=$ly_t->paintParentsList($in->getParents($params), $params); + + $_REQUEST['view']='container'; +} diff --git a/src/admin/accions/admin_get_main.php b/src/admin/accions/admin_get_main.php index f13b3c7..6acaaa7 100755 --- a/src/admin/accions/admin_get_main.php +++ b/src/admin/accions/admin_get_main.php @@ -4,6 +4,7 @@ use Omatech\Editora\Admin\Models\Instances; use Omatech\Editora\Admin\Templates\InstancesTemplate; +use Illuminate\Support\Facades\Session; class AdminGetMain extends AuthController { diff --git a/src/admin/accions/admin_list_class_export.php b/src/admin/accions/admin_list_class_export.php index 8207846..2e7fbbe 100644 --- a/src/admin/accions/admin_list_class_export.php +++ b/src/admin/accions/admin_list_class_export.php @@ -2,7 +2,6 @@ namespace Omatech\Editora\Admin\Accions; - use Omatech\Editora\Admin\Models\Instances; use Omatech\Editora\Admin\Models\Security; use Omatech\Editora\Admin\Models\statictext; @@ -12,6 +11,7 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Writer\Xlsx; use PhpOffice\PhpSpreadsheet\IOFactory; +use Illuminate\Support\Facades\Session; class AdminListClassExport extends AuthController { @@ -38,9 +38,9 @@ public function render() //$spreadsheet->getActiveSheet()->setCellValueByColumnAndRow(0, 1 , 'S#nom_intern'); - foreach ($attributes as $key=>$attribute){ + foreach ($attributes as $key => $attribute) { //Nomes camps strings per ara - $spreadsheet->getActiveSheet()->setCellValueByColumnAndRow($key+1, 1 , $attribute['type'].'#'.$attribute['name']); + $spreadsheet->getActiveSheet()->setCellValueByColumnAndRow($key+1, 1, $attribute['type'].'#'.$attribute['name']); } $writer = new Xlsx($spreadsheet); @@ -52,4 +52,4 @@ public function render() header('Cache-Control: max-age=0'); $writer->save('php://output'); } -} \ No newline at end of file +} diff --git a/src/admin/accions/admin_list_class_import.php b/src/admin/accions/admin_list_class_import.php index e559fac..6812cf5 100644 --- a/src/admin/accions/admin_list_class_import.php +++ b/src/admin/accions/admin_list_class_import.php @@ -2,7 +2,6 @@ namespace Omatech\Editora\Admin\Accions; - use Omatech\Editora\Admin\Models\Instances; use Omatech\Editora\Admin\Models\Security; use Omatech\Editora\Admin\Models\statictext; @@ -13,6 +12,7 @@ use PhpOffice\PhpSpreadsheet\Writer\Xlsx; use PhpOffice\PhpSpreadsheet\IOFactory; use SKAgarwal\GoogleApi\PlacesApi; +use Illuminate\Support\Facades\Session; class AdminListClassImport extends AuthController { @@ -53,15 +53,12 @@ public function render() $count_rows = 0; foreach ($objPHPExcel->getWorksheetIterator() as $worksheet) { - $values = ''; $count = 0; $have_niceurl = false; foreach ($worksheet->getRowIterator() as $row) { - - $cellIterator = $row->getCellIterator(); $cellIterator->setIterateOnlyExistingCells(true); // Loop all cells, even if it is not set @@ -70,12 +67,9 @@ public function render() foreach ($cellIterator as $key => $cell) { $attributes[$key] = $cell->getValue(); } - } else { - $instance = array(); foreach ($cellIterator as $key => $cell) { - $type_attribute = explode('#', $attributes[$key]); //S, U, K, T, Y @@ -88,10 +82,8 @@ public function render() $value_attr = $cell->getValue(); - if ( !empty($value) ) { - + if (!empty($value)) { switch ($excel_type_attribute) { - case 'B': $instance[$excel_attribute] = $value; break; @@ -127,7 +119,7 @@ public function render() case 'M': //map $maps = $this->searchAddressOnGoogle($value); - if(isset($maps['geometry']) && isset($maps['geometry']['location']) && isset($maps['geometry']['location']['lat']) && isset($maps['geometry']['location']['lng']) ){ + if (isset($maps['geometry']) && isset($maps['geometry']['location']) && isset($maps['geometry']['location']['lat']) && isset($maps['geometry']['location']['lng'])) { $instance[$excel_attribute] = $maps['geometry']['location']['lat'].':'.$maps['geometry']['location']['lng'].'@'.$value; } @@ -144,9 +136,7 @@ public function render() break; case 'S': - if (strcmp($excel_attribute, 'nom_intern') == 0) { - $inst_id = 1; $count = 0; @@ -158,7 +148,6 @@ public function render() $count++; } $instance[$excel_attribute] = $value; - } else { $instance[$excel_attribute] = $value; } @@ -166,7 +155,6 @@ public function render() break; case 'T': - $instance[$excel_attribute] = $value; break; @@ -181,16 +169,15 @@ public function render() break; case 'Z': - if (!empty($value)) { - $value = str_replace(".","-",$value); - $value = str_replace(",","-",$value); - $value = str_replace(" ","-",$value); - $value = str_replace("-----","-",$value); - $value = str_replace("----","-",$value); - $value = str_replace("---","-",$value); - $value = str_replace("--","-",$value); - if(strcmp(substr("value", -1) == '-' ) == 0 ){ + $value = str_replace(".", "-", $value); + $value = str_replace(",", "-", $value); + $value = str_replace(" ", "-", $value); + $value = str_replace("-----", "-", $value); + $value = str_replace("----", "-", $value); + $value = str_replace("---", "-", $value); + $value = str_replace("--", "-", $value); + if (strcmp(substr("value", -1) == '-') == 0) { $value = substr($value, 0, -1); } @@ -201,10 +188,8 @@ public function render() $search = false; while ($end == false) { - //languages: 'all', 'ca', 'es', 'en' foreach ($langs as $lang) { - $nice_url = $loader->clean_url($value); if ($search == false) { @@ -224,7 +209,6 @@ public function render() $count++; $search = false; } - } $instance[$excel_attribute] = $loader->clean_url($value); @@ -232,23 +216,18 @@ public function render() } break; - } } - - } - if( !empty($instance) ){ + if (!empty($instance)) { $inst_id = $loader->insertInstanceWithExternalID($id_class, $instance['nom_intern'], '', $batch_id, $instance, 'P'); if (isset($inst_id) && !empty($inst_id) && $have_niceurl == true && isset($niceurls) && !empty($niceurls)) { foreach ($niceurls as $name_atr => $urlnice) { - $lang = explode('_', $name_atr); $lang = end($lang); if (!empty($urlnice)) { - $result = $loader->insertUrlNice($urlnice, $inst_id, $lang); } } @@ -256,35 +235,30 @@ public function render() if (isset($inst_id) && !empty($inst_id)) { $count_rows++; - } } } } - } $viewData['message'] = 'Good!'; $viewData['count_rows'] = $count_rows; return response()->view('editora::pages.list_classes_export', $viewData); - } public function searchAddressOnGoogle($address) - { $key = env('GOOGLE_API_KEY'); $googlePlaces = new PlacesApi($key); $response = $googlePlaces->placeAutocomplete($address); if ($response['status'] !== 'ZERO_RESULTS') { - $placeId = $response->first()[0]['place_id']; $response = $googlePlaces->placeDetails($placeId)['result']; - return $response; + return $response; $componentAddress = [ 'street_number' => 'short_name', @@ -309,6 +283,5 @@ public function searchAddressOnGoogle($address) ]; } return false; - } -} \ No newline at end of file +} diff --git a/src/admin/accions/admin_new_instance.php b/src/admin/accions/admin_new_instance.php index 54e0ded..c562101 100755 --- a/src/admin/accions/admin_new_instance.php +++ b/src/admin/accions/admin_new_instance.php @@ -6,6 +6,7 @@ use Omatech\Editora\Admin\Models\Instances; use Omatech\Editora\Admin\Models\Security; use Omatech\Editora\Admin\Models\editoraModel; +use Illuminate\Support\Facades\Session; class AdminNewInstance extends AuthController { @@ -26,12 +27,12 @@ public function render() $menu = $this->loadMenu($instances, $params); - if(Session::get('rol_id')==1 || $security->getAccess('insertable',$params)) { + if (Session::get('rol_id')==1 || $security->getAccess('insertable', $params)) { $instance = $at->getInstanceAttributes($p_mode, $params); $instance['instance_info']['class_id'] = $params['param1']; $class_info = $editora->get_class_info($params['param1']); $view ='editora::pages.instance'; - }else{ + } else { $instance['instance_info']=null; $title = getMessage('error_role_privileges'); $view ='editora::pages.permission_denied'; @@ -48,5 +49,4 @@ public function render() return response()->view($view, $viewData); } - } diff --git a/src/admin/accions/admin_order_down.php b/src/admin/accions/admin_order_down.php index 183c7f6..629a4aa 100755 --- a/src/admin/accions/admin_order_down.php +++ b/src/admin/accions/admin_order_down.php @@ -1,29 +1,29 @@ testSession()==0) { - $sc->endSession(); - } - else { - $params=get_params_info(); +use Illuminate\Support\Facades\Session; - $ly=new layout(); - $in=new instances(); - $at=new attributes(); - $re=new relations(); - $ly_t=new layout_template(); - $at_t=new attributes_template(); - $params['param1'] = $params['param10']; - $params['param2'] = $params['param11']; + $sc=new security(); +if ($sc->testSession()==0) { + $sc->endSession(); +} else { + $params=get_params_info(); - $message=html_message_ok($re->relationInstanceDown($params)); - $in->refreshCache($params); - - $title=EDITORA_NAME." -> ".getMessage('info_view_object'); - $ly_t->pinta_CommonLayout($top_menu, $buscador, $last_accessed, $favorites, $special, $ly, $in, $lg, $params); - $body=$at_t->instanceAttributes_view($at->getInstanceAttributes('V', $params), $params); - $parents=$ly_t->paintParentsList($in->getParents($params),$params); + $ly=new layout(); + $in=new instances(); + $at=new attributes(); + $re=new relations(); + $ly_t=new layout_template(); + $at_t=new attributes_template(); + $params['param1'] = $params['param10']; + $params['param2'] = $params['param11']; - $_REQUEST['view']='container'; - } -?> \ No newline at end of file + $message=html_message_ok($re->relationInstanceDown($params)); + $in->refreshCache($params); + + $title=EDITORA_NAME." -> ".getMessage('info_view_object'); + $ly_t->pinta_CommonLayout($top_menu, $buscador, $last_accessed, $favorites, $special, $ly, $in, $lg, $params); + $body=$at_t->instanceAttributes_view($at->getInstanceAttributes('V', $params), $params); + $parents=$ly_t->paintParentsList($in->getParents($params), $params); + + $_REQUEST['view']='container'; +} diff --git a/src/admin/accions/admin_order_down_bottom.php b/src/admin/accions/admin_order_down_bottom.php index b01f98a..81113b0 100755 --- a/src/admin/accions/admin_order_down_bottom.php +++ b/src/admin/accions/admin_order_down_bottom.php @@ -1,29 +1,29 @@ testSession()==0) { - $sc->endSession(); - } - else { - $params=get_params_info(); +use Illuminate\Support\Facades\Session; - $ly=new layout(); - $in=new instances(); - $at=new attributes(); - $re=new relations(); - $ly_t=new layout_template(); - $at_t=new attributes_template(); - $params['param1'] = $params['param10']; - $params['param2'] = $params['param11']; + $sc=new security(); +if ($sc->testSession()==0) { + $sc->endSession(); +} else { + $params=get_params_info(); - $message=html_message_ok($re->relationInstanceDownBottom($params)); - $in->refreshCache($params); - - $title=EDITORA_NAME." -> ".getMessage('info_view_object'); - $ly_t->pinta_CommonLayout($top_menu, $buscador, $last_accessed, $favorites, $special, $ly, $in, $lg, $params); - $body=$at_t->instanceAttributes_view($at->getInstanceAttributes('V', $params), $params); - $parents=$ly_t->paintParentsList($in->getParents($params),$params); + $ly=new layout(); + $in=new instances(); + $at=new attributes(); + $re=new relations(); + $ly_t=new layout_template(); + $at_t=new attributes_template(); + $params['param1'] = $params['param10']; + $params['param2'] = $params['param11']; - $_REQUEST['view']='container'; - } -?> \ No newline at end of file + $message=html_message_ok($re->relationInstanceDownBottom($params)); + $in->refreshCache($params); + + $title=EDITORA_NAME." -> ".getMessage('info_view_object'); + $ly_t->pinta_CommonLayout($top_menu, $buscador, $last_accessed, $favorites, $special, $ly, $in, $lg, $params); + $body=$at_t->instanceAttributes_view($at->getInstanceAttributes('V', $params), $params); + $parents=$ly_t->paintParentsList($in->getParents($params), $params); + + $_REQUEST['view']='container'; +} diff --git a/src/admin/accions/admin_order_up.php b/src/admin/accions/admin_order_up.php index f3e4287..b7f4610 100755 --- a/src/admin/accions/admin_order_up.php +++ b/src/admin/accions/admin_order_up.php @@ -1,29 +1,29 @@ testSession()==0) { - $sc->endSession(); - } - else { - $params=get_params_info(); +use Illuminate\Support\Facades\Session; - $ly=new layout(); - $in=new instances(); - $at=new attributes(); - $re=new relations(); - $ly_t=new layout_template(); - $at_t=new attributes_template(); - $params['param1'] = $params['param10']; - $params['param2'] = $params['param11']; + $sc=new security(); +if ($sc->testSession()==0) { + $sc->endSession(); +} else { + $params=get_params_info(); - $message=html_message_ok($re->relationInstanceUp($params)); - $in->refreshCache($params); - - $title=EDITORA_NAME." -> ".getMessage('info_view_object'); - $ly_t->pinta_CommonLayout($top_menu, $buscador, $last_accessed, $favorites, $special, $ly, $in, $lg, $params); - $body=$at_t->instanceAttributes_view($at->getInstanceAttributes('V', $params), $params); - $parents=$ly_t->paintParentsList($in->getParents($params),$params); + $ly=new layout(); + $in=new instances(); + $at=new attributes(); + $re=new relations(); + $ly_t=new layout_template(); + $at_t=new attributes_template(); + $params['param1'] = $params['param10']; + $params['param2'] = $params['param11']; - $_REQUEST['view']='container'; - } -?> \ No newline at end of file + $message=html_message_ok($re->relationInstanceUp($params)); + $in->refreshCache($params); + + $title=EDITORA_NAME." -> ".getMessage('info_view_object'); + $ly_t->pinta_CommonLayout($top_menu, $buscador, $last_accessed, $favorites, $special, $ly, $in, $lg, $params); + $body=$at_t->instanceAttributes_view($at->getInstanceAttributes('V', $params), $params); + $parents=$ly_t->paintParentsList($in->getParents($params), $params); + + $_REQUEST['view']='container'; +} diff --git a/src/admin/accions/admin_order_up_top.php b/src/admin/accions/admin_order_up_top.php index 1ca00e4..21a2ef9 100755 --- a/src/admin/accions/admin_order_up_top.php +++ b/src/admin/accions/admin_order_up_top.php @@ -1,29 +1,29 @@ testSession()==0) { - $sc->endSession(); - } - else { - $params=get_params_info(); +use Illuminate\Support\Facades\Session; - $ly=new layout(); - $in=new instances(); - $at=new attributes(); - $re=new relations(); - $ly_t=new layout_template(); - $at_t=new attributes_template(); - $params['param1'] = $params['param10']; - $params['param2'] = $params['param11']; + $sc=new security(); +if ($sc->testSession()==0) { + $sc->endSession(); +} else { + $params=get_params_info(); - $message=html_message_ok($re->relationInstanceUpTop($params)); - $in->refreshCache($params); - - $title=EDITORA_NAME." -> ".getMessage('info_view_object'); - $ly_t->pinta_CommonLayout($top_menu, $buscador, $last_accessed, $favorites, $special, $ly, $in, $lg, $params); - $body=$at_t->instanceAttributes_view($at->getInstanceAttributes('V', $params), $params); - $parents=$ly_t->paintParentsList($in->getParents($params),$params); + $ly=new layout(); + $in=new instances(); + $at=new attributes(); + $re=new relations(); + $ly_t=new layout_template(); + $at_t=new attributes_template(); + $params['param1'] = $params['param10']; + $params['param2'] = $params['param11']; - $_REQUEST['view']='container'; - } -?> \ No newline at end of file + $message=html_message_ok($re->relationInstanceUpTop($params)); + $in->refreshCache($params); + + $title=EDITORA_NAME." -> ".getMessage('info_view_object'); + $ly_t->pinta_CommonLayout($top_menu, $buscador, $last_accessed, $favorites, $special, $ly, $in, $lg, $params); + $body=$at_t->instanceAttributes_view($at->getInstanceAttributes('V', $params), $params); + $parents=$ly_t->paintParentsList($in->getParents($params), $params); + + $_REQUEST['view']='container'; +} diff --git a/src/admin/accions/admin_unlinked_images.php b/src/admin/accions/admin_unlinked_images.php index b396e4f..5360e80 100755 --- a/src/admin/accions/admin_unlinked_images.php +++ b/src/admin/accions/admin_unlinked_images.php @@ -4,6 +4,7 @@ use Omatech\Editora\Admin\Models\Instances; use Omatech\Editora\Admin\Templates\InstancesTemplate; +use Illuminate\Support\Facades\Session; class AdminUnlinkedImages extends AuthController { diff --git a/src/admin/accions/admin_upload_crop.php b/src/admin/accions/admin_upload_crop.php index b9cd1cf..05f60f6 100755 --- a/src/admin/accions/admin_upload_crop.php +++ b/src/admin/accions/admin_upload_crop.php @@ -9,6 +9,7 @@ use Omatech\Editora\Admin\Templates\LayoutTemplate; use Omatech\Editora\Admin\Templates\InstancesTemplate; use Omatech\Editora\Admin\Templates\AttributesTemplate; +use Illuminate\Support\Facades\Session; class AdminUploadCrop extends AuthController { @@ -48,7 +49,7 @@ private function uploadFile($disk, $file) $file = $disk->putFileAs($path, $file, $fileInfo['fileName']); $accessUrl = $disk->url($file); - if(config('editora-admin.url-storage-relative')==true){ + if (config('editora-admin.url-storage-relative')==true) { $accessUrl = $fileInfo['filePath']; }