Changeset 48

Timestamp:

06/28/07 21:18:27 (1 year ago)

Author:

root

Message:

Added optional amportal.conf parsing

Files:

• trunk/op_server.cfg (modified) (1 diff)
• trunk/op_server.pl (modified) (3 diffs)

trunk/op_server.cfg

@@ -1 +1 @@
-[general]
+; If you want to use freepbx/trixbox conf file, set this to 1
+use_amportal_conf=0;
+
-; host or ip address of asterisk
-manager_host=192.168.0.1

trunk/op_server.pl

@@ -399 +399 @@
-}
-
+sub parse_amportal_config {
+    my $filename = shift;
+    my %ampconf;
+
+    open( AMPCONF, $filename ) || die "Cannot open $filename";
+
+    while (<AMPCONF>) {
+        if ( $_ =~ /^\s*([a-zA-Z0-9]+)\s*=\s*(.*)\s*([;#].*)?/ ) {
+            $ampconf{$1} = $2;
+        }
+    }
+
+    close(AMPCONF);
+    return %ampconf;
+}
+
-sub read_server_config() {
-    my $context = "";
@@ -467 +483 @@
-        }
-        close(CONFIG);
+    }
+
+    if ( defined( $config->{GENERAL}{use_amportal_conf} ) ) {
+        if ( $config->{GENERAL}{use_amportal_conf} == 1 ) {
+            my $freepbx_config = "/etc/amportal.conf";
+            my %ampconf;
+
+            if ( -e $freepbx_config ) {
+                %ampconf                              = parse_amportal_config($freepbx_config);
+                $config->{"GENERAL"}{"web_hostname"}  = $ampconf{"AMPWEBADDRESS"};
+                $config->{"GENERAL"}{"security_code"} = $ampconf{"FOPPASSWORD"};
+                $config->{"GENERAL"}{"flash_dir"}     = $ampconf{"FOPWEBROOT"};
+                $manager_user[0]                      = $ampconf{"AMPMGRUSER"};
+                $manager_secret[0]                    = $ampconf{"AMPMGRPASS"};
+            }
+        }
-    }
-
@@ -522 +554 @@
-
-    $clid_format = $config->{GENERAL}{clid_format};
-
+
-    $flash_file = $flash_dir . "/variables.txt";
-    push @all_flash_files, $flash_file;