Changed Management Action Post names

	from user_* and conf_* to conference_*

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

diff --git a/plugins/gofon/conference/class_divListConferences.inc b/plugins/gofon/conference/class_divListConferences.inc
index 3251d6eab2c401cb4ec35f18a0ba29bd88d81f94..62fb38bbcf006d98b8b8692e14b244e480117e35 100755 (executable)
--- a/plugins/gofon/conference/class_divListConferences.inc
+++ b/plugins/gofon/conference/class_divListConferences.inc
@@ -109,7 +109,7 @@ class divListConference extends MultiSelectWindow
     if(preg_match("/c/",$acls)){
       $listhead .=" <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
         " <input class='center' type='image' align='middle' src='images/list_new_conference.png' 
-        title='"._("Create new conference")."' alt='"._("New conference")."' name='user_new'>&nbsp;".
+        title='"._("Create new conference")."' alt='"._("New conference")."' name='conference_new'>&nbsp;".
         " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;";
     }
 
@@ -160,7 +160,7 @@ class divListConference extends MultiSelectWindow
 
       /* Add edit icon - This is allowed when we have at least read access. */
       $actions= "<input class='center' type='image' src='images/edit.png'     
-                    alt='"._("edit")."'    name='conf_edit_%KEY%' title='"._("Edit this entry")."'>";
+                    alt='"._("edit")."'    name='conference_edit_%KEY%' title='"._("Edit this entry")."'>";
 
       /* Add snapshot icon - This is allowed when we have create and write access for the current entry */
       if(preg_match("/(c.*w|w.*c)/",$acl_all)){
@@ -170,7 +170,7 @@ class divListConference extends MultiSelectWindow
       /* Create delete link - Only if we are allowed to delete this entry */
       if(preg_match("/d/",$acl)){
         $actions.= "<input class='center' type='image' src='images/edittrash.png' 
-          alt='"._("delete")."'   name='conf_del_%KEY%'  title='"._("Delete this entry")."'>";
+          alt='"._("delete")."'   name='conference_del_%KEY%'  title='"._("Delete this entry")."'>";
       }
 
       /* Display PIN icon, only if we are the owner of the given conference */

diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc
index 4084ebb9fc5a97a88b4e14b70be6109314682464..463c449d353bab87f3c45daeeac486ef2389dd69 100644 (file)
--- a/plugins/gofon/conference/class_phoneConferenceManagment.inc
+++ b/plugins/gofon/conference/class_phoneConferenceManagment.inc
@@ -55,6 +55,8 @@ class phoneConferenceManagment extends plugin
     /* Call parent execute */
     plugin::execute();
 
+    $_SESSION['LOCK_VARS_TO_USE'] = array("/^id$/","/^act$/","/^conference_/");
+
     /***************
       Variable initialisation
      ***************/
@@ -71,17 +73,17 @@ class phoneConferenceManagment extends plugin
      ***************/
   
     foreach($_POST as $key => $post){
-      if(preg_match("/.*new.*/i",$key)){
+      if(preg_match("/^conference_new.*/i",$key)){
         $s_action = "new";
         // Post for delete
-      }elseif(preg_match("/conf_del.*/",$key)){
+      }elseif(preg_match("/^conference_del.*/",$key)){
         $s_action = "del";
-        $s_entry  = preg_replace("/conf_".$s_action."_/i","",$key);
+        $s_entry  = preg_replace("/^conference_del_/i","",$key);
         $s_entry  = preg_replace("/_.*$/","",$s_entry);
         // Post for edit
-      }elseif(preg_match("/conf_edit_.*/",$key)){
+      }elseif(preg_match("/conference_edit_.*/",$key)){
         $s_action="edit";
-        $s_entry  = preg_replace("/conf_".$s_action."_/i","",$key);
+        $s_entry  = preg_replace("/conference_edit_/i","",$key);
         $s_entry  = preg_replace("/_.*$/","",$s_entry);
       } 
     }