Changeset 8270

Timestamp:

09/02/09 09:43:41 (1 year ago)

Author:

p_lindheimer

Message:

fixes #3850 adds dahdi (though some real dahdi testing is necessary, tried to get labels right), also moves retrieve_op_conf_from_mysql.php to an include file no longer stand-alone executable re #3837

Files:

• freepbx/branches/2.6/amp_conf/bin/retrieve_conf (modified) (2 diffs)
• freepbx/branches/2.6/amp_conf/bin/retrieve_op_conf_from_mysql.php (modified) (4 diffs)

freepbx/branches/2.6/amp_conf/bin/retrieve_conf

@@ -717 +717 @@
-}
-
-include("libfreepbx.confgen.php");
-
-// script to write op_server.cfg file from mysql 
-//
-if(!$amp_conf['FOPDISABLE'])  {
+  if (!@include("retrieve_op_conf_from_mysql.php")) {
+                error(_("error running retrieve_op_conf_from_mysql.php"));
+  }
+  /*
-        $script = $amp_conf['AMPBIN'].'/retrieve_op_conf_from_mysql.php';
-        if (is_executable($script)) {
@@ -733 +735 @@
-                error(_("retrieve_op_conf_from_mysql.php does not exist or is not executable"));
-        }
+  */
-}
-// generate configuration files

freepbx/branches/2.6/amp_conf/bin/retrieve_op_conf_from_mysql.php

@@ -1 @@
-#!/usr/bin/php -q
-<?php
-
-# Retrieves the sip user/peer entries from the database for the flash operator panel
-
-//include("/var/www/html/admin/functions.inc.php");
-//include("DB.php");
-require_once("/var/www/html/admin/functions.inc.php");
-require_once("DB.php");
-
-################### BEGIN OF CONFIGURATION ####################
-
-global $zapataconfdir;
-
-
+
+
+
+
+
-$zapataconf = "zapata.conf";
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-######## LAYOUT INFO #########
@@ -100 +95 @@
-        global $istrunk;
-        global $lastlabelnum;
+  global $chan_dahdi;
-
-        if (!isset($ampwildcard)) {$ampwildcard=0;}
-
+ $chan_dadhi ? "DAHDI %c" : 
-        if (!isset($istrunk)) {$istrunk=0;}
-        if (!isset($lastlabelnum)) {$lastlabelnum=0;}
@@ -214 +210 @@
-
-# cool hack by Julien BLACHE <jblache@debian.org>
-$ampconf = parse_amportal_conf( $amportalconf );
-# WARNING: this file will be substituted by the output of this program
-
+_
-# username to connect to the database
-
+_
-# password to connect to the database
-
+_
-# the name of the box the MySQL database is running on
-
+_
-# the name of the database our tables are kept
-
+_
-#sort option: extension or lastname
-
-
-
-
-
-
-
-
+
+
-################### END OF CONFIGURATION #######################
-
@@ -240 +229 @@
-; all modifications must be done from the web gui
-";
-
-switch ($db_engine)
-{
-        case "pgsql":
-        case "mysql":
-                /* datasource in in this style:
-                dbengine://username:password@host/database */
-
-                $datasource = $db_engine.'://'.$username.':'.$password.'@'.$hostname.'/'.$database;
-                $db = DB::connect($datasource); // attempt connection
-                break;
-
-        case "sqlite":
-                require_once('DB/sqlite.php');
-
-                if (!isset($amp_conf["AMPDBFILE"]))
-                        die("You must setup properly AMPDBFILE in /etc/amportal.conf");
-
-                if (isset($amp_conf["AMPDBFILE"]) == "")
-                        die("AMPDBFILE in /etc/amportal.conf cannot be blank");
-
-                $DSN = array (
-                        "database" => $amp_conf["AMPDBFILE"],
-                        "mode" => 0666
-                );
-
-                $db = new DB_sqlite();
-                $db->connect( $DSN );
-                break;
-
-        default:
-                die( "Unknown SQL engine: [$db_engine]");
-}
-
-if(DB::isError($db)) {
-       echo("FAILED\n");
-       echo("Cannot connect to database\n");
-           die($db->getMessage());
-
-}
-
-# Get layout-info from a "panel" table in the freepbx database