Changeset 13792

Timestamp:

03/09/12 18:03:41 (1 year ago)

Author:

p_lindheimer

Message:

Merged revisions 13780 via svnmerge from
http://www.freepbx.org/v2/svn/freepbx/branches/2.10

........

r13780 | p_lindheimer | 2012-03-07 20:05:52 -0800 (Wed, 07 Mar 2012) | 1 line

add Reload action and call instead of CLI module reload to trigger reload, re #5646 fixes the issue but other versions of FreePBX still broke as it's a real Asterisk bug

........

Files:

• freepbx/branches/2.9 (modified) (2 props)
• freepbx/branches/2.9/amp_conf/htdocs/admin/functions.inc.php (modified) (1 diff)
• freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/php-asmanager.php (modified) (1 diff)

freepbx/branches/2.9/amp_conf/htdocs/admin/functions.inc.php

@@ -278 +278 @@
-  
-  //reload MOH to get around 'reload' not actually doing that.
-  $astman->send_request('Command', array('Command'=>'moh reload'));
-  
-  //reload asterisk
-  if (version_compare($version,'1.4','lt')) {
+    $astman->send_request('Command', array('Command'=>'moh reload'));
-    $astman->send_request('Command', array('Command'=>'reload')); 
-  } else {
-
+
-  }
-  

freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/php-asmanager.php

@@ -960 +960 @@
-    return $this->command($pre . ' set global ' . $var . ' ' . $val);
-  }
+
+  /**
+  * Reload module(s)
+  *
+  * @link http://www.voip-info.org/wiki/view/Asterisk+Manager+API+Action+Reload
+  * @param string $module
+  * @param string $actionid
+  */
+  function Reload($module=NULL, $actionid=NULL) {
+    $parameters = array();
+
+    if ($actionid) {
+      $parameters['ActionID'] = $actionid;
+    }
+    if ($module) {
+      $parameters['Module'] = $module;
+    }
+    return $this->send_request('Reload', $parameters);
+  }
-}
-?>