Changeset 6438

Timestamp:

08/22/08 17:36:04 (5 years ago)

Author:

seanmh

Message:

Added back end database to handle state for extensions/users, profiles queues and conference rooms.
Added checkboxes to relevant pages to specify which extensions/users, profiles, queues, and conference rooms should be displayed in iSymphony.
Added password field on the extension/user page to specify profile passwords.
Added iSymphony sever process state and version display on the FreePBX iSymphony page.
Added the ability to reload the iSymphony server from the FreePBX iSymphony page.
Added license information display on the FreePBX iSymphony page.
Added the ability to activate a license via the FreePBX iSymphony page.
Added module debug options to the FreePBX iSymphony page via the addition of "&debug=yes" to the URL.
Added support for Device User Mode configuration while using iSymphony 2.1.
Modified description and setup instructions on the FreePBX iSymphony page.

Files:

• contributed_modules/modules/isymphony/functions.inc.php (modified) (6 diffs)
• contributed_modules/modules/isymphony/install.php (modified) (1 diff)
• contributed_modules/modules/isymphony/isymphony-php-library/isymphony.php (modified) (2 diffs)
• contributed_modules/modules/isymphony/isymphony-php-library/library/classes.php (modified) (3 diffs)
• contributed_modules/modules/isymphony/isymphony-php-library/library/property_arrays.php (modified) (2 diffs)
• contributed_modules/modules/isymphony/module.xml (modified) (2 diffs)
• contributed_modules/modules/isymphony/page.isymphony.php (modified) (6 diffs)
• contributed_modules/modules/isymphony/uninstall.php (modified) (1 diff)

contributed_modules/modules/isymphony/functions.inc.php

@@ -4 +4 @@
- *Author       : Michael Yara
- *Created      : June 27, 2008
-July 28
-4
+August 22
+6
- *Purpose      : FreePBX module that automatically updates the iSymphony configuration from the FreePBX configuration.
- *Copyright    : 2008 HEHE Enterprises, LLC
@@ -37 +37 @@
-}
-
+//If check box GUI element does not exist add it
+if(!class_exists("gui_checkbox")) {
+  class gui_checkbox extends guiinput {
+         function gui_checkbox($elemname, $checked=false, $prompttext='', $helptext='', $value='on', $post_text = '', $jsonclick = '', $disable=false) {
+                 $parent_class = get_parent_class($this);
+                 parent::$parent_class($elemname, '', $prompttext, $helptext);
+  
+                 $itemchecked = $checked ? 'checked' : '';
+                 $disable_state = $disable ? 'disabled="true"' : '';
+                 $js_onclick_include = ($jsonclick != '') ? 'onclick="' . $jsonclick. '"' : '';
+                 $tabindex = function_exists("guielement::gettabindex") ? "tabindex=" . guielement::gettabindex() : ""; 
+
+                 $this->html_input = "<input type=\"checkbox\" name=\"$this->_elemname\" id=\"$this->_elemname\" $disable_state $tabindex value=\"$value\" $js_onclick_include $itemchecked/>$post_text\n";
+         }
+  }
+}
+
+
+//Main contributing module function------------------------------------------------------------------------------------------------------------------
-function isymphony_get_config($engine) {
-  
-
+, $amp_conf
-    
-    switch($engine) {
@@ -111 +130 @@
-
-      //Connect to iSymphony server to query and submit information
-
-
-
+
-      
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-          } else {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $freePBXUsers = array();
-
-
-
-
-
-
-
-
+
+
+
+
-        }
-        
-
-
-
-
-
-
-
-
+
+
+
+
+
-          }
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-          
-
+
+
+
+
+
-          
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            
-
-0
+ else update it
+"user_id"
-              
-              //Add extension
-              $object = new ISymphonyExtension;
-0
-extensionDispalyName
-DeviceInfo['dial'
+"user_id"
+freePBXUser["display_name"]
+User["peer"
-              $object->alt_origination_method = "";
-0
+"user_id"
-              
-              if($object->add("default","default")) {
-0
+'user_id'
-              } else {
-                isymphony_write_to_file($errorLogFile, "(Add extension)" . $ISERROR . "\n");
-              }
-              
-            //If extension does exist update it 
-            } else {
-              
-              //Query extension configuration and update values
-0
+"user_id"
-                          
-                //Check if update needs to occur
-extensionDispalyName) || ($object->voice_mail != $freePBXUser[0]) || ($object->peer != $freePBXDeviceInfo['dial'
+freePBXUser["display_name"]) || ($object->voice_mail != $freePBXUser["user_id"]) || ($object->peer != $freePBXUser["peer"
-                      
-extensionDispalyName
-0
-DeviceInfo['dial'
+freePBXUser["display_name"]
+"user_id"
+User["peer"
-                  
-                  if($object->update()) {
-0
+'user_id'
-                  } else {
-                    isymphony_write_to_file($errorLogFile, "(Update extension)" . $ISERROR. "\n");  
@@ -284 +300 @@
-                isymphony_write_to_file($errorLogFile, "(Query extension)" . $ISERROR. "\n"); 
-              }
-
+
+
-            
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-              //Add profile
-              $object = new ISymphonyProfile;
-User[0
-profilePassword
+Profile["user_id"
+freePBXProfile["password"]
-              $object->can_view_everyone_directory = "true";
-              
-              if($object->add("default","default")) {
-User[0
+Profile['user_id'
-              } else {
-                isymphony_write_to_file($errorLogFile, "(Add profile)" . $ISERROR . "\n");
@@ -315 +339 @@
-            
-              //Add extension to profiles managed list
-User[0],$freePBXUser[0
-User[0
+Profile["user_id"],$freePBXProfile["user_id"
+Profile['user_id'
-              } else {
-                isymphony_write_to_file($errorLogFile, "(Add profile managed extension)" . $ISERROR . "\n");
-              }
+            } else {
+              
+              //Query profile configuration and update values
+              if(($object = getISymphonyProfile("default", "default", $freePBXProfile["user_id"])) !== false) {   
+                          
+                //Check if update needs to occur
+                if($object->password != $freePBXProfile["password"]) {    
+                      
+                  $object->password = $freePBXProfile["password"];
+                  
+                  if($object->update()) {
+                    isymphony_write_to_file($debugLogFile, "Updated profile {$freePBXProfile['user_id']}\n");
+                  } else {
+                    isymphony_write_to_file($errorLogFile, "(Update profile)" . $ISERROR. "\n");  
+                  } 
+                }
+              } else {
+                isymphony_write_to_file($errorLogFile, "(Query profile)" . $ISERROR. "\n"); 
+              }
+            }                       
+          }
+        } else {
+          isymphony_write_to_file($errorLogFile, "(List extensions/profiles)" . $ISERROR. "\n");
+        } 
+        
+        //Grab list of configured queues from the database  
+        $freePBXTempQueues = isymphony_queue_list();
+  
+        //Filter list to exclude queues that are not marked for addition
+        $freePBXQueues = array();
+        foreach($freePBXTempQueues as $freePBXTempQueue) {
+          if($freePBXTempQueue["add_queue"] == "1") {
+            array_push($freePBXQueues, $freePBXTempQueue);
+          }
+        }
+  
+        //Add, edit and remove queues
+        if(($iSymphonyQueues = getISymphonyQueueList("default", "default")) !== false) {
+          
+          //Build array of freePBX queues to compare to iSymphony list for deletes 
+          $freePBXQueueCheckDeleteArray = array();
+          foreach($freePBXQueues as $freePBXQueue) {
+            array_push($freePBXQueueCheckDeleteArray, $freePBXQueue["display_name"]);
+          }
+          
+          //Delete appropriate queues
+          $deleteQueueArray = array_diff($iSymphonyQueues, $freePBXQueueCheckDeleteArray);
+          foreach($deleteQueueArray as $val) {
+            if(removeISymphonyQueue("default", "default", $val)) {
+              isymphony_write_to_file($debugLogFile, "Deleted queue {$val}\n");
+              $iSymphonyQueues = isymphony_remove_array_item($iSymphonyQueues, $val);
+            } else {
+              isymphony_write_to_file($errorLogFile, "(Delete queue)" . $ISERROR. "\n");
+            }
+          }
+          
+          //Add and update queues
+          foreach($freePBXQueues as $freePBXQueue) {
+                      
+            //If queue does not exist add it
+            if(!in_array($freePBXQueue["display_name"], $iSymphonyQueues)) {
+              
+              //Add queue
+              $object = new ISymphonyQueue;
+              $object->name = $freePBXQueue["display_name"];
+              $object->queue_val = $freePBXQueue["queue_id"];
+              $object->extension_val = $freePBXQueue["queue_id"];
+              $object->context = "from-internal";
+  
+              if($object->add("default","default")) {
+                isymphony_write_to_file($debugLogFile, "Added queue {$freePBXQueue['display_name']}\n");
+              } else {
+                isymphony_write_to_file($errorLogFile, "(Add queue)" . $ISERROR . "\n");
+              }
+              
+            //If queue does exist update it   
+            } else {
+              
+              //Query queue configuration and update values
+              if(($object = getISymphonyQueue("default", "default", $freePBXQueue["display_name"])) !== false) {    
+                          
+                //Check if update needs to occur
+                if(($object->name != $freePBXQueue["display_name"]) || ($object->queue_val != $freePBXQueue["queue_id"]) || ($object->extension_val != $freePBXQueue["queue_id"]) || ($object->context != "from-internal")) {         
+                          
+                  $object->name = $freePBXQueue["display_name"];
+                  $object->queue_val = $freePBXQueue["queue_id"];
+                  $object->extension_val = $freePBXQueue["queue_id"];
+                  $object->context = "from-internal";
+                  
+                  if($object->update()) {
+                    isymphony_write_to_file($debugLogFile, "Updated queue {$freePBXQueue['display_name']}\n");
+                  } else {
+                    isymphony_write_to_file($errorLogFile, "(Update queue)" . $ISERROR. "\n");  
+                  } 
+                }
+              } else {
+                isymphony_write_to_file($errorLogFile, "(Query queue)" . $ISERROR. "\n"); 
+              }
-            } 
+          }       
+         } else {
+          isymphony_write_to_file($errorLogFile, "(List queues)" . $ISERROR. "\n");
+         }
+  
+        //Grab list of configured conference rooms from the database  
+        $freePBXTempConferenceRooms = isymphony_conference_room_list();
+  
+        //Filter list to exclude conference rooms that are not marked for addition
+        $freePBXConferenceRooms = array();
+        foreach($freePBXTempConferenceRooms as $freePBXTempConferenceRoom) {
+          if($freePBXTempConferenceRoom["add_conference_room"] == "1") {
+            array_push($freePBXConferenceRooms, $freePBXTempConferenceRoom);
-          }
-        }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-      
-      $runningTimeStop = microtime(true);
@@ -505 +555 @@
-}
-
+//iSymphony module API user functions----------------------------------------------------------------------------------------------------------------
+function isymphony_user_add($userId, $addExtension, $addProfile, $password, $displayName, $peer) {
+  global $db; 
+  $addProfile = $addProfile ? "1" : "0";
+  $addExtension = $addExtension ? "1" : "0";
+  $prepStatement = $db->prepare("INSERT INTO isymphony_users (user_id, add_extension, add_profile, password, display_name, peer) VALUES (?, ?, ?, ?, ?, ?)");
+  $values = array($userId, $addExtension, $addProfile, $password, $displayName, $peer);
+  $db->execute($prepStatement, $values);
+}
+
+function isymphony_user_update($userId, $addExtension, $addProfile, $password, $displayName, $peer) {
+  global $db; 
+  $addProfile = $addProfile ? "1" : "0";
+  $addExtension = $addExtension ? "1" : "0";
+  $prepStatement = $db->prepare("UPDATE isymphony_users SET add_extension = ?, add_profile = ?, password = ?, display_name = ?, peer = ? WHERE user_id = $userId");
+  $values = array($addExtension, $addProfile, $password, $displayName, $peer);
+  $db->execute($prepStatement, $values);
+}
+
+function isymphony_user_del($userId) {
+  global $db; 
+  $query = "DELETE FROM isymphony_users WHERE user_id = '$userId'";
+    $db->query($query);
+}
+
+function isymphony_user_list() {
+  global $db; 
+  $query = "SELECT * FROM isymphony_users";
+  $results = sql($query, "getAll", DB_FETCHMODE_ASSOC);
+  if((DB::IsError($results)) || (empty($results))) {
+    return array();
+  } else {
+    return $results;
+  }
+}
+
+function isymphony_user_get($userId) {
+  global $db; 
+  $query = "SELECT * FROM isymphony_users WHERE user_id = '$userId'";
+  $results = sql($query, "getRow", DB_FETCHMODE_ASSOC);
+  if((DB::IsError($results)) || (empty($results))) {
+    return null;
+  } else {
+    return $results;
+  }
+}
+
+//iSymphony module API queue functions---------------------------------------------------------------------------------------------------------------
+function isymphony_queue_add($queueId, $addQueue, $displayName) {
+  global $db;
+  $addQueue = $addQueue ? "1" : "0";  
+  $prepStatement = $db->prepare("INSERT INTO isymphony_queues (queue_id, add_queue, display_name) VALUES (?, ?, ?)");
+  $values = array($queueId, $addQueue, $displayName);
+  $db->execute($prepStatement, $values);
+}
+
+function isymphony_queue_update($queueId, $addQueue, $displayName) {
+  global $db; 
+  $addQueue = $addQueue ? "1" : "0";  
+  $prepStatement = $db->prepare("UPDATE isymphony_queues SET add_queue = ?, display_name = ? WHERE queue_id = $queueId");
+  $values = array($addQueue, $displayName);
+  $db->execute($prepStatement, $values);
+}
+
+function isymphony_queue_del($queueId) {
+  global $db; 
+  $query = "DELETE FROM isymphony_queues WHERE queue_id = '$queueId'";
+    $db->query($query);
+}
+
+function isymphony_queue_list() {
+  global $db; 
+  $query = "SELECT * FROM isymphony_queues";
+  $results = sql($query, "getAll", DB_FETCHMODE_ASSOC);
+  if((DB::IsError($results)) || (empty($results))) {
+    return array();
+  } else {
+    return $results;
+  }
+}
+
+function isymphony_queue_get($queueId) {
+  global $db; 
+  $query = "SELECT * FROM isymphony_queues WHERE queue_id = '$queueId'";
+  $results = sql($query, "getRow", DB_FETCHMODE_ASSOC);
+  if((DB::IsError($results)) || (empty($results))) {
+    return null;
+  } else {
+    return $results;
+  }
+}
+
+//iSymphony module API conference room functions-----------------------------------------------------------------------------------------------------
+function isymphony_conference_room_add($conferenceRoomId, $addConferenceRoom, $displayName) {
+  global $db; 
+  $addConferenceRoom = $addConferenceRoom ? "1" : "0";  
+  $prepStatement = $db->prepare("INSERT INTO isymphony_conference_rooms (conference_room_id, add_conference_room, display_name) VALUES (?, ?, ?)");
+  $values = array($conferenceRoomId, $addConferenceRoom, $displayName);
+  $db->execute($prepStatement, $values);
+}
+
+function isymphony_conference_room_update($conferenceRoomId, $addConferenceRoom, $displayName) {
+  global $db; 
+  $addConferenceRoom = $addConferenceRoom ? "1" : "0";
+  $prepStatement = $db->prepare("UPDATE isymphony_conference_rooms SET add_conference_room = ?, display_name = ? WHERE conference_room_id = $conferenceRoomId");
+  $values = array($addConferenceRoom, $displayName);
+  $db->execute($prepStatement, $values);
+}
+
+function isymphony_conference_room_del($conferenceRoomId) {
+  global $db; 
+  $query = "DELETE FROM isymphony_conference_rooms WHERE conference_room_id = '$conferenceRoomId'";
+    $db->query($query);
+}
+
+function isymphony_conference_room_list() {
+  global $db; 
+  $query = "SELECT * FROM isymphony_conference_rooms";
+  $results = sql($query, "getAll", DB_FETCHMODE_ASSOC);
+  if((DB::IsError($results)) || (empty($results))) {
+    return array();
+  } else {
+    return $results;
+  }
+}
+
+function isymphony_conference_room_get($conferenceRoomId) {
+  global $db; 
+  $query = "SELECT * FROM isymphony_conference_rooms WHERE conference_room_id = '$conferenceRoomId'";
+  $results = sql($query, "getRow", DB_FETCHMODE_ASSOC);
+  if((DB::IsError($results)) || (empty($results))) {
+    return null;
+  } else {
+    return $results;
+  }
+}
+
+//Extension/User page hooks--------------------------------------------------------------------------------------------------------------------------
+function isymphony_configpageinit($pagename) {
+  global $currentcomponent;
+
+  //Query page state
+  $action = isset($_REQUEST["action"]) ? $_REQUEST["action"] : null;
+  $extdisplay = isset($_REQUEST["extdisplay"]) ? $_REQUEST["extdisplay"] : null;
+  $extension = isset($_REQUEST["extension"]) ? $_REQUEST["extension"] : null;
+  $tech_hardware = isset($_REQUEST["tech_hardware"]) ? $_REQUEST["tech_hardware"] : null;
+
+  //Based on the page state determine if the display or process functions should be added
+  if (($pagename != "users") && ($pagename != "extensions")) { 
+    return;
+  } else if ($tech_hardware != null || $pagename == "users") {
+    isymphony_extension_applyhooks();
+    $currentcomponent->addprocessfunc('isymphony_extension_configprocess', 8);
+  } elseif ($action == "add" || $action == "edit") {
+    $currentcomponent->addprocessfunc('isymphony_extension_configprocess', 8);
+  } elseif ($extdisplay != '') {
+    isymphony_extension_applyhooks();
+    $currentcomponent->addprocessfunc('isymphony_extension_configprocess', 8);
+  }
+}
+
+function isymphony_extension_applyhooks() {
+  global $currentcomponent;
+  $currentcomponent->addguifunc("isymphony_extension_configpageload");
+}
+
+function isymphony_extension_configpageload() {
+  global $currentcomponent;
+
+  //Query page state
+  $action = isset($_REQUEST["action"]) ? $_REQUEST["action"] : null;
+  $display = isset($_REQUEST["display"]) ? $_REQUEST["display"] : null;
+  $extension = isset($_REQUEST["extdisplay"]) ? $_REQUEST["extdisplay"] : null;
+  
+  //Attempt to query element if not found set defaults
+  if(($extension !== null) && (($iSymphonyUser = isymphony_user_get($extension)) !== null)) {
+    $added = ($iSymphonyUser["add_extension"] == "1");
+    $userProfile = ($iSymphonyUser["add_profile"] == "1");
+    $password = $iSymphonyUser["password"];
+  
+  } else {
+    $added = true;
+    $userProfile = true;
+    $password = "secret"; 
+  }
+  
+  //Create GIU elements if not on delete page
+  if ($action != "del") {
+    $section = _("iSymphony");
+    $currentcomponent->addguielem($section, new gui_checkbox("isymphony_add_extension", $added, "Add to iSymphony", "Makes this Extension/User available in iSymphony.", "on", "", "", false));
+    $currentcomponent->addguielem($section, new gui_checkbox("isymphony_add_profile", $userProfile, "Create Profile", "Creates an iSymphony login profile which is associated with this extension.", "on", "", "", false));
+    $currentcomponent->addguielem($section, new gui_textbox("isymphony_profile_password", $password, "Profile Password", "Specifies the password to be used for this profile.", "", "", true, "100", false)); 
+  }
+}
+
+function isymphony_extension_configprocess() {
+  
+  //Query page state
+  $action = isset($_REQUEST["action"]) ? $_REQUEST["action"] : null;
+  $ext = isset($_REQUEST["extdisplay"]) ? $_REQUEST["extdisplay"] : null;
+  $extn = isset($_REQUEST["extension"]) ? $_REQUEST["extension"]: null;
+  $name = isset($_REQUEST["name"]) ? $_REQUEST["name"] : null;
+  $extension = ($ext === "") ? $extn : $ext;
+  
+  //Determine peer
+  if(isset($_REQUEST["devinfo_dial"]) && ($_REQUEST["devinfo_dial"] != "")) {
+    $peer = $_REQUEST["devinfo_dial"];
+  } else if (isset($_REQUEST["tech"])){
+    $peer = strtoupper($_REQUEST["tech"]) . "/" . $extension;
+  } else {
+    $peer = "SIP/$extension";
+  }
+    
+  //Query iSymphony options
+  $addExtension = isset($_REQUEST["isymphony_add_extension"]);
+  $addProfile = isset($_REQUEST["isymphony_add_profile"]);
+  $password = isset($_REQUEST["isymphony_profile_password"]) ? $_REQUEST["isymphony_profile_password"]: null;
+  $password = (($password === null) || (trim($password) == "")) ? "secret" : trim($password);
+    
+  //Modify DB
+  if(($extension !== null) && ($extension != "") && ($action !== null)) {
+    
+    //Check if this extension needs to be deleted, updated, or added
+    if($action == "del") {
+      isymphony_user_del($extension);
+    } else if(($action == "add") || ($action == "edit") && ($name !== null)) {
+      if(isymphony_user_get($extension) === null) {
+        isymphony_user_add($extension, $addExtension, $addProfile, $password, $name, $peer);
+      } else {
+        isymphony_user_update($extension, $addExtension, $addProfile, $password, $name, $peer);
+      }
+    }
+  }
+}
+
+//Queue page hooks-----------------------------------------------------------------------------------------------------------------------------------
+function isymphony_hook_queues($viewing_itemid, $target_menuid) {
+    
+  //Query page state
+  $action = isset($_REQUEST["action"]) ? $_REQUEST["action"] : null;
+  $display = "";
+  
+  //Only hook queues page
+    if(($target_menuid == "queues") && ($action != "delete")) {
+      
+      //Query queue info
+      if(($viewing_itemid != null) && ($iSymphonyQueue = isymphony_queue_get($viewing_itemid))) {
+        $checked = ($iSymphonyQueue["add_queue"] == "1") ? "checked" : "";
+      } else {
+        $checked = "checked";
+      }
+      
+      //Build display
+      $display = "  <tr><td colspan=\"2\"><h5>iSymphony<hr></h5></td></tr>
+            <tr>
+              <td><a href=\"#\" class=\"info\">" . _("Add to iSymphony") . "<span>" . _("Makes this queue available in iSymphony") . "</span></a></td>
+              <td><input type=\"checkbox\" name=\"isymphony_add_queue\" id=\"isymphony_add_queue\" value=\"on\" $checked/></td>
+            </tr>";
+    }
+ 
+    return $display;
+}
+
+function isymphony_hookProcess_queues($viewing_itemid, $request) {
+
+  //Query page state
+  $queue = isset($request["extdisplay"]) ? $request["extdisplay"] : null;
+  $account = isset($request["account"]) ? $request["account"] : null;
+  $action = isset($request["action"]) ? $request["action"] : null;
+  $name = isset($request["name"]) ? $request["name"] : null;
+  $queue = ($queue == null) ? $account : $queue;
+  
+  //Query iSymphony option
+  $addQueue = isset($request["isymphony_add_queue"]);
+  
+  //Update DB
+  if(($queue != null) && ($queue != "") && ($action != null)) {
+    
+    //Check if this queue needs to be deleted, updated, or added
+    if($action == "delete") {
+      isymphony_queue_del($queue);
+    } else if(($action == "add") || ($action == "edit") && ($name !== null)) {
+      if(isymphony_queue_get($queue) === null) {
+        isymphony_queue_add($queue, $addQueue, $name);
+      } else {
+        isymphony_queue_update($queue, $addQueue, $name);
+      }
+    }
+  }
+}
+
+//Conference Room page hooks-------------------------------------------------------------------------------------------------------------------------
+function isymphony_hook_conferences($viewing_itemid, $target_menuid) {
+    
+  //Query page state
+  $action = isset($_REQUEST["action"]) ? $_REQUEST["action"] : null;
+  $display = "";
+  
+  //Only hook conferences page
+    if(($target_menuid == "conferences") && ($action != "delete")) {
+      
+      //Query conference info
+      if(($viewing_itemid != null) && ($iSymphonyConferenceRoom = isymphony_conference_room_get($viewing_itemid))) {
+        $checked = ($iSymphonyConferenceRoom["add_conference_room"] == "1") ? "checked" : "";
+      } else {
+        $checked = "checked";
+      }
+      
+      //Build display
+      $display = "  <tr><td colspan=\"2\"><h5>iSymphony<hr></h5></td></tr>
+            <tr>
+              <td><a href=\"#\" class=\"info\">" . _("Add to iSymphony") . "<span>" . _("Makes this conference room available in iSymphony") . "</span></a></td>
+              <td><input type=\"checkbox\" name=\"isymphony_add_conference_room\" id=\"isymphony_add_conference_room\" value=\"on\" $checked/></td>
+            </tr>";
+    }
+ 
+    return $display;
+}
+
+function isymphony_hookProcess_conferences($viewing_itemid, $request) {
+
+  //Query page state
+  $conferenceRoom = isset($request["extdisplay"]) ? $request["extdisplay"] : null;
+  $account = isset($request["account"]) ? $request["account"] : null;
+  $action = isset($request["action"]) ? $request["action"] : null;
+  $name = isset($request["name"]) ? $request["name"] : null;
+  $conferenceRoom = ($conferenceRoom == null) ? $account : $conferenceRoom;
+  
+  //Query iSymphony option
+  $addConferenceRoom = isset($request["isymphony_add_conference_room"]);
+  
+  //Update DB
+  if(($conferenceRoom != null) && ($conferenceRoom != "") && ($action != null)) {
+    
+    //Check if this conference room needs to be deleted, updated, or added
+    if($action == "delete") {
+      isymphony_conference_room_del($conferenceRoom);
+    } else if(($action == "add") || ($action == "edit") && ($name !== null)) {
+      if(isymphony_conference_room_get($conferenceRoom) === null) {
+        isymphony_conference_room_add($conferenceRoom, $addConferenceRoom, $name);
+      } else {
+        isymphony_conference_room_update($conferenceRoom, $addConferenceRoom, $name);
+      }
+    }
+  }
+}
+
+//Helper functions-----------------------------------------------------------------------------------------------------------------------------------
-function isymphony_write_to_file($file, $content) {
-  if($file) {

contributed_modules/modules/isymphony/install.php

@@ -1 +1 @@
-<?php
+/*
+ *Name         : install.php
+ *Author       : Michael Yara
+ *Created      : August 15, 2008
+ *Last Updated : August 19, 2008
+ *History      : 0.1
+ *Purpose      : Create and populate isymphony tables
+ *Copyright    : 2008 HEHE Enterprises, LLC
+ */
+
+global $db;
+
+//Create users table
+$query = "  CREATE TABLE IF NOT EXISTS 
+      isymphony_users(isymphony_user_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, 
+              user_id VARCHAR(100) UNIQUE NOT NULL,
+              add_extension INTEGER(1), 
+              add_profile INTEGER(1), 
+              password VARCHAR(100), 
+              display_name VARCHAR(100), 
+              peer VARCHAR(100))";
+
+echo "Creating \"isymphony_users\" Table....<br>";
+$results = $db->query($query);
+if(DB::IsError($results) && ($results->getCode() != DB_ERROR_ALREADY_EXISTS)) {
+  echo "ERROR: could not create table.<br>";
+} else {
+
+  //Add users to table
+  echo "Populating table.....<br>";
+  if((function_exists("core_users_list")) && (($freePBXUsers = core_users_list()) !== null)){
+    foreach($freePBXUsers as $freePBXUser) {
+      if(function_exists("core_devices_get")) {
+        $freePBXDeviceInfo = core_devices_get($freePBXUser[0]);
+        
+        $userId = $freePBXUser[0];
+        $extensionDisplayName = $freePBXUser[1] == "" ? $freePBXUser[0] : $freePBXUser[1];
+        $extensionPeer = ($freePBXDeviceInfo['dial'] != "") ? $freePBXDeviceInfo['dial'] : "SIP/$userId";
+        
+        $prepStatement = $db->prepare("INSERT INTO isymphony_users (user_id, add_extension, add_profile, password, display_name, peer) VALUES (?, ?, ?, ?, ?, ?)");
+        $values = array($userId, 1, 1, "secret", $extensionDisplayName, $extensionPeer);
+        $db->execute($prepStatement, $values);
+      }
+    }
+  }
+}
+echo "Done<br>";
+
+//Create queues table
+$query = "  CREATE TABLE IF NOT EXISTS 
+      isymphony_queues( isymphony_queue_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, 
+                queue_id VARCHAR(100) UNIQUE NOT NULL,
+                add_queue INTEGER(1), 
+                display_name VARCHAR(100))";
+    
+echo "Creating \"isymphony_queues\" Table....<br>";     
+$results = $db->query($query);          
+if(DB::IsError($results) && ($results->getCode() != DB_ERROR_ALREADY_EXISTS)) {
+  echo "ERROR: could not create table.<br>";
+} else {
+  //Add queues to table
+  echo "Populating table.....<br>";
+  if((function_exists("queues_list")) && (($freePBXQueues = queues_list()) !== null)) {
+    foreach($freePBXQueues as $freePBXQueue) {
+      
+      $queueId = $freePBXQueue[0];
+      $queueDispalyName = $freePBXQueue[1] == "" ? $freePBXQueue[0] : $freePBXQueue[1];
+      
+      $prepStatement = $db->prepare("INSERT INTO isymphony_queues (queue_id, add_queue, display_name) VALUES (?, ?, ?)");
+      $values = array($queueId, 1, $queueDispalyName);
+      $db->execute($prepStatement, $values);
+    }
+  }
+}               
+echo "Done<br>";
+
+//Create conference rooms table
+$query = "  CREATE TABLE IF NOT EXISTS 
+      isymphony_conference_rooms( isymphony_conference_room_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, 
+                    conference_room_id VARCHAR(100) UNIQUE NOT NULL,
+                    add_conference_room INTEGER(1), 
+                    display_name VARCHAR(100))";
+    
+echo "Creating \"isymphony_conference_rooms\" Table....<br>";     
+$results = $db->query($query);          
+if(DB::IsError($results) && ($results->getCode() != DB_ERROR_ALREADY_EXISTS)) {
+  echo "ERROR: could not create table.<br>";
+} else {
+  //Add rooms to table
+  echo "Populating table.....<br>";
+  if((function_exists("conferences_list")) && (($freePBXConferenceRooms = conferences_list()) !== null)) {
+    foreach($freePBXConferenceRooms as $freePBXConferenceRoom) {
+      
+      $conferenceRoomId = $freePBXConferenceRoom[0];
+      $conferenceRoomsDispalyName = $freePBXConferenceRoom[1] == "" ? $freePBXConferenceRoom[0] : $freePBXConferenceRoom[1];
+      
+      $prepStatement = $db->prepare("INSERT INTO isymphony_conference_rooms (conference_room_id, add_conference_room, display_name) VALUES (?, ?, ?)");
+      $values = array($conferenceRoomId, 1, $conferenceRoomsDispalyName);
+      $db->execute($prepStatement, $values);
+    }
+  }
+}               
+echo "Done<br>";
-?>

contributed_modules/modules/isymphony/isymphony-php-library/isymphony.php

@@ -4 +4 @@
- *Author       : Michael Yara
- *Created      : June 15, 2008
-June 18
-1 Beta
+August 22
+2
- *Purpose      : Contains all functions used to interact with the iSymphony configuration.
- *Copyright    : 2008 HEHE Enterprises, LLC
@@ -42 +42 @@
-  
-  if(($SOCKET = socket_create(AF_INET, SOCK_STREAM, 0)) && (socket_connect($SOCKET, $HOST, $PORT))) {   
+    
+    //Check version to modify property arrays if necessary
+    //Modify for 2.1    
+    if((($versionResult = getiSymphonyServerVersion()) !== false) && (strstr($versionResult, "2.1") !== false)) {
+      isymphony_modify_property_arrays_2_1();
+    }
+
-    return true;
-  } else {

contributed_modules/modules/isymphony/isymphony-php-library/library/classes.php

@@ -4 +4 @@
- *Author       : Michael Yara
- *Created      : June 15, 2008
-11
-2 Beta  
+22
+4
- *Purpose      : Contains declarations of all property classes. 
- *Copyright    : 2008 HEHE Enterprises, LLC
@@ -65 +65 @@
- *    jabber_host: Jabber host name(STRING)
- *    jabber_port: Jabber port(INTEGER)
+ *    device_user_mode: (BOOLEAN[true or false])
- *
- * Methods:
@@ -89 +90 @@
-  var $jabber_host = "";
-  var $jabber_port = "";
+  var $device_user_mode = "";
-  
-  //Methods

contributed_modules/modules/isymphony/isymphony-php-library/library/property_arrays.php

@@ -4 +4 @@
- *Author       : Michael Yara
- *Created      : June 15, 2008
-
-
-
+
+
+
+
- *Copyright    : 2008 HEHE Enterprises, LLC
- */
@@ -24 +25 @@
-$queuePermissionPropertyArray = array("transfer_to","steal_call");
-$conferenceRoomPermissionPropertyArray = array("steal_call","transfer_to","originate_to","mute_users","kick_users");
+
+
+function isymphony_modify_property_arrays_2_1() {
+  global $locationPropertyArray;
+  array_push($locationPropertyArray, "device_user_mode");
+}
-?>

contributed_modules/modules/isymphony/module.xml

@@ -2 +2 @@
-  <rawname>isymphony</rawname>
-  <name>iSymphony</name>
-6
+7
-  <type>setup</type>
-  <category>Modules</category>
@@ -17 +17 @@
-  <md5sum>junk</md5sum>
-  <changelog>
+    0.7 Added back end database to handle state for extensions/users, profiles queues and conference rooms.
+      Added checkboxes to relevant pages to specify which extensions/users, profiles, queues, and conference rooms should be displayed in iSymphony.
+      Added password field on the extension/user page to specify profile passwords.
+      Added iSymphony sever process state and version display on the FreePBX iSymphony page.
+      Added the ability to reload the iSymphony server from the FreePBX iSymphony page.
+      Added license information display on the FreePBX iSymphony page.
+      Added the ability to activate a license via the FreePBX iSymphony page.
+      Added module debug options to the FreePBX iSymphony page.
+      Added support for Device User Mode configuration while using iSymphony 2.1.
+      Modified description and setup instructions on the FreePBX iSymphony page.  
-    0.6 Added support for PHP4 in library.
-    0.5 Modified core module code to be more efficient.

contributed_modules/modules/isymphony/page.isymphony.php

@@ -4 +4 @@
- *Author       : Michael Yara
- *Created      : July 2, 2008
-July 23
+August 22
- *History      : 0.5 
- *Purpose      : Information page for iSymphony module
@@ -10 +10 @@
- */
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      <table>
-        <tr>
@@ -16 +248 @@
-        </tr>
-        <tr>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        </tr>
-        <tr>
@@ -24 +266 @@
-        </tr>
-        <tr>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            automatically. Also Skip the Administration section in the manual, since this module will automatically configure iSymphony for you, and<br> 
-            move on to the Client Installation portion when instructed to do so.
@@ -45 +290 @@
-        </tr>
-        <tr>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        </tr>
-      </table>
@@ -74 +303 @@
-      <br>
-      For more information please visit <a href=\"http://www.i9technologies.com/isymphony\">http://www.i9technologies.com/isymphony</a>
-
+
+
-echo $display;
+echo "<br>";
-?>

contributed_modules/modules/isymphony/uninstall.php

@@ -1 +1 @@
-<?php
+/*
+ *Name         : uninstall.php
+ *Author       : Michael Yara
+ *Created      : August 15, 2008
+ *Last Updated : August 15, 2008
+ *History      : 0.1
+ *Purpose      : Remove iSymphony tables and manager include
+ *Copyright    : 2008 HEHE Enterprises, LLC
+ */
+ 
+global $db;
+ 
+//Drop users table
+$query = "DROP TABLE IF EXISTS isymphony_users";
+echo "Removing \"isymphony_users\" Table....<br>";
+$results = $db->query($query);
+if(DB::IsError($results)) {
+  echo "ERROR: could not remove table.<br>";
+}
+
+//Drop queues table
+$query = "DROP TABLE IF EXISTS isymphony_queues";
+echo "Removing \"isymphony_queues\" Table....<br>";
+$results = $db->query($query);
+if(DB::IsError($results)) {
+  echo "ERROR: could not remove table.<br>";
+}
+
+//Drop conference rooms table
+$query = "DROP TABLE IF EXISTS isymphony_conference_rooms";
+echo "Removing \"isymphony_conference_rooms\" Table....<br>";
+$results = $db->query($query);
+if(DB::IsError($results)) {
+  echo "ERROR: could not remove table.<br>";
+}
+
+//Remove manager entry
+$query = "DELETE FROM manager WHERE name = 'isymphony'";
+echo "Removing manager entry....<br>";
+$results = $db->query($query);
+if(DB::IsError($results)) {
+  echo "ERROR: could not remove manager entry.<br>";
+}
-?>