Changeset 3467

Timestamp:

01/02/07 06:18:07 (6 years ago)

Author:

qldrob

Message:

Merged revisions 3465 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/modules/branches/2.2

........

r3465 | qldrob | 2007-01-02 21:13:40 +1000 (Tue, 02 Jan 2007) | 2 lines

Fix astdb backup issues, add redirect_standard to avoid issues reported in #1454.

........

Files:

• modules/branches/2.3 (modified) (1 prop)
• modules/branches/2.3/backup/bin/dumpastdb.php (modified) (2 diffs)
• modules/branches/2.3/backup/bin/restoreastdb.php (modified) (2 diffs)
• modules/branches/2.3/backup/module.xml (modified) (2 diffs)
• modules/branches/2.3/backup/page.backup.php (modified) (1 diff)

modules/branches/2.3/backup/bin/dumpastdb.php

@@ -4 +4 @@
-
-global $argv;
-require_once("php-asmanager.php");
-
-function getconf($filename) {
@@ -16 +15 @@
-}
-
-AMP_CONF
+"/etc/amportal.conf"
-
+require_once($amp_conf['AMPWEBROOT']."/admin/common/php-asmanager.php");
-$astman         = new AGI_AsteriskManager();
-if (! $res = $astman->connect("127.0.0.1", $amp_conf["AMPMGRUSER"] , $amp_conf["AMPMGRPASS"])) {

modules/branches/2.3/backup/bin/restoreastdb.php

@@ -4 +4 @@
-
-global $argv;
-require_once("php-asmanager.php");
-
-function getconf($filename) {
@@ -16 +15 @@
-}
-
-
+
+
+
-
-$astman         = new AGI_AsteriskManager();

modules/branches/2.3/backup/module.xml

@@ -2 +2 @@
-  <rawname>backup</rawname>
-  <name>Backup &amp; Restore</name>
-0.3
+1
-  <type>tool</type>
-  <category>System Administration</category>
@@ -12 +12 @@
-  </depends>
-  <changelog>
+  *2.1* Actually, really, restore ASTDB now. Finally. Also add redirect_standard to avoid problems with TRBoE.
+  *2.0.4* Add he_IL translation
-  *2.0.3* don't have BLKVM and FM astdb trees, which shouldn't be left around anyhow
-  *2.0.2* fixed restore ALL to get it to actually work

modules/branches/2.3/backup/page.backup.php

@@ -98 +98 @@
-    core_devices2astdb();
-    needreload();
+    redirect_standard();
-  break;
-}