Updated plugin creation && locking for all main.incs

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

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index b604e7c1ba43afe8edf8addbf2e7b94991250ef3..7302cfdc7b7a6a11d0d99acfac117d4ecf9b0ca1 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -599,6 +599,7 @@ function ldap_expired_account($config, $userdn, $username)
 function add_lock($object, $user)
 {
   global $config;
+  echo "<font color='green'><b>$object</b></object><br>";
 
   /* Remember which entries were opened as read only, because we 
       don't need to remove any locks for them later.
@@ -660,6 +661,8 @@ function del_lock ($object)
 {
   global $config;
 
+  echo "<font color='red'><b>$object</b></object><br>";
+
   if(is_array($object)){
     foreach($object as $obj){
       del_lock($obj);

diff --git a/gosa-core/plugins/admin/acl/main.inc b/gosa-core/plugins/admin/acl/main.inc
index 8f55ab8400c5c1796571450d577e5842e578097e..82fb5b003f8e46eb52d339fc048c97462b36ec23 100644 (file)
--- a/gosa-core/plugins/admin/acl/main.inc
+++ b/gosa-core/plugins/admin/acl/main.inc
@@ -38,7 +38,7 @@ if ( $cleanup ){
        $display= "No headpage yet for this module";
 
        /* Create usermanagement object on demand */
-       if (!session::is_set('macl') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('macl')){
                session::set('macl',new aclManagement($config, $ui));
        }
        $macl = session::get('macl');

diff --git a/gosa-core/plugins/admin/departments/main.inc b/gosa-core/plugins/admin/departments/main.inc
index bd114694ae295c8b452bad82a88ff4b18a6f3dc7..2cf55f74569fe2fd51f749096ca3de6d0519b574 100644 (file)
--- a/gosa-core/plugins/admin/departments/main.inc
+++ b/gosa-core/plugins/admin/departments/main.inc
@@ -36,7 +36,7 @@ if ( $cleanup ){
 }else{
 
        /* Create usermanagement object on demand */
-       if (!session::is_set('department') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('department')){
                session::set('department',new departmentManagement($config, $ui));
        }
        $department = session::get('department');

diff --git a/gosa-core/plugins/admin/groups/main.inc b/gosa-core/plugins/admin/groups/main.inc
index 58af63689a14586e057cacbb2c85e5210df212ce..30fd058be61762b68b4bbb394abb766a5d6a5cb1 100644 (file)
--- a/gosa-core/plugins/admin/groups/main.inc
+++ b/gosa-core/plugins/admin/groups/main.inc
@@ -36,7 +36,7 @@ if ( $cleanup ){
 }else{
 
   /* Create groupManagement object on demand */
-  if (!session::is_set('groupManagement') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+  if (!session::is_set('groupManagement')){
     session::set('groupManagement',new groupManagement ($config, $ui));
   }
   $groupManagement = session::get('groupManagement');

diff --git a/gosa-core/plugins/admin/ogroups/main.inc b/gosa-core/plugins/admin/ogroups/main.inc
index ee523719c42ffa2166e29e6fe8e06c9671ec2494..6de420cc09e86f23ff170bf6c2985d335a4c23b1 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/main.inc
+++ b/gosa-core/plugins/admin/ogroups/main.inc
@@ -37,7 +37,7 @@ if ( $cleanup ){
 }else{
 
   /* Create object object on demand */
-  if (!session::is_set('ogroup') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+  if (!session::is_set('ogroup')){
     session::set('ogroup',new ogroupManagement ($config));
     
   }

diff --git a/gosa-core/plugins/admin/users/main.inc b/gosa-core/plugins/admin/users/main.inc
index 94a5747c6c8dc30108d679064d4369e1298a0bef..1b37c9d462cc685b7e6a70ef3462677405d15199 100644 (file)
--- a/gosa-core/plugins/admin/users/main.inc
+++ b/gosa-core/plugins/admin/users/main.inc
@@ -36,8 +36,7 @@ if ( $cleanup ){
 }else{
 
   /* Create usermanagement object on demand */
-  if (!session::is_set('userManagement') ||
-     (isset($_GET['reset']) && $_GET['reset'] == 1)){
+  if (!session::is_set('userManagement')){
     $userManagement= new userManagement ($config, $ui);
     $userManagement->set_acl_category("users");
     session::set('userManagement',$userManagement);

diff --git a/gosa-core/plugins/personal/generic/main.inc b/gosa-core/plugins/personal/generic/main.inc
index c24dfa96c3f31da83db592f5dead36fb56d605ef..9037a452cb021b09c6de12d52abe1fc1fa239b53 100644 (file)
--- a/gosa-core/plugins/personal/generic/main.inc
+++ b/gosa-core/plugins/personal/generic/main.inc
@@ -23,7 +23,7 @@
 /* Remove locks created by this plugin
 */
 $lock_msg="";
-if ($remove_lock){
+if ($remove_lock || isset($_POST['edit_cancel']) || isset($_POST['password_cancel'])){
   if(session::is_set('user') && session::is_set('edit')){
     del_lock($ui->dn);
   }
@@ -38,14 +38,7 @@ if ( $cleanup ){
 }else{
 
   /* Reset requested? */
-  if (isset($_POST['edit_cancel']) || isset($_POST['password_cancel']) || 
-      (isset($_GET['reset']) && $_GET['reset'] == 1)){
-
-    /* Only remove lock if object was opened 
-     */
-    if(session::is_set('user') && session::is_set('edit')){
-      del_lock ($ui->dn);
-    }
+  if (isset($_POST['edit_cancel']) || isset($_POST['password_cancel'])){
     session::un_set ('edit');
     session::un_set ('user');
   }

diff --git a/gosa-core/plugins/personal/password/main.inc b/gosa-core/plugins/personal/password/main.inc
index b039a10f8d50d4d4148b09b3d93df4ab92e1fa51..b9a877456d92cb1da98802570acb3d7798dff113 100644 (file)
--- a/gosa-core/plugins/personal/password/main.inc
+++ b/gosa-core/plugins/personal/password/main.inc
@@ -38,8 +38,7 @@ if ( $cleanup ){
 }else{
 
   /* Reset requested? */
-  if (isset($_POST['edit_cancel']) ||
-      (isset($_GET['reset']) && $_GET['reset'] == 1)){
+  if (isset($_POST['edit_cancel'])){
     session::un_set ('edit');
     session::un_set ('password');
   }

diff --git a/gosa-core/plugins/personal/posix/main.inc b/gosa-core/plugins/personal/posix/main.inc
index 7728f73176f6f5b0db4e294fe2b5baef54a5fb40..cce612acf66521ae24ad52087bcecc1d65dacf95 100644 (file)
--- a/gosa-core/plugins/personal/posix/main.inc
+++ b/gosa-core/plugins/personal/posix/main.inc
@@ -24,7 +24,7 @@
 /* Remove locks created by this plugin
 */
 $lock_msg="";
-if ($remove_lock){
+if ($remove_lock || isset($_POST['edit_cancel'])){
   if(session::is_set('posixAccount') && session::is_set('edit')){
     del_lock($ui->dn);
   }
@@ -39,13 +39,7 @@ if ( $cleanup ){
 }else{
 
   /* Reset requested? */
-  if (isset($_POST['edit_cancel']) ||  (isset($_GET['reset']) && $_GET['reset'] == 1)){
-
-    /* Only remove lock if object was opened 
-     */
-    if(session::is_set('posix') && session::is_set('edit')){
-      del_lock ($ui->dn);
-    }
+  if (isset($_POST['edit_cancel'])){
     session::un_set ('edit');
     session::un_set ('posixAccount');
   }

diff --git a/gosa-plugins/addressbook/addons/addressbook/main.inc b/gosa-plugins/addressbook/addons/addressbook/main.inc
index bf55ff3b9b31e14ea181d19e2641a972cd9fcaa6..8807c001820a7d09b7125085f3a3f65925239e62 100644 (file)
--- a/gosa-plugins/addressbook/addons/addressbook/main.inc
+++ b/gosa-plugins/addressbook/addons/addressbook/main.inc
@@ -26,7 +26,7 @@ if ( $cleanup ){
 }else{
 
        /* Create phonelist object on demand */
-       if (!session::is_set('addressbook') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('addressbook')){
                $addressbook = new addressbook ($config);
                $addressbook -> set_acl_base($ui->dn);
                $addressbook -> set_acl_category("addressbook");        

diff --git a/gosa-plugins/connectivity/personal/connectivity/main.inc b/gosa-plugins/connectivity/personal/connectivity/main.inc
index f24d14a967ccc1d0d45b8d5efeb0dd40b564f514..48610b3b7981c4feae4f4b6370f060155437bd46 100644 (file)
--- a/gosa-plugins/connectivity/personal/connectivity/main.inc
+++ b/gosa-plugins/connectivity/personal/connectivity/main.inc
@@ -21,7 +21,7 @@
 /* Remove locks created by this plugin
 */
 $lock_msg="";
-if ($remove_lock){
+if ($remove_lock || isset($_POST['edit_cancel'])){
   if(session::is_set('connectivity') && session::is_set('edit')){
     del_lock($ui->dn);
   }
@@ -37,14 +37,7 @@ if ( $cleanup ){
 
 
   /* Reset requested? */
-  if (isset($_POST['edit_cancel']) ||
-      (isset($_GET['reset']) && $_GET['reset'] == 1)){
-
-    /* Only remove lock if object was opened 
-     */
-    if(session::is_set('connectivity') && session::is_set('edit')){
-      del_lock ($ui->dn);
-    }
+  if (isset($_POST['edit_cancel'])){
     session::un_set ('edit');
     session::un_set ('connectivity');
   }

diff --git a/gosa-plugins/dak/addons/dak/main.inc b/gosa-plugins/dak/addons/dak/main.inc
index 6be41ecc0f18b649f8e9ba0f92c8c86d778f007d..c2fcbb005ea079034a2f9ce00c1d946103f7cc08 100644 (file)
--- a/gosa-plugins/dak/addons/dak/main.inc
+++ b/gosa-plugins/dak/addons/dak/main.inc
@@ -32,7 +32,7 @@ if ( $cleanup ){
   session::un_set('dak_plug');
 }else{
 
-       if (!session::is_set('dak_plug') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('dak_plug')){
                session::set('dak_plug',new dakplug($config));
        }
        $dak_plug = session::get('dak_plug');

diff --git a/gosa-plugins/dfs/addons/godfs/main.inc b/gosa-plugins/dfs/addons/godfs/main.inc
index 5a38bc8daa469c07c18cf0e33f19f1218f49d9b8..424b3c54d8397ed37392ed7bd05cca46bdf79ce6 100644 (file)
--- a/gosa-plugins/dfs/addons/godfs/main.inc
+++ b/gosa-plugins/dfs/addons/godfs/main.inc
@@ -17,8 +17,7 @@ if ( $cleanup ){
 }else{
 
      # create dfsManagment object
-     if (!session::is_set('dfsManagment') || 
-        (isset($_GET['reset']) && $_GET['reset'] == 1)) {
+     if (!session::is_set('dfsManagment')){ 
        session::set('dfsManagment',new dfsManagment($config, $ui));
      }
      $dfsManagment  = session::get('dfsManagment');

diff --git a/gosa-plugins/fai/admin/fai/main.inc b/gosa-plugins/fai/admin/fai/main.inc
index 2b5128f9430c3dcd1010b3febe116cb1ecc94d01..e1013fd80c52e407419334a64437bb0796b29a51 100644 (file)
--- a/gosa-plugins/fai/admin/fai/main.inc
+++ b/gosa-plugins/fai/admin/fai/main.inc
@@ -35,7 +35,7 @@ if ( $cleanup ){
 }else{
 
        /* Create usermanagement object on demand */
-       if (!session::is_set('FAI') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('FAI')){
                $FAI= new faiManagement($config, $ui);
                $FAI->set_acl_category("fai");
                session::set('FAI',$FAI);

diff --git a/gosa-plugins/gofax/gofax/blocklists/main.inc b/gosa-plugins/gofax/gofax/blocklists/main.inc
index ebd93825f64dcb2c3fbeee43c7354a5763b5d87c..602d617a8d24a7b12cfbf46ac46add7104d027c8 100644 (file)
--- a/gosa-plugins/gofax/gofax/blocklists/main.inc
+++ b/gosa-plugins/gofax/gofax/blocklists/main.inc
@@ -16,7 +16,7 @@ if ( $cleanup ){
 }else{
 
        /* Create blocklist object on demand */
-       if (!session::is_set('blocklist') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('blocklist')){
                $blocklist= new blocklist($config, $ui);
                $blocklist->set_acl_category("gofaxlist");
                session::set('blocklist',$blocklist);

diff --git a/gosa-plugins/gofax/gofax/faxaccount/main.inc b/gosa-plugins/gofax/gofax/faxaccount/main.inc
index 2768a8b6867d48b2c4f6ddf7d6d0b490c11b4d36..b740ca7253076151b658de4ca517f9b83a17a237 100644 (file)
--- a/gosa-plugins/gofax/gofax/faxaccount/main.inc
+++ b/gosa-plugins/gofax/gofax/faxaccount/main.inc
@@ -2,7 +2,7 @@
 
 /* Remove locks created by this plugin
 */
-if ($remove_lock){
+if ($remove_lock || isset($_POST['edit_cancel'])){
   if(session::is_set('gofaxAccount') && session::is_set('edit')){
     del_lock($ui->dn);
   }
@@ -16,10 +16,7 @@ if ( $cleanup ){
 }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 ('gofaxAccount');
        }

diff --git a/gosa-plugins/gofax/gofax/faxreports/main.inc b/gosa-plugins/gofax/gofax/faxreports/main.inc
index 326ca61ee8b26a4f9e3ad890dd724901036821eb..ac1ffc359d5fbbfd16fb4b798afe4e2c260a21fc 100644 (file)
--- a/gosa-plugins/gofax/gofax/faxreports/main.inc
+++ b/gosa-plugins/gofax/gofax/faxreports/main.inc
@@ -7,7 +7,7 @@ if ( $cleanup ){
 }else{
 
        /* Create faxreport object on demand */
-       if (!session::is_set('faxreport') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('faxreport')){
                session::set('faxreport',new faxreport ($config, $ui));
        }
        $faxreport = session::get('faxreport');

diff --git a/gosa-plugins/gofon/gofon/conference/main.inc b/gosa-plugins/gofon/gofon/conference/main.inc
index 1c313646cd477ec1a78d5c8ca976efa9dbedeea4..43ad9547c8521e84b68345294b82816e38c3439e 100644 (file)
--- a/gosa-plugins/gofon/gofon/conference/main.inc
+++ b/gosa-plugins/gofon/gofon/conference/main.inc
@@ -36,7 +36,7 @@ if ( $cleanup ){
 
 
        /* Create usermanagement object on demand */
-       if (!session::is_set('conference') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('conference')){
                session::set("conference",new phoneConferenceManagment($config, $ui));
        }
        $conference = session::get('conference');

diff --git a/gosa-plugins/gofon/gofon/fonreports/main.inc b/gosa-plugins/gofon/gofon/fonreports/main.inc
index 150e7b592ecbd89a26559a93571fcf7364fff3d6..cbd957edd2a3a93a9122cbab549d4541ea68fda0 100644 (file)
--- a/gosa-plugins/gofon/gofon/fonreports/main.inc
+++ b/gosa-plugins/gofon/gofon/fonreports/main.inc
@@ -8,7 +8,7 @@ if ( $cleanup ){
 }else{
 
        /* Create fonreport object on demand */
-       if (!session::is_set('fonreport') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('fonreport')){
                session::set('fonreport',new fonreport ($config, $ui));
        }
        $fonreport = session::get('fonreport');

diff --git a/gosa-plugins/gofon/gofon/macro/main.inc b/gosa-plugins/gofon/gofon/macro/main.inc
index 75ef984cda0c6d6caef30116ac90d27d56d59292..502ab640392d170b605b2b0295822d69d37c694e 100644 (file)
--- a/gosa-plugins/gofon/gofon/macro/main.inc
+++ b/gosa-plugins/gofon/gofon/macro/main.inc
@@ -36,7 +36,7 @@ if ( $cleanup ){
 
 
   /* Create macroManagement object on demand */
-  if (!session::is_set('macroManagement') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+  if (!session::is_set('macroManagement')){
     session::set('macroManagement',new goFonMacro ($config, $ui));
   }
 

diff --git a/gosa-plugins/gofon/gofon/phoneaccount/main.inc b/gosa-plugins/gofon/gofon/phoneaccount/main.inc
index c7d750814039501ac3853af35a3c1982891183a0..ebc64d3fe3570c95b15dc3adc45e6335f6f9e61f 100644 (file)
--- a/gosa-plugins/gofon/gofon/phoneaccount/main.inc
+++ b/gosa-plugins/gofon/gofon/phoneaccount/main.inc
@@ -21,7 +21,7 @@
 /* Remove locks created by this plugin
 */
 $lock_msg ="";
-if ($remove_lock){
+if ($remove_lock || isset($_POST['edit_cancel'])){
   if(session::is_set('phoneAccount') && session::is_set('edit')){
     del_lock($ui->dn);
   }
@@ -36,10 +36,7 @@ if ( $cleanup ){
 }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 ('phoneAccount');
        }

diff --git a/gosa-plugins/goto/addons/goto/main.inc b/gosa-plugins/goto/addons/goto/main.inc
index 106a8abe8fa4a1926cde97ae1530a760b5e6d8c4..af6b0ab7e3e7b569174ca9b3b28c813154de4676 100644 (file)
--- a/gosa-plugins/goto/addons/goto/main.inc
+++ b/gosa-plugins/goto/addons/goto/main.inc
@@ -37,9 +37,7 @@ if ( $cleanup ){
 
 
        /* Create gotomasses object on demand */
-       if (!session::is_set('gotomasses') 
-               || (isset($_GET['reset']) && $_GET['reset'] == 1) 
-               || isset($_POST['reload_gotomass_data'])){
+       if (!session::is_set('gotomasses') || isset($_POST['reload_gotomass_data'])){
                $gotomasses= new gotomasses ($config);
                $gotomasses->set_acl_category("gotomasses");
 

diff --git a/gosa-plugins/goto/admin/applications/main.inc b/gosa-plugins/goto/admin/applications/main.inc
index d61f42c63cb614497e89e82ee6290f3ec42a9dfb..99a7a72c861748f7c93faf8155ac669dd844bed2 100644 (file)
--- a/gosa-plugins/goto/admin/applications/main.inc
+++ b/gosa-plugins/goto/admin/applications/main.inc
@@ -36,7 +36,7 @@ if ( $cleanup ){
 
 
        /* Create applicationManagement object on demand */
-       if (!session::is_set('applicationManagement') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('applicationManagement')){
                session::set('applicationManagement',new applicationManagement ($config, $ui));
        }
        $applicationManagement = session::get('applicationManagement');

diff --git a/gosa-plugins/goto/admin/devices/main.inc b/gosa-plugins/goto/admin/devices/main.inc
index 88f0c2138ce01b130577fcf3e68ec7a35351d99c..dd9d451fd88807f4de3744fcf92a328688f0d015 100644 (file)
--- a/gosa-plugins/goto/admin/devices/main.inc
+++ b/gosa-plugins/goto/admin/devices/main.inc
@@ -35,7 +35,7 @@ if ( $cleanup ){
 }else{
 
   /* Create DeviceManagement object on demand */
-  if (!session::is_set('DeviceManagement') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+  if (!session::is_set('DeviceManagement')){
     session::set('DeviceManagement',new deviceManagement ($config));
   }
 

diff --git a/gosa-plugins/goto/admin/mimetypes/main.inc b/gosa-plugins/goto/admin/mimetypes/main.inc
index 81e04da3b87df262bdd84e62358530c382a0f3f6..cbd12a1cc9315cfe957ff599666d4bc15c501310 100644 (file)
--- a/gosa-plugins/goto/admin/mimetypes/main.inc
+++ b/gosa-plugins/goto/admin/mimetypes/main.inc
@@ -34,7 +34,7 @@ if ( $cleanup ){
 }else{
 
   /* Create MimeTypeManagement object on demand */
-  if (!session::is_set('MimeTypeManagement') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+  if (!session::is_set('MimeTypeManagement')){
     session::set('MimeTypeManagement',new mimetypeManagement ($config, $ui));
   }
 

diff --git a/gosa-plugins/goto/personal/environment/main.inc b/gosa-plugins/goto/personal/environment/main.inc
index 0b0e24f3f1860c15fb83046332771c2527cf5e0c..141322066148ee80012083c48efa0193f090d53d 100644 (file)
--- a/gosa-plugins/goto/personal/environment/main.inc
+++ b/gosa-plugins/goto/personal/environment/main.inc
@@ -21,7 +21,7 @@
 /* Remove locks created by this plugin
 */
 $lock_msg="";
-if ($remove_lock){
+if ($remove_lock || isset($_POST['edit_cancel'])){
   if(session::is_set('environment') && session::is_set('edit')){
     del_lock($ui->dn);
   }
@@ -36,14 +36,7 @@ if ( $cleanup ){
 }else{
 
   /* Reset requested? */
-  if (isset($_POST['edit_cancel']) || 
-      (isset($_GET['reset']) && $_GET['reset'] == 1)){
-
-    /* Only remove lock if object was opened 
-     */
-    if(session::is_set('environment') && session::is_set('edit')){
-      del_lock ($ui->dn);
-    }
+  if (isset($_POST['edit_cancel'])){
     session::un_set ('edit');
     session::un_set ('environment');
   }

diff --git a/gosa-plugins/ldapmanager/addons/ldapmanager/main.inc b/gosa-plugins/ldapmanager/addons/ldapmanager/main.inc
index 3a8f4a26e9f315e2331fc880ff5f134fd33b1989..0edc380685db6a73d458a25df7998650af5ed667 100644 (file)
--- a/gosa-plugins/ldapmanager/addons/ldapmanager/main.inc
+++ b/gosa-plugins/ldapmanager/addons/ldapmanager/main.inc
@@ -33,9 +33,8 @@ if ( $cleanup ){
   session::un_set('ldif');
 }else{
 
-
        /* Create phonelist object on demand */
-       if (!session::is_set('ldif') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('ldif')){
                $ldif= new ldif ($config);
                $ldif->set_acl_category("logview");
                session::set('ldif',$ldif);

diff --git a/gosa-plugins/log/addons/logview/main.inc b/gosa-plugins/log/addons/logview/main.inc
index 47bd096325bfd16c1cdf7d5b99bf4eab2975623b..13a811a7b2ee265c784029f91ef27d178fb2c070 100644 (file)
--- a/gosa-plugins/log/addons/logview/main.inc
+++ b/gosa-plugins/log/addons/logview/main.inc
@@ -35,7 +35,7 @@ if ( $cleanup ){
 
 
        /* Create logview object on demand */
-       if (!session::is_set('log_tabs') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('log_tabs')){
                session::set('log_tabs',new log_tabs($config, $config->data['TABS']['LOGTABS'],""));
        }
        $log_tabs = session::get('log_tabs');

diff --git a/gosa-plugins/mail/addons/mailqueue/main.inc b/gosa-plugins/mail/addons/mailqueue/main.inc
index df6784d385ae198f16d906c47f25102697778f4c..3d937387538728ad9427127eae9837d947fd4123 100644 (file)
--- a/gosa-plugins/mail/addons/mailqueue/main.inc
+++ b/gosa-plugins/mail/addons/mailqueue/main.inc
@@ -33,7 +33,7 @@ if ( $cleanup ){
 }else{
 
        /* Create mailqueue object on demand */
-       if (!session::is_set('mailqueue') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('mailqueue')){
                $ui = get_userinfo();
                $mailqueue= new mailqueue ($config);
                $mailqueue->set_acl_category("mailqueue");

diff --git a/gosa-plugins/mail/personal/mail/main.inc b/gosa-plugins/mail/personal/mail/main.inc
index b8fe96a5d055f4d022e1f619236c9b65015bcdb0..db39f469b2f85621da5f9f849dd96a12cbcd9872 100644 (file)
--- a/gosa-plugins/mail/personal/mail/main.inc
+++ b/gosa-plugins/mail/personal/mail/main.inc
@@ -22,7 +22,7 @@
 /* Remove locks created by this plugin
 */
 $lock_msg="";
-if ($remove_lock){
+if ($remove_lock || isset($_POST['edit_cancel'])){
   if(session::is_set('mailAccount') && session::is_set('edit')){
     del_lock($ui->dn);
   }
@@ -36,16 +36,8 @@ if ( $cleanup ){
 
 }else{
 
-
   /* Reset requested? */
-  if (isset($_POST['edit_cancel']) || 
-      (isset($_GET['reset']) && $_GET['reset'] == 1)){
-
-    /* Only remove lock if object was opened 
-     */
-    if(session::is_set('mailAccount') && session::is_set('edit')){
-      del_lock ($ui->dn);
-    }
+  if (isset($_POST['edit_cancel'])){  
     session::un_set ('edit');
     session::un_set ('mailAccount');
   }

diff --git a/gosa-plugins/nagios/personal/nagios/main.inc b/gosa-plugins/nagios/personal/nagios/main.inc
index 49cc58396ed43cdba0e8f4a0f940bab7d179b6d7..319bd0aec6435cde3c64cf93b7e1e896c1df48ea 100644 (file)
--- a/gosa-plugins/nagios/personal/nagios/main.inc
+++ b/gosa-plugins/nagios/personal/nagios/main.inc
@@ -22,7 +22,7 @@
 /* Remove locks created by this plugin
 */
 $lock_msg="";
-if ($remove_lock){
+if ($remove_lock || isset($_POST['edit_cancel'])){
   if(session::is_set('nagiosAccount') && session::is_set('edit')){
     del_lock($ui->dn);
   }
@@ -37,14 +37,7 @@ if ( $cleanup ){
 }else{
 
   /* Reset requested? */
-  if (isset($_POST['edit_cancel']) || 
-      (isset($_GET['reset']) && $_GET['reset'] == 1)){
-
-    /* Only remove lock if object was opened 
-     */
-    if(session::is_set('nagiosAccount') && session::is_set('edit')){
-      del_lock ($ui->dn);
-    }
+  if (isset($_POST['edit_cancel'])){
     session::un_set ('edit');
     session::un_set ('nagiosAccount');
   }

diff --git a/gosa-plugins/netatalk/personal/netatalk/main.inc b/gosa-plugins/netatalk/personal/netatalk/main.inc
index c1f06c88db67944ca6c73a1558329a533d86df77..8fd464a4ca628a1eb934f2c54e2c699b9491854b 100644 (file)
--- a/gosa-plugins/netatalk/personal/netatalk/main.inc
+++ b/gosa-plugins/netatalk/personal/netatalk/main.inc
@@ -22,7 +22,7 @@
 /* Remove locks created by this plugin
 */
 $lock_msg="";
-if ($remove_lock){
+if ($remove_lock || isset ($_POST['edit_cancel'])){
   if(session::is_set('netatalk') && session::is_set('edit')){
     del_lock($ui->dn);
   }
@@ -37,13 +37,7 @@ if ( $cleanup ){
 }else{
 
   /* Reset requested? */
-  if (isset ($_POST['edit_cancel']) || (isset ($_GET['reset']) && $_GET['reset'] == 1)) {
-
-    /* Only remove lock if object was opened 
-     */
-    if(session::is_set('netatalk') && session::is_set('edit')){
-      del_lock ($ui->dn);
-    }
+  if (isset ($_POST['edit_cancel'])) {
     session::un_set('edit');
     session::un_set('netatalk');
   }

diff --git a/gosa-plugins/samba/personal/samba/main.inc b/gosa-plugins/samba/personal/samba/main.inc
index e4e211304fba258f36381cfcbdc999e50716edfa..e4e3ea1742aaf557646a771aebdb1f99b0a3696e 100644 (file)
--- a/gosa-plugins/samba/personal/samba/main.inc
+++ b/gosa-plugins/samba/personal/samba/main.inc
@@ -22,7 +22,7 @@
 /* Remove locks created by this plugin
 */
 $lock_msg="";
-if ($remove_lock){
+if ($remove_lock || isset($_POST['edit_cancel'])){
   if(session::is_set('sambaAccount') && session::is_set('edit')){
     del_lock($ui->dn);
   }
@@ -37,14 +37,7 @@ if ( $cleanup ){
 }else{
 
   /* Reset requested? */
-  if (isset($_POST['edit_cancel']) ||
-      (isset($_GET['reset']) && $_GET['reset'] == 1)){
-
-    /* Only remove lock if object was opened 
-     */
-    if(session::is_set('sambaAccount') && session::is_set('edit')){
-      del_lock ($ui->dn);
-    }
+  if (isset($_POST['edit_cancel'])){
     session::un_set ('edit');
     session::un_set ('sambaAccount');
   }

diff --git a/gosa-plugins/scalix/personal/scalix/main.inc b/gosa-plugins/scalix/personal/scalix/main.inc
index 03a92ec208d78076dd6dc6d07c407b06b6cba347..275ae4ce5c1a9f174cb2a8ea863a8a6a190c7b47 100644 (file)
--- a/gosa-plugins/scalix/personal/scalix/main.inc
+++ b/gosa-plugins/scalix/personal/scalix/main.inc
@@ -22,7 +22,7 @@
 /* Remove locks created by this plugin
 */
 $lock_msg="";
-if ($remove_lock){
+if ($remove_lock || isset($_POST['edit_cancel'])){
   if(session::is_set('scalixAccount') && session::is_set('edit')){
     del_lock($ui->dn);
   }
@@ -38,14 +38,7 @@ if ( $cleanup ){
 
 
   /* Reset requested? */
-  if (isset($_POST['edit_cancel']) || 
-      (isset($_GET['reset']) && $_GET['reset'] == 1)){
-
-    /* Only remove lock if object was opened 
-     */
-    if(session::is_set('scalixAccount') && session::is_set('edit')){
-      del_lock ($ui->dn);
-    }
+  if (isset($_POST['edit_cancel'])){
     session::un_set ('edit');
     session::un_set ('scalixAccount');
   }

diff --git a/gosa-plugins/sudo/admin/sudo/main.inc b/gosa-plugins/sudo/admin/sudo/main.inc
index d5177179f65b0342a68ae0d5c4d387795b5cf4fc..e30efdd7b5deb161c4871687ac903d32835e6423 100644 (file)
--- a/gosa-plugins/sudo/admin/sudo/main.inc
+++ b/gosa-plugins/sudo/admin/sudo/main.inc
@@ -37,7 +37,7 @@ if ( $cleanup ){
 }else{
 
   /* Create sudoManagement object on demand */
-  if (!session::is_set('sudoManagement') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+  if (!session::is_set('sudoManagement')){
     session::set('sudoManagement',new sudoManagement ($config, $ui));
   }
   $sudoManagement = session::get('sudoManagement');

diff --git a/gosa-plugins/systems/admin/systems/main.inc b/gosa-plugins/systems/admin/systems/main.inc
index 2e771f5a02c9f7cf9065bc02f677a27985033b18..81c52565a625dec2c5c9729b8014042794d53728 100644 (file)
--- a/gosa-plugins/systems/admin/systems/main.inc
+++ b/gosa-plugins/systems/admin/systems/main.inc
@@ -37,7 +37,7 @@ if ( $cleanup ){
 
 
        /* Create usermanagement object on demand */
-       if (!session::is_set('systems') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('systems')){
                session::set('systems',new systems($config, $ui));
        }
        $systems = session::get('systems');