[Pkg-voip-commits] r3377 - in freepbx/modules-2.2/modules:
freepbx-module-parking freepbx-module-parking/debian
freepbx-module-voicemail freepbx-module-voicemail/debian
Diego Iastrubni
elcuco-guest at alioth.debian.org
Tue Apr 10 12:51:28 UTC 2007
Author: elcuco-guest
Date: 2007-04-10 12:51:28 +0000 (Tue, 10 Apr 2007)
New Revision: 3377
Modified:
freepbx/modules-2.2/modules/freepbx-module-parking/debian/changelog
freepbx/modules-2.2/modules/freepbx-module-parking/functions.inc.php
freepbx/modules-2.2/modules/freepbx-module-parking/module.xml
freepbx/modules-2.2/modules/freepbx-module-voicemail/debian/changelog
freepbx/modules-2.2/modules/freepbx-module-voicemail/functions.inc.php
freepbx/modules-2.2/modules/freepbx-module-voicemail/module.xml
Log:
run the fpx-modules, 2 modules got upgraded:
voicemail and parking.
the changes done upstream are to parse asterisk.conf and detect from the some dicretories. no new functionality.
Modified: freepbx/modules-2.2/modules/freepbx-module-parking/debian/changelog
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-parking/debian/changelog 2007-04-09 15:52:49 UTC (rev 3376)
+++ freepbx/modules-2.2/modules/freepbx-module-parking/debian/changelog 2007-04-10 12:51:28 UTC (rev 3377)
@@ -1,3 +1,9 @@
+freepbx-module-parking (2.2-2.1.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com> Tue, 10 Apr 2007 15:37:04 +0300
+
freepbx-module-parking (2.2-2.1-1) unstable; urgency=low
* First release.
Modified: freepbx/modules-2.2/modules/freepbx-module-parking/functions.inc.php
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-parking/functions.inc.php 2007-04-09 15:52:49 UTC (rev 3376)
+++ freepbx/modules-2.2/modules/freepbx-module-parking/functions.inc.php 2007-04-10 12:51:28 UTC (rev 3377)
@@ -9,6 +9,7 @@
function parking_get_config($engine) {
global $db;
global $ext; // is this the best way to pass this?
+ global $asterisk_conf;
switch($engine) {
case "asterisk":
@@ -35,7 +36,8 @@
//open the file and truncate. If diabled, file will be deleted this way
//AND GET THE ENV VARIABLES TO CALL THIS BY
- $filename = (isset($amp_conf["ASTETCDIR"]) ? $amp_conf["ASTETCDIR"] : "/etc/asterisk/") . "parking_additional.inc";
+ $filename = isset($asterisk_conf["astetcdir"]) && $asterisk_conf["astetcdir"] != '' ? rtrim($asterisk_conf["astetcdir"],DIRECTORY_SEPARATOR) : "/etc/asterisk";
+ $filename .= "/parking_additional.inc";
$fh = fopen($filename, "w+");
fwrite($fh, ";*** WARNING: DO NOT HAND EDIT THIS FILE IT IS AUTO-GENERATD ***\n;\n");
Modified: freepbx/modules-2.2/modules/freepbx-module-parking/module.xml
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-parking/module.xml 2007-04-09 15:52:49 UTC (rev 3376)
+++ freepbx/modules-2.2/modules/freepbx-module-parking/module.xml 2007-04-10 12:51:28 UTC (rev 3377)
@@ -1,7 +1,7 @@
<module>
<rawname>parking</rawname>
<name>Parking Lot</name>
- <version>2.1</version>
+ <version>2.1.1</version>
<type>setup</type>
<category>Internal Options & Configuration</category>
<description>Manages parking lot extensions and other options.
@@ -11,10 +11,11 @@
<parking>Parking Lot</parking>
</menuitems>
<changelog>
+ *2.1.1* fix pseudo hardcoded path issue (hardcoded form missing global)
*2.1* Remove settings on uninstall bug #1597
*2.0.2* Add he_IL translation
</changelog>
- <location>release/2.2/parking-2.0.2.tgz</location>
+ <location>release/2.2/parking-2.1.tgz</location>
<info>http://aussievoip.com.au/wiki/freePBX-ParkingLot</info>
- <md5sum>bfc593350434e47b8f291214fc2d137c</md5sum>
+ <md5sum>1c2ca325423c117580381a5ec4773d19</md5sum>
</module>
Modified: freepbx/modules-2.2/modules/freepbx-module-voicemail/debian/changelog
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-voicemail/debian/changelog 2007-04-09 15:52:49 UTC (rev 3376)
+++ freepbx/modules-2.2/modules/freepbx-module-voicemail/debian/changelog 2007-04-10 12:51:28 UTC (rev 3377)
@@ -1,3 +1,9 @@
+freepbx-module-voicemail (2.2-1.6.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com> Tue, 10 Apr 2007 15:37:02 +0300
+
freepbx-module-voicemail (2.2-1.6.1-1) unstable; urgency=low
* First release.
Modified: freepbx/modules-2.2/modules/freepbx-module-voicemail/functions.inc.php
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-voicemail/functions.inc.php 2007-04-09 15:52:49 UTC (rev 3376)
+++ freepbx/modules-2.2/modules/freepbx-module-voicemail/functions.inc.php 2007-04-10 12:51:28 UTC (rev 3377)
@@ -312,19 +312,23 @@
}
function voicemail_saveVoicemail($vmconf) {
+ global $amp_conf;
+
// just in case someone tries to be sneaky and not call getVoicemail() first..
if ($vmconf == null) die('Error: Trying to write null voicemail file! I refuse to contiune!');
// yes, this is hardcoded.. is this a bad thing?
- write_voicemailconf("/etc/asterisk/voicemail.conf", $vmconf, $section);
+ write_voicemailconf(rtrim($amp_conf["ASTETCDIR"],"/")."/voicemail.conf", $vmconf, $section);
}
function voicemail_getVoicemail() {
+ global $amp_conf;
+
$vmconf = null;
$section = null;
// yes, this is hardcoded.. is this a bad thing?
- parse_voicemailconf("/etc/asterisk/voicemail.conf", $vmconf, $section);
+ parse_voicemailconf(rtrim($amp_conf["ASTETCDIR"],"/")."/voicemail.conf", $vmconf, $section);
return $vmconf;
}
Modified: freepbx/modules-2.2/modules/freepbx-module-voicemail/module.xml
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-voicemail/module.xml 2007-04-09 15:52:49 UTC (rev 3376)
+++ freepbx/modules-2.2/modules/freepbx-module-voicemail/module.xml 2007-04-10 12:51:28 UTC (rev 3377)
@@ -1,22 +1,23 @@
<module>
<rawname>voicemail</rawname>
<name>Voicemail</name>
- <version>1.6.1</version>
+ <version>1.6.2</version>
<changelog>
- *1.6.1* Bump version to fix existing extensions with disabled voicemail #1697
- *1.6* Re-Fix 1.5.2, bump version for 2.2rc2 release.
- *1.5.3* Fix for vm Javascript sanity checks only working in DevAndUser mode.
- *1.5.2* Fix vm not appearing in DeviceAndUser mode
- *1.5.1* Fix for MWI not working
- *1.5* Fix issue with vm options not being saved on creation of extension
- *1.4.2* Change category to Basic
- *1.4.1* Fixed radio button defaults to 'no' from false so they work
- *1.4* First release for 2.2. Fix inability to create voicemail box
+ *1.6.2* Remove hardcoded paths to voicemail.conf
+ *1.6.1* Bump version to fix existing extensions with disabled voicemail #1697
+ *1.6* Re-Fix 1.5.2, bump version for 2.2rc2 release.
+ *1.5.3* Fix for vm Javascript sanity checks only working in DevAndUser mode.
+ *1.5.2* Fix vm not appearing in DeviceAndUser mode
+ *1.5.1* Fix for MWI not working
+ *1.5* Fix issue with vm options not being saved on creation of extension
+ *1.4.2* Change category to Basic
+ *1.4.1* Fixed radio button defaults to 'no' from false so they work
+ *1.4* First release for 2.2. Fix inability to create voicemail box
</changelog>
<description>This module allows you to configure Voicemail for a user or extension</description>
<type>setup</type>
<category>Basic</category>
- <location>release/2.2/voicemail-1.6.tgz</location>
+ <location>release/2.2/voicemail-1.6.1.tgz</location>
<info>http://aussievoip.com.au/wiki/freePBX-Features</info>
- <md5sum>f5dac5c572e6772b38f3bf9b13146fc0</md5sum>
+ <md5sum>68cd0c181f06fc2fef13392663321172</md5sum>
</module>
More information about the Pkg-voip-commits
mailing list