index 80957462b683a1dedd15c8f7ebb3ec828163c31f..db39f469b2f85621da5f9f849dd96a12cbcd9872 100644 (file)
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-$lock_msg ="";
-$display ="";
-/* Remove classes and variables from session
- */
+/* Remove locks created by this plugin
+*/
+$lock_msg="";
+if ($remove_lock || isset($_POST['edit_cancel'])){
+ if(session::is_set('mailAccount') && session::is_set('edit')){
+ del_lock($ui->dn);
+ }
+}
+
+/* Remove this plugin from session
+*/
if ( $cleanup ){
session::un_set('mailAccount');
session::un_set('edit');
-}
-
-
-if ( $remove_lock){
- if(session::is_set('mailAccount') && session::is_set('edit')){
- del_lock ($ui->dn);
- }
}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');
}