fix menu, userid

omatech · Nov 19, 2019 · e5b374c · e5b374c
1 parent 444c07d
commit e5b374c
Show file tree

Hide file tree

Showing 18 changed files with 74 additions and 86 deletions.
diff --git a/src/admin/accions/admin_add_and_join.php b/src/admin/accions/admin_add_and_join.php
@@ -28,12 +28,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'];
             $instance['instance_info']['form_relation'] = $params;
             $view ='editora::pages.instance';
-        }else{
+        } else {
             $instance['instance_info']=null;
             $title = getMessage('error_role_privileges');
             $view ='editora::pages.permission_denied';

diff --git a/src/admin/accions/admin_clone_instance.php b/src/admin/accions/admin_clone_instance.php
@@ -17,7 +17,7 @@ public function render()
         $security = new Security;
         $params = get_params_info();
 
-        if ( Session::get('rol_id')==1 ||  $security->getAccess('insertable', $params)) {
+        if (Session::get('rol_id')==1 ||  $security->getAccess('insertable', $params)) {
             $instances = new Instances;
             $at=new attributes();
             $ly_t= new LayoutTemplate();

diff --git a/src/admin/accions/admin_configure.php b/src/admin/accions/admin_configure.php
@@ -2,7 +2,6 @@
 
 namespace Omatech\Editora\Admin\Accions;
 
-
 use Illuminate\Support\Facades\Session;
 use Omatech\Editora\Admin\Models\Security;
 use Omatech\Editora\Admin\Models\Instances;
@@ -14,8 +13,9 @@ public function render()
     {
         $security = new Security;
         $params = get_params_info();
-
-        if(Session::has('rol_id')) {
+        $menu = [];
+
+        if (Session::has('rol_id')) {
             $instances = new Instances;
             $editora = new EditoraModel();
 
@@ -29,7 +29,7 @@ public function render()
             $user = $editora->get_user_info(Session::get('user_id'));
             $menu = $this->loadMenu($instances, $params);
             $messages = [];
-            if(isset($_REQUEST['hiddencheck'])){
+            if (isset($_REQUEST['hiddencheck'])) {
                 if ($_REQUEST['hiddencheck'] == 'change_password') {
                     if ($security->check_change_password(Session::get('user_id'), $_REQUEST['old_password'])) {
                         if ($_REQUEST['password'] != $_REQUEST['repeat_password']) {
@@ -44,26 +44,24 @@ public function render()
                     } else {
                         $messages['ko_pass'] = 'La contraseña actual no es correcta';
                     }
-                }elseif ($_REQUEST['hiddencheck'] == 'change_user'){
+                } elseif ($_REQUEST['hiddencheck'] == 'change_user') {
                     $user_name = trim(addslashes($_REQUEST['username']));
                     $complete_name = trim(addslashes($_REQUEST['complete_name']));
 
-                    if ($user_name!='' && $complete_name!=''){
-                        if ($editora->exist_username(Session::get('user_id'), $user_name)){
+                    if ($user_name!='' && $complete_name!='') {
+                        if ($editora->exist_username(Session::get('user_id'), $user_name)) {
                             $messages['ko_user'] = 'ya existe este identificador de usuario';
-                        }else{
+                        } else {
                             $res = $editora->update_user_info(Session::get('user_id'), $user_name, $complete_name);
 
-                            if ($res){
+                            if ($res) {
                                 $messages['ok_user'] = 'datos guardados correctamente';
                                 Session::put('user_nom', $complete_name);
-                            }else{
+                            } else {
                                 $messages['ko_user'] = 'no se han podido guardar los datos';
                             }
                         }
-
-
-                    }else{
+                    } else {
                         $messages['ko_user'] = 'Todos los campos son obligatorios';
                     }
 
@@ -82,5 +80,4 @@ public function render()
 
         return response()->view('editora::pages.change_password', $viewData);
     }
-
 }
diff --git a/src/admin/accions/admin_create_users.php b/src/admin/accions/admin_create_users.php
@@ -2,7 +2,6 @@
 
 namespace Omatech\Editora\Admin\Accions;
 
-
 use Illuminate\Support\Facades\Session;
 use Omatech\Editora\Admin\Models\Security;
 use Omatech\Editora\Admin\Models\Instances;
@@ -32,38 +31,33 @@ public function render()
 
         $roles = $editora->get_roles();
 
-        if(Session::get('user_type')=='O' && Session::get('rol_id')==1 ) {
-
-            if(isset($_REQUEST['hiddencheck'])){
+        if (Session::get('user_type')=='O' && Session::get('rol_id')==1) {
+            if (isset($_REQUEST['hiddencheck'])) {
                 if ($_REQUEST['hiddencheck'] == 'create_user') {
                     $user_name = trim(addslashes($_REQUEST['username']));
                     $complete_name = trim(addslashes($_REQUEST['complete_name']));
                     $rol = trim(addslashes($_REQUEST['rol']));
 
-                    if ($user_name!='' && $complete_name!=''){
-                        if ($editora->exist_username(null, $user_name)){
+                    if ($user_name!='' && $complete_name!='') {
+                        if ($editora->exist_username(null, $user_name)) {
                             $messages['ko_user'] = 'ya existe este identificador de usuario';
-                        }else{
+                        } else {
                             $res = $editora->create_user($user_name, $complete_name, $rol);
 
-                            if ($res){
+                            if ($res) {
                                 $messages['ok_user'] = 'datos guardados correctamente. Pass: '.$res;
-                            }else{
+                            } else {
                                 $messages['ko_user'] = 'no se han podido guardar los datos';
                             }
                         }
-
-
-                    }else{
+                    } else {
                         $messages['ko_user'] = 'Todos los campos son obligatorios';
                     }
-
-
                 }
             }
 
             $view ='editora::pages.create_user';
-        }else{
+        } else {
             $instance['instance_info']=null;
             $title = getMessage('error_role_privileges');
             $view ='editora::pages.permission_denied';
@@ -80,5 +74,4 @@ public function render()
 
         return response()->view($view, $viewData);
     }
-
 }
diff --git a/src/admin/accions/admin_delete_favorite.php b/src/admin/accions/admin_delete_favorite.php
@@ -12,7 +12,9 @@ public function render()
     {
         $security = new Security;
         $params=get_params_info();
-        if(Session::get('rol_id')==1 || $security->getAccess('browseable',$params)) {
+        $menu = [];
+
+        if (Session::get('rol_id')==1 || $security->getAccess('browseable', $params)) {
             $instances = new Instances;
 
             $params['p_mode']='V';

diff --git a/src/admin/accions/admin_delete_instance.php b/src/admin/accions/admin_delete_instance.php
@@ -13,8 +13,9 @@ public function render()
     {
         $security = new Security;
         $params = get_params_info();
+        $menu = [];
 
-        if(Session::get('rol_id')==1 || $security->getAccess('deleteable',$params)) {
+        if (Session::get('rol_id')==1 || $security->getAccess('deleteable', $params)) {
             $instances = new Instances;
 
             $params['p_mode']='V';
@@ -34,5 +35,4 @@ public function render()
 
         return response()->view('editora::pages.delete_instance', $viewData);
     }
-
 }
diff --git a/src/admin/accions/admin_edit_instance.php b/src/admin/accions/admin_edit_instance.php
@@ -14,16 +14,17 @@ public function render()
     {
         $security = new Security;
         $params=get_params_info();
+        $menu = [];
 
-        if(Session::get('rol_id')==1 || $security->getAccess('editable',$params)) {
+        if (Session::get('rol_id')==1 || $security->getAccess('editable', $params)) {
             $instances = new Instances;
             $at=new attributes();
             $at_t=new attributesTemplate();
 
             $params['p_mode']='V';
             $params['p_acces_type']='A';
             $p_mode = 'U';
-            if ($params['param1'] == '' or $params['param1']<0){
+            if ($params['param1'] == '' or $params['param1']<0) {
                 $params['param1']=$params['param12'];
             }
 

diff --git a/src/admin/accions/admin_edit_instance2.php b/src/admin/accions/admin_edit_instance2.php
@@ -18,8 +18,9 @@ public function render()
         $security = new Security;
         $params=get_params_info();
         $message = null;
+        $menu = [];
 
-        if (Session::get('rol_id')==1 || $security->getAccess('editable',$params)) {
+        if (Session::get('rol_id')==1 || $security->getAccess('editable', $params)) {
             $instances = new Instances;
             $at=new attributes();
             $ly_t=new LayoutTemplate();
@@ -41,19 +42,18 @@ public function render()
                 $params['p_mode']='V';
                 $params['p_acces_type']='A';
                 $p_mode = 'U';
-                if ($params['param1'] == '' or $params['param1']<0){
+                if ($params['param1'] == '' or $params['param1']<0) {
                     $params['param1']=$params['param12'];
                 }
                 $instance = $at->getInstanceAttributes('U', $params);
 
                 if ($res==-1) {
                     $message=html_message_error(getMessage('error_param_mandatory'));
-                }elseif ($res==-2) {
+                } elseif ($res==-2) {
                     $message=html_message_error(getMessage('error_param_data'));
-                }elseif ($res==-3) {
+                } elseif ($res==-3) {
                     $message=html_message_error(getMessage('error_param_urlnice'));
                 }
-
             } else { //sabem que s'han insertat be els atribs, peticio de refresc de cache
                 $params['p_acces_type']='A';
                 $instances->logAccess($params);

diff --git a/src/admin/accions/admin_edit_static_text.php b/src/admin/accions/admin_edit_static_text.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;
@@ -14,6 +13,7 @@ public function render()
     {
         $security = new Security;
         $params = get_params_info();
+        $menu = [];
 
         if (Session::has('rol_id')) {
             $instances = new Instances;
@@ -56,6 +56,4 @@ public function render()
 
         return response()->view('editora::pages.static_texts_edit', $viewData);
     }
-
 }
-
diff --git a/src/admin/accions/admin_get_main.php b/src/admin/accions/admin_get_main.php
@@ -22,13 +22,14 @@ public function __construct()
     public function render()
     {
         $params=get_params_info();
-        $params['p_mode']='V';
+        $params['p_mode'] = $p_mode = 'V';
 
         $title = EDITORA_NAME;
         $instances = $this->instances->instanceList($params);
         $menu = $this->loadMenu($this->instances, $params);
 
         $viewData = array_merge($menu, [
+            'p_mode' => $p_mode,
             'title' => $title,
             'instances' => $instances,
         ]);

diff --git a/src/admin/accions/admin_join.php b/src/admin/accions/admin_join.php
@@ -16,7 +16,9 @@ public function render()
     {
         $security = new Security;
         $params = get_params_info();
-        if(Session::get('rol_id')==1 ||$security->getAccess('browseable',$params)) {
+        $menu = [];
+
+        if (Session::get('rol_id')==1 ||$security->getAccess('browseable', $params)) {
             $instances = new Instances;
             $at=new attributes();
             $ly_t=new LayoutTemplate();
@@ -26,10 +28,10 @@ public function render()
             $params['p_mode']= $p_mode = 'R';
             $params['p_acces_type']='A';
 
-            if (isset($params['param12']) && $params['param12']!=''){
-            	$title=EDITORA_NAME." -> ".getMessage('info_joinsearch_object')." ".getClassName($params['param12'])." ".getMessage('info_word_joinwith')." ".getClassName($params['param10']);
-            }else{
-            	$title=EDITORA_NAME." -> ".getMessage('info_joinsearch_object_lite')." ".getClassName($params['param12'])." ".getMessage('info_word_joinwith')." ".getClassName($params['param10']);
+            if (isset($params['param12']) && $params['param12']!='') {
+                $title=EDITORA_NAME." -> ".getMessage('info_joinsearch_object')." ".getClassName($params['param12'])." ".getMessage('info_word_joinwith')." ".getClassName($params['param10']);
+            } else {
+                $title=EDITORA_NAME." -> ".getMessage('info_joinsearch_object_lite')." ".getClassName($params['param12'])." ".getMessage('info_word_joinwith')." ".getClassName($params['param10']);
             }
             $instances->logAccess($params);
             $menu = $this->loadMenu($instances, $params);
@@ -41,7 +43,6 @@ public function render()
             $parent['rel_id'] = $params['param9'];
             $parent['inst_id'] = $params['param11'];
             $parent['class_id'] = $params['param10'];
-
         }
 
         $viewData = array_merge($menu, [
@@ -55,5 +56,4 @@ public function render()
 
         return response()->view('editora::pages.list_instances', $viewData);
     }
-
 }
diff --git a/src/admin/accions/admin_list_class.php b/src/admin/accions/admin_list_class.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;
@@ -16,8 +15,9 @@ public function render()
     {
         $security = new Security;
         $params = get_params_info();
+        $menu = [];
 
-        if(INST_PERM || Session::get('rol_id')==1 || $security->buscaAccessTotal($params) || $security->getAccess2($params)|| $security->getAccess('insertable',$params)) {
+        if (INST_PERM || Session::get('rol_id')==1 || $security->buscaAccessTotal($params) || $security->getAccess2($params)|| $security->getAccess('insertable', $params)) {
             $instances = new Instances;
             //$st = new statictext();
             $params=get_params_info();
@@ -71,5 +71,4 @@ public function render()
 
         return response()->view('editora::pages.list_classes_export', $viewData);
     }
-
 }
diff --git a/src/admin/accions/admin_list_instances.php b/src/admin/accions/admin_list_instances.php
@@ -28,12 +28,15 @@ public function render()
 
         $count = 0;
         $page = 1;
-        if(Session::get('rol_id')==1 || $security->getAccess('browseable',$params)) {
+
+        $menu = [];
+
+        if (Session::get('rol_id')==1 || $security->getAccess('browseable', $params)) {
             $editora = new editoraModel();
 
             $params = get_params_info();
             $params['p_mode'] = 'V';
-            if ($params['param3']!=""){
+            if ($params['param3']!="") {
                 $page = $params['param3'];
             }
             $class_info = $editora->get_class_info($params['param1']);
@@ -53,4 +56,3 @@ public function render()
         return response()->view('editora::pages.list_instances', $viewData);
     }
 }
-