NEW Can filter on user on unalterable log

Dolibarr · Dec 16, 2017 · 9f2a42b · 9f2a42b
1 parent 4abcbae
commit 9f2a42b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
@@ -740,11 +740,13 @@
         				{
         					if (preg_match('/^([^@]+)@([^@]+)$/i',$urlpage,$regs))
         					{
-        						print '<a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1).'?backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a>';
+        						$urltouse=dol_buildpath('/'.$regs[2].'/admin/'.$regs[1],1);
+        						print '<a href="'.$urltouse.(preg_match('/\?/',$urltouse)?'&':'?').'backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a>';
         					}
         					else
         					{
-        						print '<a href="'.$urlpage.'?backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a>';
+        						$urltouse=$urlpage;
+        						print '<a href="'.$urltouse.(preg_match('/\?/',$urltouse)?'&':'?').'backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup",'style="padding-right: 6px"').'</a>';
         					}
         				}
         			}

diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
@@ -63,7 +63,7 @@ function __construct($db)
 
         // Config pages
         //-------------
-        $this->config_page_url = array('blockedlog.php@blockedlog');
+        $this->config_page_url = array('blockedlog.php?withtab=1@blockedlog');
 
         // Dependancies
         //-------------

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
@@ -4574,12 +4574,16 @@
 
 
 /* ============================================================================== */
-/*  Mardown rendering                                                             */
+/*  Markdown rendering                                                             */
 /* ============================================================================== */
 
 .imgmd {
 	width: 90%;
 }
+.moduledesclong h1 {
+	padding-top: 10px;
+	padding-bottom: 20px;
+}
 
 
 /* ============================================================================== */

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
@@ -4557,12 +4557,16 @@
 
 
 /* ============================================================================== */
-/*  Mardown rendering                                                             */
+/*  Markdown rendering                                                             */
 /* ============================================================================== */
 
 .imgmd {
 	width: 90%;
 }
+.moduledesclong h1 {
+	padding-top: 10px;
+	padding-bottom: 20px;
+}
 
 
 /* ============================================================================== */