X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Fgoto%2Fpersonal%2Fenvironment%2Fmain.inc;h=141322066148ee80012083c48efa0193f090d53d;hb=2fad372fadd10bf7636516af03bcac2e3db0c81f;hp=b4b5508a5266323d7094bf931c428d8c70eb0212;hpb=4c756df8bd0c8a7e32e10584ee1ac9318eb4561e;p=gosa.git
diff --git a/gosa-plugins/goto/personal/environment/main.inc b/gosa-plugins/goto/personal/environment/main.inc
index b4b5508a5..141322066 100644
--- a/gosa-plugins/goto/personal/environment/main.inc
+++ b/gosa-plugins/goto/personal/environment/main.inc
@@ -17,13 +17,26 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-$lock_msg = "";
-if (!$remove_lock){
+
+/* Remove locks created by this plugin
+*/
+$lock_msg="";
+if ($remove_lock || isset($_POST['edit_cancel'])){
+ if(session::is_set('environment') && session::is_set('edit')){
+ del_lock($ui->dn);
+ }
+}
+
+/* Remove this plugin from session
+*/
+if ( $cleanup ){
+ session::un_set('environment');
+ session::un_set('edit');
+
+}else{
/* Reset requested? */
- if (isset($_POST['edit_cancel']) ||
- (isset($_GET['reset']) && $_GET['reset'] == 1)){
- del_lock ($ui->dn);
+ if (isset($_POST['edit_cancel'])){
session::un_set ('edit');
session::un_set ('environment');
}
@@ -56,7 +69,6 @@ if (!$remove_lock){
/* Lock the current entry */
add_lock ($ui->dn, $ui->dn);
- session::set('dn',$ui->dn);
session::set('edit',TRUE);
}
}
@@ -108,7 +120,7 @@ if (!$remove_lock){
} else {
$info= " ".$ui->dn." ";
- if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/environment"))){
+ if(preg_match("/r/",$ui->get_permissions($ui->dn,"users/environment"))){
$info.= " ".msgPool::clickEditToChange();
$display.= "\n";