From 16fb43c5ccf852efd84ab74bf49119af26d3345f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 11 Oct 2015 02:18:36 +0200
Subject: [PATCH] extracted html from saimod sys security, fixed saimod sys
 page table floating

---
 sai/modules/saimod_sys_page/tpl/list_entry.tpl   |  6 +++---
 .../saimod_sys_security/saimod_sys_security.php  | 16 +++++++---------
 .../tpl/missing_add_right.tpl                    |  1 +
 .../tpl/missing_edit_right.tpl                   |  1 +
 .../tpl/missing_remove_right.tpl                 |  1 +
 .../saimod_sys_security/tpl/right_add.tpl        |  1 +
 .../saimod_sys_security/tpl/right_edit.tpl       |  2 ++
 .../saimod_sys_security/tpl/right_remove.tpl     |  1 +
 8 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 sai/modules/saimod_sys_security/tpl/missing_add_right.tpl
 create mode 100644 sai/modules/saimod_sys_security/tpl/missing_edit_right.tpl
 create mode 100644 sai/modules/saimod_sys_security/tpl/missing_remove_right.tpl
 create mode 100644 sai/modules/saimod_sys_security/tpl/right_add.tpl
 create mode 100644 sai/modules/saimod_sys_security/tpl/right_edit.tpl
 create mode 100644 sai/modules/saimod_sys_security/tpl/right_remove.tpl

diff --git a/sai/modules/saimod_sys_page/tpl/list_entry.tpl b/sai/modules/saimod_sys_page/tpl/list_entry.tpl
index 07163d0..28dd0a0 100644
--- a/sai/modules/saimod_sys_page/tpl/list_entry.tpl
+++ b/sai/modules/saimod_sys_page/tpl/list_entry.tpl
@@ -4,10 +4,10 @@
     <td>${group}</td>
     <td>${state}</td>
     <td>${div}</td>
-    <td>${url}</td>
-    <!--td>${parent_id}</td>
+    <td style="word-wrap: break-word; word-break: break-all;">${url}</td>
+    <!--<td>${parent_id}</td>
     <td>${login}</td>
     <td>${type}</td>
     <td>${func}</td>
-    <td>${php_class}</td-->
+    <td>${php_class}</td>-->
 </tr>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/saimod_sys_security.php b/sai/modules/saimod_sys_security/saimod_sys_security.php
index 1c9b1e1..a1e9311 100644
--- a/sai/modules/saimod_sys_security/saimod_sys_security.php
+++ b/sai/modules/saimod_sys_security/saimod_sys_security.php
@@ -14,14 +14,13 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule {
         $res = \SYSTEM\SQL\SYS_SAIMOD_SECURITY_RIGHTS::QQ();                
         while($r = $res->next()){
             $r['right_edit_btn'] =  \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY_RIGHTS_EDIT) ?
-                                    '<button type="submit" class="btn btn-sm btn-danger right_delete" onClick="system.load(\'security(delright);id.'.$r['ID'].'\');"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> ${basic_delete}</button>
-                                    <button type="submit" class="btn btn-sm btn-default right_edit" right_id="'.$r['ID'].'"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> ${basic_edit}</button>' :
-                                    '<font color="red">Missing rights.</font>';
+                                    \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/right_edit.tpl'),array('id' => $r['ID'])) :
+                                    \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/missing_edit_right.tpl'));
             $rows .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_right.tpl'),$r);}        
         $vars['rows'] = $rows;
         $vars['addright_btn'] = \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY_RIGHTS_EDIT) ?
-                                '<br><button type="submit" onClick="system.load(\'security(newright)\');" class="btn btn-sm"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${basic_new_right}</button>' :
-                                '<font color="red">You are missing the required rights for adding or removing rights.</font>';
+                                \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/right_add.tpl')):
+                                \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/missing_remove_right.tpl'));
         $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_SECURITY));
         return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_rights.tpl'),$vars);
     }
@@ -81,11 +80,11 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule {
         while($r = $res->next()){
             $r['user_id'] = $userid;
             $r['remove_btn'] =  \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY_RIGHTS_EDIT) ? 
-                                '<button type="submit" class="btn btn-sm btn-danger deleteuserright" right_id="'.$r['ID'].'" user_id="'.$userid.'"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> ${basic_delete}</button>' :
-                                '<font color="red">Missing Rights</font>';
+                                \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/right_remove.tpl'),array('id' => $r['ID'])) :
+                                \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/missing_edit_right.tpl'));
             $vars['user_rights_table'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_user_right.tpl'), $r);}
         
-        $vars['user_rights_add'] = '<font color="red">You are missing the required rights for adding or removing the rights of an user.</font>';
+        $vars['user_rights_add'] = \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/missing_add_right.tpl'));
         if(\SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY_RIGHTS_EDIT)){
             $opts = '';
             $res = \SYSTEM\SQL\SYS_SAIMOD_SECURITY_RIGHTS::QQ();
@@ -169,7 +168,6 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule {
         return 'error';
     }
     
-    //public static function html_li_menu(){return '<li><a id="menu_security" href="#!security">${sai_menu_security}</a></li>';}
     public static function html_li_menu(){return '<li><a id="menu_security" data-toggle="tooltip" data-placement="bottom" title="${sai_menu_security}" href="#!security"><span class="glyphicon glyphicon-lock" aria-hidden="true"></span></a></li>';}
     public static function right_public(){return false;}    
     public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) && \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY);}
diff --git a/sai/modules/saimod_sys_security/tpl/missing_add_right.tpl b/sai/modules/saimod_sys_security/tpl/missing_add_right.tpl
new file mode 100644
index 0000000..3ad6b14
--- /dev/null
+++ b/sai/modules/saimod_sys_security/tpl/missing_add_right.tpl
@@ -0,0 +1 @@
+<font color="red">You are missing the required rights for adding or removing the rights of an user.</font>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/tpl/missing_edit_right.tpl b/sai/modules/saimod_sys_security/tpl/missing_edit_right.tpl
new file mode 100644
index 0000000..cb83d4e
--- /dev/null
+++ b/sai/modules/saimod_sys_security/tpl/missing_edit_right.tpl
@@ -0,0 +1 @@
+<font color="red">Missing rights.</font>´
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/tpl/missing_remove_right.tpl b/sai/modules/saimod_sys_security/tpl/missing_remove_right.tpl
new file mode 100644
index 0000000..506eca2
--- /dev/null
+++ b/sai/modules/saimod_sys_security/tpl/missing_remove_right.tpl
@@ -0,0 +1 @@
+<font color="red">You are missing the required rights for adding or removing rights.</font>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/tpl/right_add.tpl b/sai/modules/saimod_sys_security/tpl/right_add.tpl
new file mode 100644
index 0000000..baf035e
--- /dev/null
+++ b/sai/modules/saimod_sys_security/tpl/right_add.tpl
@@ -0,0 +1 @@
+<br><button type="submit" onClick="system.load('security(newright)');" class="btn btn-sm"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${basic_new_right}</button>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/tpl/right_edit.tpl b/sai/modules/saimod_sys_security/tpl/right_edit.tpl
new file mode 100644
index 0000000..db25b5e
--- /dev/null
+++ b/sai/modules/saimod_sys_security/tpl/right_edit.tpl
@@ -0,0 +1,2 @@
+<button type="submit" class="btn btn-sm btn-danger right_delete" onClick="system.load('security(delright);id.${id}');"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> ${basic_delete}</button>
+<button type="submit" class="btn btn-sm btn-default right_edit" right_id="${id}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> ${basic_edit}</button>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/tpl/right_remove.tpl b/sai/modules/saimod_sys_security/tpl/right_remove.tpl
new file mode 100644
index 0000000..d11cce0
--- /dev/null
+++ b/sai/modules/saimod_sys_security/tpl/right_remove.tpl
@@ -0,0 +1 @@
+<button type="submit" class="btn btn-sm btn-danger deleteuserright" right_id="${id}" user_id="'.$userid.'"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> ${basic_delete}</button>
\ No newline at end of file