Some changes for gotoShares ..

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2854 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index 60c127a495bc8d730b4d48aa7103a7dc505cfb14..3b6bea7e860d4a5afcaf9cf46492e0a4cc1ef74d 100644 (file)
--- a/plugins/personal/environment/class_environment.inc
+++ b/plugins/personal/environment/class_environment.inc
@@ -512,7 +512,8 @@ class environment extends plugin
         preg_match("/^\$HOME/",$_POST['gotoShareMountPoint']) ||
         preg_match("/^.HOME/",$_POST['gotoShareMountPoint']) ||
         preg_match("/^\$USER/",$_POST['gotoShareMountPoint']) ||
-        preg_match("/^.USER/",$_POST['gotoShareMountPoint'])
+        preg_match("/^.USER/",$_POST['gotoShareMountPoint']) ||
+        preg_match("/^%/",$_POST['gotoShareMountPoint'])
         )
       ){
         print_red(_("You must specify a valid mount point.")); 

diff --git a/plugins/personal/environment/environment.tpl b/plugins/personal/environment/environment.tpl
index b79fd83130fd17b51bbd31fb01a4eb6d806de1e7..5b2018ffc3200173ab9ddeba6207f1b1dcc7871e 100644 (file)
--- a/plugins/personal/environment/environment.tpl
+++ b/plugins/personal/environment/environment.tpl
@@ -115,8 +115,8 @@
        {html_options values=$gotoShareSelectionKeys output=$gotoShareSelections}
        <option disabled>&nbsp;</option>
                                </select>
-                               <input type="text" size=15 {$gotoShareACL} name="gotoShareMountPoint" value="{t}Mountpoint{/t}">
-                               <input type="text" size=15 {$gotoShareACL} name="ShareUser" value="ShareUser">
+                               <input type="text" size=15 {$gotoShareACL} name="gotoShareMountPoint" value="%H/Netzlaufwerke/%L/%S">
+                               <input type="text" size=15 {$gotoShareACL} name="ShareUser" value="%u">
                                <input type="submit" {$gotoShareACL} name="gotoShareAdd" value="{t}Add{/t}"> 
                                <input type="submit" {$gotoShareACL} name="gotoShareDel" value="{t}Remove{/t}"> 
                        </td>