Changeset 7772 for contributed_modules/modules/isymphony

Timestamp:

05/29/09 14:01:54 (3 years ago)

Author:

seanmh

Message:

1.0.0 Added backward compatibility support for 2.0 rev 1104.

Fixed bug in which a flawed context would prevent orphaned parked calls from ringing back to the parking extension if parked via the panel.
Made debug menu always visible.
Added server debug menu.
Debug logs now show on main module page.
Multiple debug options can now be set at once.
Added database column checks in installation script to handle module upgrades.
Added default FreePBX page context to configuration.
Added admin username and password fields to the main module page.
Added originate timeout field to main module page.
Added auto reload and enable page status checkboxes to main module page.
Added global Jabber connection configuration fields on main module page.
Added email and cell phone fields to extension page.
Added Jabber connection configuration override fields to extension page.
Added Jabber username and password fields to extension page.
Added auto answer checkbox to extension page.
Modified database debug tables to account for new tables and columns.

Files:

• contributed_modules/modules/isymphony/functions.inc.php (modified) (16 diffs)
• contributed_modules/modules/isymphony/install.php (modified) (5 diffs)
• contributed_modules/modules/isymphony/isymphony-php-library/isymphony.php (modified) (5 diffs)
• contributed_modules/modules/isymphony/isymphony-php-library/library/classes.php (modified) (10 diffs)
• contributed_modules/modules/isymphony/isymphony-php-library/library/helper.php (modified) (2 diffs)
• contributed_modules/modules/isymphony/isymphony-php-library/library/navigation.php (modified) (7 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) (8 diffs)
• contributed_modules/modules/isymphony/uninstall.php (modified) (2 diffs)

contributed_modules/modules/isymphony/functions.inc.php

@@ -4 +4 @@
- *Author       : Michael Yara
- *Created      : June 27, 2008
-September 17, 2008
-0.7
+May 27, 2009
+1.1
- *Purpose      : FreePBX module that automatically updates the iSymphony configuration from the FreePBX configuration.
- *Copyright    : 2008 HEHE Enterprises, LLC
@@ -37 +37 @@
-}
-
+//Control
+class ext_isymphony_controlplayback {
+  var $fileName;
+  var $skipMinutes;
+  var $ff;
+  var $rew;
+  var $stop;
+  var $pause;
+  var $restart;
+    
+  function ext_isymphony_controlplayback($fileName, $skipMinutes, $ff, $rew, $stop, $pause, $restart) {
+    $this->fileName = $fileName;
+    $this->skipMinutes = $skipMinutes;
+    $this->ff = $ff;
+    $this->rew = $rew;
+    $this->stop = $stop;
+    $this->pause = $pause;
+    $this->restart = $restart;
+  }
+  
+  function output() {
+    return "ControlPlayback(" . $this->fileName . "," . $this->skipMinutes . "," . $this->ff . "," . $this->rew . "," . $this->stop . "," . $this->pause . "," . $this->restart . ")";
+  }
+}
+
-//If check box GUI element does not exist add it
-if(!class_exists("gui_checkbox")) {
@@ -53 +78 @@
-  }
-}
-
-
-//Main contributing module function------------------------------------------------------------------------------------------------------------------
@@ -94 +118 @@
-      }
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-      //Connect to iSymphony server to query and submit information
-      if(iSymphonyConnect()) {
-      
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            } else {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-          } else {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                  
-$object->asterisk_host = "localhost
-$object->asterisk_port = "5038
-$object->asterisk_login = "isymphony"
-$object->asterisk_password = "ismanager*con
-$object->device_user_mode = $deviceUserMode;
-
-if($object->update()) {
-isymphony_write_to_file($debugLogFile, "Updated location default\n");
-} else {
-isymphony_write_to_file($errorLogFile, "(Update location)" . $ISERROR. "\n");
+ $object->originating_context = "from-internal
+ $object->redirecting_context = "from-internal
+ $object->page_status_enabled = $maskedPagedStatusEnabledFlag
+ $object->page_context = "ext-paging
+ 
+ if($object->update()) {
+   isymphony_write_to_file($debugLogFile, "Updated tenant default\n");
+} else {
+   isymphony_write_to_file($errorLogFile, "(Update tenant)" . $ISERROR. "\n"); 
+}
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-            }
-          } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-          }
-        } else {
-(List tenants)" . $ISERROR
+Failed to grab location information"
-        }
-  
@@ -262 +381 @@
-          //Add and update extensions
-          foreach($freePBXUsers as $freePBXUser) {
+
+            //Mask auto answer flag
+            $maskedAutoAnswerFlag = ($freePBXUser["auto_answer"] == 1) ? "true" : "false";
-            
-            //If extension does not exist add it else update it
@@ -273 +395 @@
-              $object->alt_origination_method = "";
-              $object->voice_mail = $freePBXUser["user_id"];
+              $object->cell_phone = $freePBXUser["cell_phone"];
+              $object->email = $freePBXUser["email"];
+              $object->auto_answer = $maskedAutoAnswerFlag;
-              
-              if($object->add("default","default")) {
@@ -285 +410 @@
-                          
-                //Check if update needs to occur
-($object->name != $freePBXUser["display_name"]) || ($object->voice_mail != $freePBXUser["user_id"]) || ($object->peer != $freePBXUser["peer"]
+isymphony_extension_update_check($serverRevision, $freePBXUser, $maskedAutoAnswerFlag, $object
-                      
-                  $object->name = $freePBXUser["display_name"];
-                  $object->voice_mail = $freePBXUser["user_id"];
-                  $object->peer = $freePBXUser["peer"];
+                  $object->cell_phone = $freePBXUser["cell_phone"];
+                  $object->email = $freePBXUser["email"];
+                  $object->auto_answer = $maskedAutoAnswerFlag;
-                  
-                  if($object->update()) {
@@ -322 +450 @@
-          //Add and update profiles
-          foreach($freePBXProfiles as $freePBXProfile) {
-
+     
-            //If profile does not exist add it else update it
-            if(!in_array($freePBXProfile["user_id"], $iSymphonyProfiles)) {
@@ -331 +459 @@
-              $object->password = $freePBXProfile["password"];
-              $object->can_view_everyone_directory = "true";
+              $object->jabber_host = $freePBXProfile["jabber_host"];
+              $object->jabber_domain = $freePBXProfile["jabber_domain"];     
+              $object->jabber_resource = $freePBXProfile["jabber_resource"];        
+              $object->jabber_port = $freePBXProfile["jabber_port"]; 
+              $object->jabber_user_name = $freePBXProfile["jabber_user_name"];
+              $object->jabber_password = $freePBXProfile["jabber_password"];  
-              
-              if($object->add("default","default")) {
@@ -348 +482 @@
-              //Query profile configuration and update values
-              if(($object = getISymphonyProfile("default", "default", $freePBXProfile["user_id"])) !== false) {   
-
-
-
-
+
+
+
+
+
+
+
-                  $object->password = $freePBXProfile["password"];
+                  $object->jabber_host = $freePBXProfile["jabber_host"];
+                  $object->jabber_domain = $freePBXProfile["jabber_domain"];     
+                  $object->jabber_resource = $freePBXProfile["jabber_resource"];        
+                  $object->jabber_port = $freePBXProfile["jabber_port"]; 
+                  $object->jabber_user_name = $freePBXProfile["jabber_user_name"];
+                  $object->jabber_password = $freePBXProfile["jabber_password"];  
-                  
-                  if($object->update()) {
@@ -360 +503 @@
-                  } 
-                }
+                
+                //Attempt to add relative extension to profile
+                if(addISymphonyProfileManagedExtension("default","default",$freePBXProfile["user_id"],$freePBXProfile["user_id"])) {
+                  isymphony_write_to_file($debugLogFile, "Added profile managed extension {$freePBXProfile['user_id']}\n");
+                }
+
-              } else {
-                isymphony_write_to_file($errorLogFile, "(Query profile)" . $ISERROR. "\n"); 
@@ -555 +704 @@
-}
-
+
+
+//iSymphony module API location functions------------------------------------------------------------------------------------------------------------
+function isymphony_location_update($adminUserName, $adminPassword, $originateTimeout, $autoReload, $pageStatusEnabled, $jabberHost, $jabberDomain, $jabberResource, $jabberPort) {
+  global $db; 
+  $autoReload = $autoReload ? "1" : "0";
+  $pageStatusEnabled = $pageStatusEnabled ? "1" : "0";
+  $prepStatement = $db->prepare("UPDATE isymphony_location SET admin_user_name = ?, admin_password = ?, originate_timeout = ?, auto_reload = ?, page_status_enabled = ?, jabber_host = ?, jabber_domain = ?, jabber_resource = ?, jabber_port = ?");
+  $values = array($adminUserName, $adminPassword, $originateTimeout, $autoReload, $pageStatusEnabled, $jabberHost, $jabberDomain, $jabberResource, $jabberPort);
+  $db->execute($prepStatement, $values);
+}
+
+function isymphony_location_get() {
+  global $db; 
+  $query = "SELECT * FROM isymphony_location";
+  $results = sql($query, "getRow", DB_FETCHMODE_ASSOC);
+  if((DB::IsError($results)) || (empty($results))) {
+    return null;
+  } else {
+    return $results;
+  }
+}
+
-//iSymphony module API user functions----------------------------------------------------------------------------------------------------------------
-
+, $cell_phone, $email, $autoAnswer, $jabberHost, $jabberDomain, $jabberResource, $jabberPort, $jabberUserName, $jabberPassword
-  global $db; 
-  $addProfile = $addProfile ? "1" : "0";
-  $addExtension = $addExtension ? "1" : "0";
-
-
+
+
+
-  $db->execute($prepStatement, $values);
-}
-
-
+, $cell_phone, $email, $autoAnswer, $jabberHost, $jabberDomain, $jabberResource, $jabberPort, $jabberUserName, $jabberPassword
-  global $db; 
-  $addProfile = $addProfile ? "1" : "0";
-  $addExtension = $addExtension ? "1" : "0";
-
-
+
+
+
-  $db->execute($prepStatement, $values);
-}
@@ -734 +908 @@
-    $userProfile = ($iSymphonyUser["add_profile"] == "1");
-    $password = $iSymphonyUser["password"];
+    $email  = $iSymphonyUser["email"];
+    $cell_phone = $iSymphonyUser["cell_phone"];
+    $autoAnswer = $iSymphonyUser["auto_answer"];
+    $jabberHost = $iSymphonyUser["jabber_host"];
+    $jabberDomain = $iSymphonyUser["jabber_domain"];
+    $jabberResource = $iSymphonyUser["jabber_resource"];
+    $jabberPort = $iSymphonyUser["jabber_port"];
+    $jabberUserName = $iSymphonyUser["jabber_user_name"];
+    $jabberPassword = $iSymphonyUser["jabber_password"];
-  
-  } else {
-    $added = true;
-    $userProfile = true;
-
+
+
+
+
+
+
+
+
+
+
-  }
-  
-  //Create GIU elements if not on delete page
-  if ($action != "del") {
-
-
+
-    $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)); 
+    
+    $section = _("iSymphony Extension Settings");
+    $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_auto_answer", $autoAnswer, "Auto Answer", "Makes this extension automatically answer the initial call received from the system when performing an origination within the panel. Only works with Aastra, Grandstream, Linksys, Polycom, and Snom phones.", "on", "", "", false));
+    $currentcomponent->addguielem($section, new gui_textbox("isymphony_add_email", $email, "Email Address", "The email address entered here will be used whenever someone clicks the email icon for this extension.", "", "", true, "100"));
+    $currentcomponent->addguielem($section, new gui_textbox("isymphony_add_cell_phone", $cell_phone, "Cell Phone", "The number entered here will be used whenever someone clicks the cell phone icon for this extension.", "", "", true, "100"));
+
+    $section = _("iSymphony Jabber Settings");
+    $currentcomponent->addguielem($section, new gui_textbox("isymphony_jabber_host", $jabberHost, "Host", "Host or IP of jabber server this extension will connect to.", "", "", true, "100"));
+    $currentcomponent->addguielem($section, new gui_textbox("isymphony_jabber_domain", $jabberDomain, "Domain", "Domain this extension will connect to the jabber server with.", "", "", true, "100"));
+    $currentcomponent->addguielem($section, new gui_textbox("isymphony_jabber_resource", $jabberResource, "Resource", "Resource this extension will connect to the jabber server with.", "", "", true, "100"));
+    $currentcomponent->addguielem($section, new gui_textbox("isymphony_jabber_port", $jabberPort, "Port", "Port this extension will connect to the jabber server with.", "", "", true, "100"));
+    $currentcomponent->addguielem($section, new gui_textbox("isymphony_jabber_user_name", $jabberUserName, "UserName", "UserName this extension will connect to the jabber server with.", "", "", true, "100"));
+    $currentcomponent->addguielem($section, new gui_textbox("isymphony_jabber_password", $jabberPassword, "Password", "Password this extension will connect to the jabber server with.", "", "", true, "100"));
-  }
-}
@@ -771 +976 @@
-  $addExtension = isset($_REQUEST["isymphony_add_extension"]);
-  $addProfile = isset($_REQUEST["isymphony_add_profile"]);
+  $autoAnswer = isset($_REQUEST["isymphony_auto_answer"]);
-  $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)) {
@@ -782 +1002 @@
-    } else if(($action == "add") || ($action == "edit") && ($name !== null)) {
-      if(isymphony_user_get($extension) === null) {
-
+, $cell_phone, $email, $autoAnswer, $jabberHost, $jabberDomain, $jabberResource, $jabberPort, $jabberUserName, $jabberPassword
-      } else {
-
+, $cell_phone, $email, $autoAnswer, $jabberHost, $jabberDomain, $jabberResource, $jabberPort, $jabberUserName, $jabberPassword
-      }
-    }
@@ -902 +1122 @@
-}
-
+//Update checks--------------------------------------------------------------------------------------------------------------------------------------
+function isymphony_location_update_check($serverRevision, $databaseValues, $maskedAutoReloadFlag, $object) {
+  
+  //Checks for revision 1489 and up
+  if($serverRevision >= 1489) {
+    return (($object->asterisk_host != "localhost") || 
+        ($object->asterisk_port != "5038") || 
+        ($object->asterisk_login != "isymphony") || 
+        ($object->asterisk_password != "ismanager*con") || 
+        ($object->originate_timeout != $databaseValues["originate_timeout"]) ||
+        ($object->reload_on_dial_plan_reload != $maskedAutoReloadFlag) ||
+        ($object->jabber_host != $databaseValues["jabber_host"]) ||
+        ($object->jabber_domain != $databaseValues["jabber_domain"]) ||
+        ($object->jabber_resource != $databaseValues["jabber_resource"]) ||
+        ($object->jabber_port != $databaseValues["jabber_port"]) ||
+        ($object->device_user_mode != "true"));
+        
+  //Checks for 1105-1488      
+  } else if($serverRevision > 1104) {
+    return (($object->asterisk_host != "localhost") || 
+        ($object->asterisk_port != "5038") || 
+        ($object->asterisk_login != "isymphony") || 
+        ($object->asterisk_password != "ismanager*con") || 
+        ($object->originate_timeout != $databaseValues["originate_timeout"]) ||
+        ($object->jabber_host != $databaseValues["jabber_host"]) ||
+        ($object->jabber_port != $databaseValues["jabber_port"]) ||
+        ($object->device_user_mode != "true"));
+  
+  //Checks for rev 1104 and below
+  } else {
+    
+    return  (($object->asterisk_host != "localhost") || 
+        ($object->asterisk_port != "5038") || 
+        ($object->asterisk_login != "isymphony") || 
+        ($object->asterisk_password != "ismanager*con") || 
+        ($object->originate_timeout != $databaseValues["originate_timeout"]) ||
+        ($object->jabber_host != $databaseValues["jabber_host"]) ||
+        ($object->jabber_port != $databaseValues["jabber_port"]));
+  } 
+}
+
+function isymphony_tenant_update_check($serverRevision, $databaseValues, $maskedPagedStatusEnabledFlag, $object) {
+  
+  //Checks for 1105 and above
+  if($serverRevision > 1104) {
+    return (($object->originating_context != "from-internal") || 
+        ($object->redirecting_context != "from-internal") ||
+        ($object->page_status_enabled != $maskedPagedStatusEnabledFlag) ||
+        ($object->page_context != "ext-paging"));
+    
+  //Checks for 1104 and below 
+  } else {
+    return ($object->originating_context != "from-internal") || ($object->redirecting_context != "from-internal");
+  }                           
+}
+
+function isymphony_extension_update_check($serverRevision, $databaseValues, $maskedAutoAnswerFlag, $object) {
+  
+  //Checks for 1493 and above
+  if($serverRevision >= 1493) {
+    return (($object->cell_phone != $databaseValues["cell_phone"]) || 
+        ($object->email != $databaseValues["email"]) || 
+        ($object->name != $databaseValues["display_name"]) || 
+        ($object->voice_mail != $databaseValues["user_id"]) || 
+        ($object->peer != $databaseValues["peer"]) ||
+        ($object->auto_answer != $maskedAutoAnswerFlag));
+        
+  //Checks for 1492 and below 
+  } else {
+    return (($object->cell_phone != $databaseValues["cell_phone"]) || 
+        ($object->email != $databaseValues["email"]) || 
+        ($object->name != $databaseValues["display_name"]) || 
+        ($object->voice_mail != $databaseValues["user_id"]) || 
+        ($object->peer != $databaseValues["peer"]));
+  }
+}
+
+function isymphony_profile_update_check($serverRevision, $databaseValues, $maskedJabberPort, $object) {
+  
+  //Checks for revision 1489 and up
+  if($serverRevision >= 1489) {
+    return (($object->password != $databaseValues["password"]) ||         
+          ($object->jabber_host != $databaseValues["jabber_host"]) || 
+        ($object->jabber_domain != $databaseValues["jabber_domain"]) ||     
+        ($object->jabber_resource != $databaseValues["jabber_resource"]) ||  
+        ($maskedJabberPort != $databaseValues["jabber_port"]) || 
+        ($object->jabber_user_name != $databaseValues["jabber_user_name"]) || 
+        ($object->jabber_password != $databaseValues["jabber_password"]));
+        
+  //Checks for revision 1488 and below  
+  } else {
+    return (($object->password != $databaseValues["password"]) ||         
+        ($object->jabber_user_name != $databaseValues["jabber_user_name"]) || 
+        ($object->jabber_password != $databaseValues["jabber_password"]));    
+  }
+}
+
-//Helper functions-----------------------------------------------------------------------------------------------------------------------------------
-function isymphony_write_to_file($file, $content) {

contributed_modules/modules/isymphony/install.php

@@ -4 +4 @@
- *Author       : Michael Yara
- *Created      : August 15, 2008
-September 17, 2008
-2
+May 26, 2009
+3
- *Purpose      : Create and populate isymphony tables
- *Copyright    : 2008 HEHE Enterprises, LLC
@@ -11 +11 @@
-
-global $db;
+
+//Create location table
+$query = "  CREATE TABLE IF NOT EXISTS 
+      isymphony_location( admin_user_name VARCHAR(100),
+                admin_password VARCHAR(100),
+                originate_timeout INTEGER(10),
+                auto_reload INTEGER(1),
+                page_status_enabled INTEGER(1),
+                jabber_host VARCHAR(100),
+                jabber_domain VARCHAR(100),
+                jabber_resource VARCHAR(100),
+                jabber_port INTEGER(10))"; 
+                
+echo "Creating \"isymphony_location\" Table....<br>";               
+$results = $db->query($query);
+if(DB::IsError($results) && ($results->getCode() != DB_ERROR_ALREADY_EXISTS)) {
+  echo "ERROR: could not create table.<br>";
+} else {
+  
+  //Check to see if table already contains location information if not insert row of default values
+  $result = $db->query("SELECT * FROM isymphony_location");
+  if($result->numRows() == 0) {
+    
+    //Populate with default values
+    echo "Populating table.....<br>";
+    $prepStatement = $db->prepare("INSERT INTO isymphony_location (admin_user_name, admin_password, originate_timeout, auto_reload, page_status_enabled, jabber_port, jabber_resource) VALUES (?, ?, ?, ?, ?, ?, ?)");
+    $values = array("admin", "secret", "30000", 1, 1, 5222, "iSymphony");
+    $db->execute($prepStatement, $values);
+  }
+}               
+echo "Done<br>";                
-
-//Create users table
@@ -20 +51 @@
-              password VARCHAR(100), 
-              display_name VARCHAR(100), 
-
+
+
+
+
+
+
+
+
+
+
-
-echo "Creating \"isymphony_users\" Table....<br>";
@@ -27 +67 @@
-  echo "ERROR: could not create table.<br>";
-} else {
+
+
+  //If updating check if proper column entries exist. If not create them. Used for module upgrade purposes.
+  $iSymphonyUserTableStringColumns = array("email", "cell_phone", "jabber_host", "jabber_domain", "jabber_resource", "jabber_user_name", "jabber_password");
+  $iSymphonyUserTableIntegerColumns = array("jabber_port");
+  $iSymphonyUserTableBooleanColumns= array("auto_answer");
+
+  foreach($iSymphonyUserTableStringColumns as $stringColumn) {
+    $sql = "SELECT $stringColumn FROM isymphony_users";
+    $check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+    if(DB::IsError($check)) {
+        $sql = "ALTER TABLE isymphony_users ADD $stringColumn VARCHAR(200);";
+        $result = $db->query($sql);
+        if(DB::IsError($result)) { die_freepbx($result->getDebugInfo()); }
+    }
+  }
+  
+  foreach($iSymphonyUserTableIntegerColumns as $integerColumn) {
+    $sql = "SELECT $integerColumn FROM isymphony_users";
+    $check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+    if(DB::IsError($check)) {
+        $sql = "ALTER TABLE isymphony_users ADD $integerColumn INTEGER(10);";
+        $result = $db->query($sql);
+        if(DB::IsError($result)) { die_freepbx($result->getDebugInfo()); }
+    }
+  }
+  
+  foreach($iSymphonyUserTableBooleanColumns as $booleanColumn) {
+    $sql = "SELECT $booleanColumn FROM isymphony_users";
+    $check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+    if(DB::IsError($check)) {
+        $sql = "ALTER TABLE isymphony_users ADD $booleanColumn INTEGER(1);";
+        $result = $db->query($sql);
+        if(DB::IsError($result)) { die_freepbx($result->getDebugInfo()); }
+    }
+  }
-
-  //Add users to table
@@ -39 +115 @@
-        $extensionPeer = ($freePBXDeviceInfo['dial'] != "") ? $freePBXDeviceInfo['dial'] : "SIP/$userId";
-        
-) VALUES (
-
+, auto_answer, jabber_resource) VALUES (?, ?, 
+, 0, "iSymphony"
-        $db->execute($prepStatement, $values);
-      }

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

@@ -4 +4 @@
- *Author       : Michael Yara
- *Created      : June 15, 2008
-August 22, 2008
-2
+May 27, 2009
+4
- *Purpose      : Contains all functions used to interact with the iSymphony configuration.
- *Copyright    : 2008 HEHE Enterprises, LLC
@@ -28 +28 @@
-$ISERROR = "";
-
+//Tracker variables for improved running time
+$IN_LOCATION = false;
+$IN_TENNAT = false;
+
-//Connection methods-------------------------------------------------------------------------------
-/*###############################################
@@ -43 +47 @@
-  if(($SOCKET = socket_create(AF_INET, SOCK_STREAM, 0)) && (socket_connect($SOCKET, $HOST, $PORT))) {   
-    
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    return true;
-  } else {
@@ -63 +81 @@
-function iSymphonyDisconnect() {
-  
-
+
+
+
+
-  
-  if(($SOCKET !== null) && ($SOCKET)) {
@@ -1934 +1955 @@
-
-/*###############################################
+ * Gets the server revision
+ * Takes: nothing
+ * Returns: server revision if successful or false if error occurred  
+ */ 
+function getiSymphonyServerRevision() {
+  
+  if(($serverVersion = getiSymphonyServerVersion()) === false) {
+    return false;
+  }
+  
+  //Parse our server revision number from server version
+  $serverRevison = ereg_replace("[^0-9]+", '', substr($serverVersion, strpos($serverVersion, "rev")));
+  
+  //If revision number is not numeric something went wrong in the parsing. If so return false.
+  if(!is_numeric($serverRevison)) {
+    $ISERROR = "Error: Parsed server version was non numeric.";
+    return false;
+  }
+  
+  return $serverRevison;
+}
+
+/*###############################################
- * Shutdown the iSymphony server
- * Takes: nothing

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

@@ -4 +4 @@
- *Author       : Michael Yara
- *Created      : June 15, 2008
-August 22, 2008
-4
+May 27, 2009
+5
- *Purpose      : Contains declarations of all property classes. 
- *Copyright    : 2008 HEHE Enterprises, LLC
@@ -63 +63 @@
- *    asterisk_password: Asterisk manager password(STRING)
- *    originate_timeout: Amount of time an originator will be rung on an origination event in milliseconds(INTEGER)
+ *    reload_on_dial_plan_reload: Flag used to reload this location when the dial plan reloads(BOOLEAN[true or false])
- *    jabber_host: Jabber host name(STRING)
+ *    jabber_domain: Jabber domain name(STRING)
+ *    jabber_resource: Jabber resource name(STRING)
- *    jabber_port: Jabber port(INTEGER)
- *    device_user_mode: (BOOLEAN[true or false])
@@ -87 +90 @@
-  var $asterisk_login = "";
-  var $asterisk_password = "";
-originate_timeout
+reload_on_dial_plan_reload
-  var $jabber_host = "";
+  var $jabber_domain = "";
+  var $jabber_resource = "";
-  var $jabber_port = "";
-  var $device_user_mode = "";
@@ -167 +172 @@
- *    record_file_extension: File extensions used for recorded calls(STRING)
- *    mix_mode: Flag used to mix incoming and outgoing recorded call channels(BOOLEAN[true or false])
+ *    page_status_enabled: Flag used to enable page status(BOOLEAN[true or false])
+ *    page_context: Page context used to suppress paging status(STRING)
- *
- * Methods:
@@ -192 +199 @@
-  var $record_file_extension = "";
-  var $mix_mode = "";
+  var $page_status_enabled = "";
+  var $page_context = "";
-  
-  //Methods
@@ -268 +277 @@
-  *   voice_mail: Voice mail box number of this extension(STRING)
-  *   agent: Agent number associated with this extension(STRING)
+  *   auto_answer: Flag used to indicate if origination call back should be auto answered.
-  *
-  * Methods:
@@ -293 +303 @@
-  var $voice_mail = "";
-  var $agent = "";
+  var $auto_answer = "";
-  
-  //Methods
@@ -326 +337 @@
-    
-    global $extensionPropertyArray;
-
+     
-    //Move to tenant mode
-    if(!moveToTenant($location, $tenant)) {
@@ -364 +375 @@
-  *   name: Username for profile(STRING)
-  *   password: Password for profile(STRING)
+  *   jabber_host: Jabber host name(STRING)
+  *   jabber_domain: Jabber domain name(STRING)
+  *   jabber_resource: Jabber resource name(STRING)
+  *   jabber_port: Jabber port(INTEGER)
-  *   jabber_user_name: Jabber username(STRING)
-  *   jabber_password: Jabber password(STRING)
@@ -386 +401 @@
-  var $name = "";
-  var $password = "";
+  var $jabber_host = "";
+  var $jabber_domain = "";
+  var $jabber_resource = "";
+  var $jabber_port = "";  
-  var $jabber_user_name = "";
-  var $jabber_password = "";

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

@@ -4 +4 @@
- *Author       : Michael Yara
- *Created      : June 15, 2008
-une 18, 2008
-1
+anuary 27, 2009
+2
- *Purpose      : Contains utility functions used by the library. 
- *Copyright    : 2008 HEHE Enterprises, LLC
@@ -154 +154 @@
-}
-
+/*###############################################
+ * Removes an element from an array by value
+ * Takes: an array and the element to be removed
+ * Returns: and new re-orderd array without the removed element
+ */
+function remove_element($arr, $val){
+  foreach ($arr as $key => $value){
+    if ($arr[$key] == $val){
+      unset($arr[$key]);
+    }
+  }
+  return $arr = array_values($arr);
+}
-
-?>

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

@@ -4 +4 @@
- *Author       : Michael Yara
- *Created      : June 15, 2008
-June 18, 2008
-1
+May 7, 2009
+2
- *Purpose      : Contains functions used to navigate through different modes of the CLI. 
- *Copyright    : 2008 HEHE Enterprises, LLC
- */
+
-
-/*###############################################
@@ -27 +28 @@
- */
-function moveToLocation($location) {
-
-
-
-
-
+
-    
-  //Move to location
-
+
+
+
-}
-
@@ -43 +42 @@
- */
-function moveToTenant($location, $tenant) {
+  global $IN_LOCATION, $IN_TENANT;
-  
-  //Move to location
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -59 +63 @@
- */
-function moveToExtension($location, $tenant, $extension) {
-
-
-
-
+
+
+
+
+
+
+
-  }
-  
@@ -75 +82 @@
- */
-function moveToProfile($location, $tenant, $profile) {
-
-
-
-
+
+
+
+
+
+
+
-  }
-  
@@ -91 +101 @@
- */
-function moveToQueue($location, $tenant, $queue) {
-
-
-
-
+
+
+
+
+
+
+
-  }
-  
@@ -107 +120 @@
- */
-function moveToConferenceRoom($location, $tenant, $room) {
-
-
-
-
+
+
+
+
+
+
+
-  }
-  

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

@@ -4 +4 @@
- *Author       : Michael Yara
- *Created      : June 15, 2008
-August 22, 2008
-3 
+May 27, 2009
+5
- *Purpose      : Contains arrays witch describe all configuration object property names along with functions to modify
- *         the arrays for specific versions of the server. 
@@ -26 +26 @@
-$conferenceRoomPermissionPropertyArray = array("steal_call","transfer_to","originate_to","mute_users","kick_users");
-
+//Property array modification functions--------------------------------------------------------------------------------------------------------------
+function isymphony_modify_property_arrays_2_1() {
+  global $locationPropertyArray, $extensionPropertyArray, $tenantPropertyArray;
+  
+  //New modifications
+  array_push($locationPropertyArray, "device_user_mode");
+  
+  array_push($tenantPropertyArray, "page_status_enabled");
+  array_push($tenantPropertyArray, "page_context");
+  
+  $extensionPropertyArray = remove_element($extensionPropertyArray, "agent");
+}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-?>

contributed_modules/modules/isymphony/module.xml

@@ -2 +2 @@
-  <rawname>isymphony</rawname>
-  <name>iSymphony</name>
-0.8
+1.0.0
-  <type>setup</type>
-Third Party Addon
+Modules
-  <description>
-    This module automatically configures iSymphony to reflect the FreePBX configuration. 
@@ -14 +14 @@
-    <version>>=2.3.0</version>
-  </depends>
-contributed_modules/release/isymphony-0.8.tgz
-d72fee48b01c0912dae805aad1bd2215
+junk
+junk
-  <changelog>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  </changelog>
-  <info>http://www.i9technologies.com/isymphony</info>

contributed_modules/modules/isymphony/page.isymphony.php

@@ -4 +4 @@
- *Author       : Michael Yara
- *Created      : July 2, 2008
-August 22, 2008
-5
+May 27, 2009
+6
- *Purpose      : Information page for iSymphony module
- *Copyright    : 2008 HEHE Enterprises, LLC
- */
-
-
-//Turn on debugging if it is requested
-$debugUrlAddition = "";
-$debugMenuAddition = "";
-if(($debug = isset($_REQUEST["debug"])) === true) {
-$debugUrlAddition = "&debug=yes";
-$debugMenuAddition = "  <tr><td colspan=\"2\"><h5>Module Debug<hr></h5></td></tr>
-            <tr><td><a href=\"/admin/modules/isymphony/debug.txt\" target=\"_blank\">View Debug Log</a></td></tr>
-            <tr><td><a href=\"/admin/modules/isymphony/error.txt\" target=\"_blank\">View Error Log</a></td></tr>
-            <tr><td><a href=\"config.php?type=setup&display=isymphony&showdb=yes$debugUrlAddition\">View Database</a></td></tr>"; 
-}
-  
-//Check to see if the server is running
@@ -60 +49 @@
-}
-
+//Check for a location settings update action
+if(isset($_REQUEST["isymphony_update_location_settings"])) {
+
+  //Update data base
+  isymphony_location_update(  trim($_REQUEST["isymphony_admin_user_name"]), 
+                trim($_REQUEST["isymphony_admin_password"]), 
+                trim($_REQUEST["isymphony_originate_timeout"]), 
+                isset($_REQUEST["isymphony_auto_reload"]) ? "1" : "0", 
+                isset($_REQUEST["isymphony_page_status_enabled"]) ? "1" : "0",  
+                trim($_REQUEST["isymphony_jabber_host"]), 
+                trim($_REQUEST["isymphony_jabber_domain"]),
+                trim($_REQUEST["isymphony_jabber_resource"]), 
+                trim($_REQUEST["isymphony_jabber_port"]));
+  //Flag FreePBX for reload             
+  needreload();             
+}
+
+//Grab location information
+$locationInformation = isymphony_location_get();
+
+//Debug url additions
+$debugUrlAdditions = "";
+
-//Check if a request to show the database was made
-$databaseDisplay = "";
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  
-  //Build extensions table
-  $databaseDisplay .= " <table>
-                <tr>
-6
+15
-                </tr>
-                <tr>
@@ -76 +122 @@
-                  <td>Display Name&nbsp&nbsp&nbsp</td>
-                  <td>Peer&nbsp&nbsp&nbsp</td>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                </tr>";
-
@@ -89 +144 @@
-                  <td>{$user['display_name']}</td>
-                  <td>{$user['peer']}</td>
+                  <td>{$user['email']}</td>
+                  <td>{$user['cell_phone']}</td>
+                  <td>{$user['auto_answer']}</td>
+                  <td>{$user['jabber_host']}</td>
+                  <td>{$user['jabber_domain']}</td>
+                  <td>{$user['jabber_resource']}</td>
+                  <td>{$user['jabber_port']}</td>
+                  <td>{$user['jabber_user_name']}</td>
+                  <td>{$user['jabber_password']}</td>
-                </tr>";
-  }
@@ -143 +207 @@
-}
-
+//Check if a request to show module debug log was made
+$debugLogDisplay = "";
+if(isset($_REQUEST["showmoduledebuglog"])) {
+  
+  $debugUrlAdditions .= "&showmoduledebuglog=yes";
+  
+  $debugLogDisplay .= " <tr><td colspan=\"2\"><h5>Module Debug Log<hr></h5></td></tr>
+              <tr><td colspan=\"2\"><p>";
+  
+  //Open debug log
+  if(($debugLogFile = fopen("/var/www/html/admin/modules/isymphony/debug.txt", 'r')) !== false) {
+    while (!feof($debugLogFile)) {
+          $line = fgets($debugLogFile, 4096);
+          $debugLogDisplay .= htmlspecialchars($line) . "<br>";
+      }
+      fclose($debugLogFile);
+  }
+
+  $debugLogDisplay .= "</p></td></tr>";
+}
+
+//Check if a request to show module error log was made
+if(isset($_REQUEST["showmoduleerrorlog"])) {
+  
+  $debugUrlAdditions .= "&showmoduleerrorlog=yes";
+  
+  $debugLogDisplay .= " <tr><td colspan=\"2\"><h5>Module Error Log<hr></h5></td></tr>
+              <tr><td colspan=\"2\"><p>";
+
+  //Open error log
+  if(($errorLogFile = fopen("/var/www/html/admin/modules/isymphony/error.txt", 'r')) !== false) {
+    while (!feof($errorLogFile)) {
+          $line = fgets($errorLogFile, 4096);
+          $debugLogDisplay .= htmlspecialchars($line) . "<br>";
+      }
+      fclose($errorLogFile);
+  }
+  
+  $debugLogDisplay .= "</p></td></tr>";
+}
+
+//Check if a request to show server error log was made
+if(isset($_REQUEST["showservererrorlog"])) {
+  
+  $debugUrlAdditions .= "&showservererrorlog=yes";
+  
+  $debugLogDisplay .= " <tr><td colspan=\"2\"><h5>Server Error Log<hr></h5></td></tr>
+              <tr><td colspan=\"2\"><p>";
+
+  //Open error log
+  if(($errorLogFile = fopen("/opt/isymphony/server/logs/error.txt", 'r')) !== false) {
+    while (!feof($errorLogFile)) {
+          $line = fgets($errorLogFile, 4096);
+          $debugLogDisplay .= htmlspecialchars($line) . "<br>";
+      }
+      fclose($errorLogFile);
+  }
+  
+  $debugLogDisplay .= "</p></td></tr>";
+}
+
+//Check if a request to show server core log was made
+if(isset($_REQUEST["showservercorelog"])) {
+  
+  $debugUrlAdditions .= "&showservercorelog=yes";
+  
+  $debugLogDisplay .= " <tr><td colspan=\"2\"><h5>Server Core Log<hr></h5></td></tr>
+              <tr><td colspan=\"2\"><p>";
+
+  //Open error log
+  if(($errorLogFile = fopen("/opt/isymphony/server/logs/core-events.txt", 'r')) !== false) {
+    while (!feof($errorLogFile)) {
+          $line = fgets($errorLogFile, 4096);
+          $debugLogDisplay .= htmlspecialchars($line) . "<br>";
+      }
+      fclose($errorLogFile);
+  }
+  
+  $debugLogDisplay .= "</p></td></tr>";
+}
+
+//Check if a request to show server communication log was made
+if(isset($_REQUEST["showservercommunicationlog"])) {
+  
+  $debugUrlAdditions .= "&showservercommunicationlog=yes";
+  
+  $debugLogDisplay .= " <tr><td colspan=\"2\"><h5>Server Communication Log<hr></h5></td></tr>
+              <tr><td colspan=\"2\"><p>";
+
+  //Open error log
+  if(($errorLogFile = fopen("/opt/isymphony/server/logs/communication.txt", 'r')) !== false) {
+    while (!feof($errorLogFile)) {
+          $line = fgets($errorLogFile, 4096);
+          $debugLogDisplay .= htmlspecialchars($line) . "<br>";
+      }
+      fclose($errorLogFile);
+  }
+  
+  $debugLogDisplay .= "</p></td></tr>";
+}
+
+//Check if a request to show server aj external log was made
+if(isset($_REQUEST["showserverajexternallog"])) {
+  
+  $debugUrlAdditions .= "&showserverajexternallog=yes";
+  
+  $debugLogDisplay .= " <tr><td colspan=\"2\"><h5>Server AJ External Log<hr></h5></td></tr>
+              <tr><td colspan=\"2\"><p>";
+
+  //Open error log
+  if(($errorLogFile = fopen("/opt/isymphony/server/logs/asterisk-java-external.txt", 'r')) !== false) {
+    while (!feof($errorLogFile)) {
+          $line = fgets($errorLogFile, 4096);
+          $debugLogDisplay .= htmlspecialchars($line) . "<br>";
+      }
+      fclose($errorLogFile);
+  }
+  
+  $debugLogDisplay .= "</p></td></tr>";
+}
+
+//Check if a request to show server aj internal log was made
+if(isset($_REQUEST["showserverajinternallog"])) {
+  
+  $debugUrlAdditions .= "&showserverajinternallog=yes";
+  
+  $debugLogDisplay .= " <tr><td colspan=\"2\"><h5>Server AJ Internal Log<hr></h5></td></tr>
+              <tr><td colspan=\"2\"><p>";
+
+  //Open error log
+  if(($errorLogFile = fopen("/opt/isymphony/server/logs/asterisk-java-internal.txt", 'r')) !== false) {
+    while (!feof($errorLogFile)) {
+          $line = fgets($errorLogFile, 4096);
+          $debugLogDisplay .= htmlspecialchars($line) . "<br>";
+      }
+      fclose($errorLogFile);
+  }
+  
+  $debugLogDisplay .= "</p></td></tr>";
+}
+
-//Connect to iSymphony server to query information
-if($serverRunning && iSymphonyConnect()) {
@@ -172 +377 @@
-
-  //Build action buttons
-
+s
-                <input type=\"Submit\" name=\"isymphony_reload\" value=\"Reload\">
-              </form>";
-
+s
-                  <input type=\"text\" name=\"isymphony_license_key\">
-                  <input type=\"Submit\" name=\"isymphony_activate_license\" value=\"Activate\">
@@ -201 +406 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $licenseActivationError
-        <h2>iSymphony</h2>
-        <table>
+          <tr><td colspan=\"2\"><h2 id=\"title\">iSymphony</h2></td></tr>
-          <tr><td colspan=\"2\"><h5>Server<hr></h5></td></tr>
-          <tr>
@@ -240 +487 @@
-            <td>$activateLicenseButton</td>           
-          </tr>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        </table>
-        $databaseDisplay

contributed_modules/modules/isymphony/uninstall.php

@@ -4 +4 @@
- *Author       : Michael Yara
- *Created      : August 15, 2008
-September 17, 2008
-2
+May 26, 2009
+3
- *Purpose      : Remove iSymphony tables and manager include
- *Copyright    : 2008 HEHE Enterprises, LLC
@@ -11 +11 @@
- 
-global $db;
+ 
+//Drop location table
+$query = "DROP TABLE IF EXISTS isymphony_location";
+echo "Removing \"isymphony_location\" Table....<br>";
+$results = $db->query($query);
+if(DB::IsError($results)) {
+  echo "ERROR: could not remove table.<br>";
+} 
- 
-//Drop users table