February 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12036 - freeswitch/trunk/src/include
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: shaneb Date: Sun Feb 15 19:34:06 2009 New Revision: 12036 Log: Name changes Modified: freeswitch/trunk/src/include/switch_version.h.cmake Modified: freeswitch/trunk/src/include/switch_version.h.cmake ============================================================================== --- freeswitch/trunk/src/include/switch_version.h.cmake (original) +++ freeswitch/trunk/src/include/switch_version.h.cmake Sun Feb 15 19:34:06 2009 @@ -37,10 +37,10 @@ extern "C" { #endif -#define SWITCH_VERSION_MAJOR "@SWITCH_VERSION_MAJOR@" -#define SWITCH_VERSION_MINOR "@SWITCH_VERSION_MINOR@" -#define SWITCH_VERSION_MICRO "@SWITCH_VERSION_MICRO@" -#define SWITCH_VERSION_REVISION "@SWITCH_VERSION_REVISION@" +#define SWITCH_VERSION_MAJOR "@freeswitch_MAJOR_VERSION@" +#define SWITCH_VERSION_MINOR "@freeswitch_MINOR_VERSION@" +#define SWITCH_VERSION_MICRO "@freeswitch_PATCH_LEVEL@" +#define SWITCH_VERSION_REVISION "@Project_WC_REVISION@" #define SWITCH_VERSION_FULL SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO " (" SWITCH_VERSION_REVISION ")" #ifdef __cplusplus

1 0

[commit] r12035 - freeswitch/trunk/src/include
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: shaneb Date: Sun Feb 15 19:28:03 2009 New Revision: 12035 Log: Added new cmake template Added: freeswitch/trunk/src/include/switch_version.h.cmake Added: freeswitch/trunk/src/include/switch_version.h.cmake ============================================================================== --- (empty file) +++ freeswitch/trunk/src/include/switch_version.h.cmake Sun Feb 15 19:28:03 2009 @@ -0,0 +1,50 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthm(a)freeswitch.org> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthm(a)freeswitch.org> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthm(a)freeswitch.org> + * Michael Jerris <mike(a)jerris.com> + * + * switch_version.h -- Version Number Header + * + */ + +#ifndef SWITCH_VERSION_H +#define SWITCH_VERSION_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define SWITCH_VERSION_MAJOR "@SWITCH_VERSION_MAJOR@" +#define SWITCH_VERSION_MINOR "@SWITCH_VERSION_MINOR@" +#define SWITCH_VERSION_MICRO "@SWITCH_VERSION_MICRO@" +#define SWITCH_VERSION_REVISION "@SWITCH_VERSION_REVISION@" +#define SWITCH_VERSION_FULL SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO " (" SWITCH_VERSION_REVISION ")" + +#ifdef __cplusplus +} +#endif + +#endif

1 0

[commit] r12034 - freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl
by FreeSWITCH SVN 15 Feb '09

15 Feb '09

Author: intralanman Date: Sun Feb 15 15:59:55 2009 New Revision: 12034 Log: add where clauses to minimize the time it takes to get a single user's XML Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_directory.php Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_directory.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_directory.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_directory.php Sun Feb 15 15:59:55 2009 @@ -18,6 +18,8 @@ * Class for XML directory */ class fs_directory extends fs_curl { + private $user; + private $userid; private $users_vars; private $users_params; private $users_gateways; @@ -25,6 +27,10 @@ public function fs_directory() { $this -> fs_curl(); + if(array_key_exists('user', $this->request)) { + $this -> user = $this -> request['user']; + } + $this -> comment("User is " . $this->user); } public function main() { @@ -49,7 +55,7 @@ $where_array[] = sprintf("domain='%s'", $this -> request['domain']); } if (array_key_exists('user', $this -> request)) { - $where_array[] = sprintf("username='%s'", $this -> request['user']); + $where_array[] = sprintf("username='%s'", $this -> user); } if (!empty($where_array)) { $this -> comment('where array has contents'); @@ -61,8 +67,7 @@ } else { $where_clause = ''; } - $query = sprintf( - "SELECT * FROM directory %s ORDER BY username" + $query = sprintf("SELECT * FROM directory %s ORDER BY username" , $where_clause ); $res = $this -> db -> queryAll($query); @@ -72,6 +77,10 @@ $this -> comment($this -> db -> getMessage()); $this -> file_not_found(); } + if(!empty($this -> user)) { + $this -> userid = $res[0]['id']; + $this -> comment(sprintf('user id is: %d', $this -> userid)); + } return $res; } @@ -80,7 +89,11 @@ * @return array of users' params */ private function get_users_params() { - $query = sprintf("SELECT * FROM directory_params"); + $where = ''; + if(!empty($this -> userid)) { + $where = sprintf('WHERE directory_id = %d', $this -> userid); + } + $query = sprintf("SELECT * FROM directory_params %s;", $where); $res = $this -> db -> queryAll($query); if (FS_PDO::isError($res)) { $this -> comment($query); @@ -120,7 +133,11 @@ * Get all the users' variables */ private function get_users_vars() { - $query = sprintf("SELECT * FROM directory_vars;"); + $where = ''; + if(!empty($this -> userid)) { + $where = sprintf('WHERE directory_id = %d', $this -> userid); + } + $query = sprintf("SELECT * FROM directory_vars %s;", $where); $res = $this -> db -> queryAll($query); if (FS_PDO::isError($res)) { $this -> comment($this -> db -> getMessage()); @@ -159,7 +176,11 @@ * get the users' gateways */ private function get_users_gateways() { - $query = sprintf("SELECT * FROM directory_gateways;"); + $where = ''; + if(!empty($this -> userid)) { + $where = sprintf('WHERE directory_id = %d', $this -> userid); + } + $query = sprintf("SELECT * FROM directory_gateways %s;", $where); $res = $this -> db -> queryAll($query); if (FS_PDO::isError($res)) { $this -> comment($this -> db -> getMessage());

1 0

[commit] r12033 - freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl
by FreeSWITCH SVN 15 Feb '09

15 Feb '09

Author: intralanman Date: Sun Feb 15 14:15:06 2009 New Revision: 12033 Log: rewrite logic to do about n*4 less queries when pulling the directory for an entire domain resulting in faster load another commit for user directory to come later Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_directory.php Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_directory.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_directory.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_directory.php Sun Feb 15 14:15:06 2009 @@ -18,6 +18,11 @@ * Class for XML directory */ class fs_directory extends fs_curl { + private $users_vars; + private $users_params; + private $users_gateways; + private $users_gateway_params; + public function fs_directory() { $this -> fs_curl(); } @@ -58,7 +63,7 @@ } $query = sprintf( "SELECT * FROM directory %s ORDER BY username" - , $where_clause + , $where_clause ); $res = $this -> db -> queryAll($query); if (FS_PDO::isError($res)) { @@ -71,28 +76,40 @@ } /** - * Writes XML for directory user's <params> - * This method will pull all of the user params based on the passed user_id - * @param integer $user_id - * @return void - */ - private function write_params($user_id) { - $query = sprintf( - "SELECT * FROM directory_params WHERE directory_id='$user_id';" - ); + * This method will pull the params for every user in a domain + * @return array of users' params + */ + private function get_users_params() { + $query = sprintf("SELECT * FROM directory_params"); $res = $this -> db -> queryAll($query); if (FS_PDO::isError($res)) { $this -> comment($query); $this -> comment($this -> db -> getMessage()); $this -> file_not_found(); } - $param_count = count($res); - if ($param_count > 0) { + + $record_count = count($res); + for($i=0; $i<$record_count; $i++) { + $di = $res[$i]['directory_id']; + $pn = $res[$i]['param_name']; + $this->users_params[$di][$pn] = $res[$i]['param_value']; + } + } + + /** + * Writes XML for directory user's <params> + * This method will pull all of the user params based on the passed user_id + * @param integer $user_id + * @return void + */ + private function write_params($user_id) { + if (is_array($this->users_params[$user_id]) + && count($this->users_params[$user_id]) > 0) { $this -> xmlw -> startElement('params'); - for ($i=0; $i<$param_count; $i++) { + foreach($this->users_params[$user_id] as $pname => $pvalue) { $this -> xmlw -> startElement('param'); - $this -> xmlw -> writeAttribute('name', $res[$i]['param_name']); - $this -> xmlw -> writeAttribute('value', $res[$i]['param_value']); + $this -> xmlw -> writeAttribute('name', $pname); + $this -> xmlw -> writeAttribute('value', $pvalue); $this -> xmlw -> endElement(); } $this -> xmlw -> endElement(); @@ -100,27 +117,38 @@ } /** - * Write all the <variables> for a given user - * - * @param integer $user_id - * @return void + * Get all the users' variables */ - private function write_variables($user_id) { - $query = sprintf( - "SELECT * FROM directory_vars WHERE directory_id='$user_id';" - ); + private function get_users_vars() { + $query = sprintf("SELECT * FROM directory_vars;"); $res = $this -> db -> queryAll($query); if (FS_PDO::isError($res)) { $this -> comment($this -> db -> getMessage()); $this -> file_not_found(); } - $var_count = count($res); - if ($var_count > 0) { + + $record_count = count($res); + for($i=0; $i<$record_count; $i++) { + $di = $res[$i]['directory_id']; + $vn = $res[$i]['var_name']; + $this->users_vars[$di][$vn] = $res[$i]['var_value']; + } + } + + /** + * Write all the <variables> for a given user + * + * @param integer $user_id + * @return void + */ + private function write_variables($user_id) { + if (array_key_exists($user_id, $this->users_vars) + && is_array($this->users_vars[$user_id])) { $this -> xmlw -> startElement('variables'); - for ($i=0; $i<$var_count; $i++) { + foreach($this->users_vars[$user_id] as $vname => $vvalue) { $this -> xmlw -> startElement('variable'); - $this -> xmlw -> writeAttribute('name', $res[$i]['var_name']); - $this -> xmlw -> writeAttribute('value', $res[$i]['var_value']); + $this -> xmlw -> writeAttribute('name', $vname); + $this -> xmlw -> writeAttribute('value', $vvalue); $this -> xmlw -> endElement(); } $this -> xmlw -> endElement(); @@ -128,6 +156,23 @@ } /** + * get the users' gateways + */ + private function get_users_gateways() { + $query = sprintf("SELECT * FROM directory_gateways;"); + $res = $this -> db -> queryAll($query); + if (FS_PDO::isError($res)) { + $this -> comment($this -> db -> getMessage()); + $this -> file_not_found(); + } + $record_count = count($res); + for($i=0; $i<$record_count; $i++) { + $di = $res[$i]['directory_id']; + $this->users_gateways[$di][] = $res[$i]; + } + } + + /** * Write all of the XML for the user's <gateways> * This method takes the id of the user from the directory table and pulls * all of the user's gateways. It then calls write_single_gateway for @@ -136,21 +181,19 @@ * @return void */ private function write_gateways($user_id) { - $query = sprintf( - "SELECT * FROM directory_gateways WHERE directory_id='$user_id';" - ); - $res = $this -> db -> queryAll($query); - if (FS_PDO::isError($res)) { - $this -> comment($this -> db -> getMessage()); - $this -> file_not_found(); - } - $gw_count = count($res); - if ($gw_count > 0) { + if (array_key_exists($user_id, $this->users_gateways) + && is_array($this -> users_gateways[$user_id])) { $this -> xmlw -> startElement('gateways'); - for ($i=0; $i<$gw_count; $i++) { + $gateway_count = count($this -> users_gateways[$user_id]); + for ($i=0; $i<$gateway_count; $i++) { $this -> xmlw -> startElement('gateway'); - $this -> xmlw -> writeAttribute('name', $res[$i]['gateway_name']); - $this -> write_single_gateway($res[$i]['id']); + $this -> xmlw -> writeAttribute( + 'name', $this -> users_gateways[$user_id][$i]['gateway_name'] + ); + + $this -> write_user_gateway_params( + $this -> users_gateways[$user_id][$i]['id'] + ); $this -> xmlw -> endElement(); } $this -> xmlw -> endElement(); @@ -158,26 +201,37 @@ } /** - * Write out the <params> XML for each user-specific gateway - * - * @param integer $d_gw_id id from directory_gateways - * @return void + * get users' gateway params */ - private function write_single_gateway($d_gw_id) { - $query = sprintf( - "SELECT * FROM directory_gateway_params WHERE d_gw_id='%s';", $d_gw_id - ); + private function get_user_gateway_params() { + $query = sprintf("SELECT * FROM directory_gateway_params;"); $res = $this -> db -> queryAll($query); if (FS_PDO::isError($res)) { $this -> comment($this -> db -> getMessage()); $this -> file_not_found(); } $param_count = count($res); - if ($param_count > 0) { - for ($i=0; $i<$param_count; $i++) { + for($i=0; $i<$param_count; $i++) { + $dgwid = $res[$i]['id']; + $pname = $res[$i]['param_name']; + $pvalue = $res[$i]['param_value']; + $this->users_gateway_params[$dgwid][$pname] = $pvalue; + } + } + + /** + * Write out the <params> XML for each user-specific gateway + * + * @param integer $d_gw_id id from directory_gateways + * @return void + */ + private function write_user_gateway_params($d_gw_id) { + if (is_array($this->users_gateway_params[$d_gw_id]) + && count($this->users_gateway_params[$d_gw_id]) > 0) { + foreach($this->users_gateway_params[$d_gw_id] as $pname => $pvalue) { $this -> xmlw -> startElement('param'); - $this -> xmlw -> writeAttribute('name', $res[$i]['param_name']); - $this -> xmlw -> writeAttribute('value', $res[$i]['param_value']); + $this -> xmlw -> writeAttribute('name', $pname); + $this -> xmlw -> writeAttribute('value', $pvalue); $this -> xmlw -> endElement(); } } @@ -197,7 +251,7 @@ if (FS_PDO::isError($res)) { $this -> comment($query); $error_msg = sprintf("Error while selecting global params - %s" - , $this -> db -> getMessage() + , $this -> db -> getMessage() ); trigger_error($error_msg); } @@ -226,7 +280,7 @@ if (FS_PDO::isError($res)) { $this -> comment($query); $error_msg = sprintf("Error while selecting global vars - %s" - , $this -> db -> getMessage() + , $this -> db -> getMessage() ); trigger_error($error_msg); } @@ -253,9 +307,15 @@ $this -> file_not_found(); } $directory_count = count($directory); + + $this -> get_users_params(); + $this -> get_users_vars(); + $this -> get_users_gateways(); + $this -> get_user_gateway_params(); + $this -> xmlw -> startElement('section'); $this -> xmlw -> writeAttribute('name', 'directory'); - $this -> xmlw -> writeAttribute('description', 'FreeSWITCH Dialplan'); + $this -> xmlw -> writeAttribute('description', 'FreeSWITCH Directory'); $this -> xmlw -> startElement('domain'); $this -> xmlw -> writeAttribute('name', $this -> request['domain']); $this -> write_global_params();

1 0

[commit] r12032 - freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl
by FreeSWITCH SVN 15 Feb '09

15 Feb '09

Author: intralanman Date: Sun Feb 15 12:57:39 2009 New Revision: 12032 Log: only LOG_USER exists on windows... trying to make cross-platform Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php Sun Feb 15 12:57:39 2009 @@ -51,7 +51,7 @@ * @return void */ public function fs_curl() { - openlog('fs_curl', LOG_NDELAY | LOG_PID, LOG_LOCAL0); + openlog('fs_curl', LOG_NDELAY | LOG_PID, LOG_USER); header('Content-Type: text/xml'); $this -> open_xml(); $this -> generate_request_array();

1 0

[commit] r12031 - in freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl: . libs
by FreeSWITCH SVN 15 Feb '09

15 Feb '09

Author: mphill Date: Sun Feb 15 12:29:35 2009 New Revision: 12031 Log: Created new libs directory and moved fs_pdo.php there Added: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/libs/ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/libs/fs_pdo.php (props changed) - copied unchanged from r12030, /freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_pdo.php Removed: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_pdo.php Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php Sun Feb 15 12:29:35 2009 @@ -55,7 +55,7 @@ header('Content-Type: text/xml'); $this -> open_xml(); $this -> generate_request_array(); - $inc = array('required'=>'fs_pdo.php'); // include an external file. i.e. 'required'=>'important_file.php' + $inc = array('required'=>'libs/fs_pdo.php'); // include an external file. i.e. 'required'=>'important_file.php' $this -> include_files($inc); $this -> connect_db(DEFAULT_DSN, DEFAULT_DSN_LOGIN, DEFAULT_DSN_PASSWORD ); set_error_handler(array($this, 'error_handler'));

1 0

[commit] r12030 - freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl
by FreeSWITCH SVN 15 Feb '09

15 Feb '09

Author: mphill Date: Sun Feb 15 12:25:18 2009 New Revision: 12030 Log: New class uses PDO for all database queries. Provides some MDB2 backwards compatibility. Added: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_pdo.php Added: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_pdo.php ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_pdo.php Sun Feb 15 12:25:18 2009 @@ -0,0 +1,109 @@ +<?php +/** + * FS_CURL was originally written using the MDB2 pear class for database interactions. + * MDB2 was deprecated in favor or PHP's PDO. + * + * This has been tested with MySQL but should work with many other RDBMSs + * @author Michael Phillips <michael.j.phillips(a)gmail.com> + * @license bsd http://www.opensource.org/licenses/bsd-license.php + */ + +class FS_PDO extends PDO { + /** + * Default fetch mode. Associative arrays seem to be used most often + */ + private $fetch_mode = PDO::FETCH_ASSOC; + + /** + * Basic counter for profiling the number of queries executed. + */ + public $counter = 0; + + public function __construct($dsn, $login = NULL, $password = NULL, $options = NULL) { + parent::__construct($dsn, $login, $password, $options); + $this->setAttribute( PDO::ATTR_STATEMENT_CLASS, array( 'FS_PDOStatement', array() ) ); + } + + /** + * Set the fetch mode i.e. PDO::FETCH_ASSOC + * @param string $fetch_mode + */ + public function setFetchMode($fetch_mode) { + $this->fetch_mode = $fetch_mode; + } + + /** + * Return an associative array instead of a PDO statement object + * @param string $query Query to be executed + * @return mixed Associative array result set + */ + public function queryAll($query) { + $this->counter++; + $res = $this->query($query); + if(!$res) { + return false; + } else { + return $res->fetchAll($this->fetch_mode); + } + } + + /** + * Backwards compatibility for error checking with MDB2 + * @static + * @param string $result The return status of a previous query operation + * @return bool + */ + public static function isError($result) { + if($result === false) { + return true; + } else { + return false; + } + } + + /** + * + * @param string $query Query to be executed + * @return PDOStatement + */ + public function query($query) { + $this->counter++; + return PDO::query($query); + } + + /** + * Takes and array and converts to a string + * @return string $full_error A formated message + */ + public function getMessage() { + $full_error = ""; + foreach($this->errorInfo() as $error) { + $full_error .= $error . "\n"; + } + return $full_error; + } +} + +/** + * PDOStatment was extended to provide backwards compatible functions such as + * fetchRow and rowCount. At some point all references to numRow() should be + * replaced with rowCount() + */ + +class FS_PDOStatement extends PDOStatement { + + protected function __construct() { + + } + + public function fetchRow() { + + return $this->fetch(PDO::FETCH_ASSOC); + } + + public function numRows() { + + return $this->rowCount(); + } +} +?>

1 0

[commit] r12029 - in freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl: . configuration dialplans
by FreeSWITCH SVN 15 Feb '09

15 Feb '09

Author: mphill Date: Sun Feb 15 12:22:15 2009 New Revision: 12029 Log: * Changed database library from MDB2 to PDO * Added profiling information: excution time, number of queries Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/acl.conf.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/conference.conf.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/dingaling.conf.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/iax.conf.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/ivr.conf.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/limit.conf.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/local_stream.conf.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/post_load_modules.conf.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/rss.conf.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/sofia.conf.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/voicemail.conf.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/dialplans/lcr.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_configuration.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_directory.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/global_defines.php freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/index.php Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/acl.conf.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/acl.conf.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/acl.conf.php Sun Feb 15 12:22:15 2009 @@ -45,10 +45,10 @@ $query = sprintf( 'SELECT * FROM acl_lists al JOIN acl_nodes an ON an.list_id=al.id;' ); - $acl_data = $this -> db -> queryAll($query, null, MDB2_FETCHMODE_ASSOC); - if (MDB2::isError($profiles)) { + $acl_data = $this -> db -> queryAll($query); + if (FS_PDO::isError($profiles)) { $this -> comment($query); - $this -> comment($acl_data -> getMessage()); + $this -> comment($this -> db -> getMessage()); return array(); } return $acl_data; @@ -81,4 +81,4 @@ $this -> xmlw -> endElement(); } } -?> \ No newline at end of file +?> Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/conference.conf.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/conference.conf.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/conference.conf.php Sun Feb 15 12:22:15 2009 @@ -47,10 +47,10 @@ */ private function write_advertises() { $query = "SELECT * FROM conference_advertise ORDER BY room"; - $advertises = $this -> db -> queryAll($query, null, MDB2_FETCHMODE_ASSOC); - if (MDB2::isError($advertises)) { + $advertises = $this -> db -> queryAll($query); + if (FS_PDO::isError($advertises)) { $this -> comment($query); - $this -> comment($advertises -> getMessage()); + $this -> comment($this -> db -> getMessage()); return ; } $advertise_count = count($advertises); @@ -72,7 +72,7 @@ /** * Pull conference profiles from the database * This method will pull the conference profiles - * from the database using the PEAR MDB2 extension + * from the database using the PDO extension * @return array */ private function get_profiles_array() { @@ -81,12 +81,12 @@ , "ORDER BY profile_name" ); $res = $this -> db -> query($query); - if (MDB2::isError($res)) { + if (FS_PDO::isError($res)) { $this -> comment($query); - $this -> comment($res -> getMessage()); + $this -> comment($this -> db -> getMessage()); return array(); } - while ($row = $res -> fetchRow()) { + while ($row = $res -> fetch(PDO::FETCH_ASSOC)) { $pn = $row['profile_name']; $profiles[$pn][] = $row; } @@ -124,9 +124,9 @@ } /** - * Pull caller-controls from database via MDB2 + * Pull caller-controls from database via PDO * This method will pull the conference caller-controls from - * the database using the PEAR MDB2 extension + * the database using the PDO extension * @return array */ private function get_controls_array() { @@ -134,12 +134,12 @@ "SELECT * FROM conference_controls ORDER BY conf_group" ); $res = $this -> db -> query($query); - if (MDB2::isError($res)) { + if (FS_PDO::isError($res)) { $this -> comment($query); - $this -> comment($res -> getMessage()); + $this -> comment($this -> db -> getMessage()); return array(); } - while ($row = $res -> fetchRow()) { + while ($row = $res -> fetch(PDO::FETCH_ASSOC)) { $cg = $row['conf_group']; $profiles[$cg][] = $row; } @@ -155,9 +155,9 @@ private function write_controls() { $controls_array = $this -> get_controls_array(); $controls_count = count($controls_array); - if (MDB2::isError($controls_array)) { + if (FS_PDO::isError($controls_array)) { $this -> comment($query); - $this -> comment($controls_array -> getMessage()); + $this -> comment($this -> db -> getMessage()); return ; } if ($controls_count < 1) { @@ -182,4 +182,4 @@ $this -> xmlw -> endElement(); } } -?> \ No newline at end of file +?> Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/dingaling.conf.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/dingaling.conf.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/dingaling.conf.php Sun Feb 15 12:22:15 2009 @@ -48,9 +48,9 @@ , "ORDER BY dingaling_id" ); $res = $this -> db -> query($query); - if (MDB2::isError($res)) { + if (FS_PDO::isError($res)) { $this -> comment($query); - $this -> comment($res -> getMessage()); + $this -> comment($this -> db -> getMessage()); return array(); } while ($row = $res -> fetchRow()) { @@ -67,9 +67,9 @@ private function get_profile_array() { $query = sprintf('SELECT * FROM dingaling_profiles'); $res = $this -> db -> query($query); - if (MDB2::isError($res)) { + if (FS_PDO::isError($res)) { $this -> comment($query); - $this -> comment($res -> getMessage()); + $this -> comment($this -> db -> getMessage()); $this -> file_not_found(); } while ($row = $res -> fetchRow()) { @@ -121,9 +121,9 @@ private function write_settings() { $query = sprintf('SELECT * FROM dingaling_settings'); $res = $this -> db -> queryAll($query); - if (MDB2::isError($res)) { + if (FS_PDO::isError($res)) { $this -> comment($query); - $this -> comment($res -> getMessage()); + $this -> comment($this -> db -> getMessage()); $this -> file_not_found(); } $setting_count = count($res); @@ -139,4 +139,4 @@ } } } -?> \ No newline at end of file +?> Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/iax.conf.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/iax.conf.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/iax.conf.php Sun Feb 15 12:22:15 2009 @@ -25,17 +25,17 @@ private function get_profiles() { $query = "SELECT * FROM iax_conf ORDER BY id LIMIT 1"; - $profiles = $this -> db -> queryAll($query, null, MDB2_FETCHMODE_ASSOC); + $profiles = $this -> db -> queryAll($query); return $profiles; } private function write_aliases($profile_id) { $query = "SELECT * FROM iax_aliases WHERE iax_id=$profile_id "; - $aliases_array = $this -> db -> queryAll($query, null, MDB2_FETCHMODE_ASSOC); + $aliases_array = $this -> db -> queryAll($query); $aliases_count = count($aliases_array); - if (MDB2::isError($aliases_array)) { + if (FS_PDO::isError($aliases_array)) { $this -> comment($query); - $this -> comment($aliases_array -> getMessage()); + $this -> comment($this -> db -> getMessage()); return ; } if ($aliases_count < 1) { @@ -55,11 +55,11 @@ private function write_settings($profile_id) { $query = "SELECT * FROM iax_settings WHERE iax_id=$profile_id " . "ORDER BY iax_id, param_name"; - $settings_array = $this -> db -> queryAll($query, null, MDB2_FETCHMODE_ASSOC); + $settings_array = $this -> db -> queryAll($query); $settings_count = count($settings_array); - if (MDB2::isError($settings_array)) { + if (FS_PDO::isError($settings_array)) { $this -> comment($query); - $this -> comment($settings_array -> getMessage()); + $this -> comment($this -> db -> getMessage()); return ; } if ($settings_count < 1) { @@ -80,12 +80,12 @@ private function write_gateways($profile_id) { $query = "SELECT * FROM iax_gateways WHERE iax_id=$profile_id " . "ORDER BY gateway_name, gateway_param"; - $gateway_array = $this -> db -> queryAll($query, null, MDB2_FETCHMODE_ASSOC); + $gateway_array = $this -> db -> queryAll($query); $gateway_count = count($gateway_array); //$this -> comment_array($gateway_array); if (MDB2::isError($gateway_array)) { $this -> comment($query); - $this -> comment($gateway_array -> getMessage()); + $this -> comment($this -> db -> getMessage()); return ; } if ($gateway_count < 1) { @@ -113,11 +113,11 @@ private function write_domains($profile_id) { $query = "SELECT * FROM iax_domains WHERE iax_id=$profile_id"; - $domain_array = $this -> db -> queryAll($query, null, MDB2_FETCHMODE_ASSOC); + $domain_array = $this -> db -> queryAll($query); $domain_count = count($domain_array); - if (MDB2::isError($domain_array)) { + if (FS_PDO::isError($domain_array)) { $this -> comment($query); - $this -> comment($domain_array -> getMessage()); + $this -> comment($this -> db -> getMessage()); return ; } if ($domain_count < 1) { @@ -169,4 +169,4 @@ } } -?> \ No newline at end of file +?> Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/ivr.conf.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/ivr.conf.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/ivr.conf.php Sun Feb 15 12:22:15 2009 @@ -34,7 +34,7 @@ */ private function get_ivr_array() { $query = "SELECT * FROM ivr_conf"; - $menus = $this -> db -> queryAll($query, null, MDB2_FETCHMODE_ASSOC); + $menus = $this -> db -> queryAll($query); return $menus; } @@ -47,10 +47,10 @@ $query = sprintf( "SELECT * FROM ivr_entries WHERE ivr_id=$ivr_id ORDER BY digits" ); - $entries_array = $this -> db -> queryAll($query, null, MDB2_FETCHMODE_ASSOC); - if (MDB2::isError($entries_array)) { + $entries_array = $this -> db -> queryAll($query); + if (FS_PDO::isError($entries_array)) { $this -> comment($query); - $this -> comment($entries_array -> getMessage()); + $this -> comment($this -> db -> getMessage()); return ; } $entries_count = count($entries_array); @@ -114,4 +114,4 @@ $this -> xmlw -> endElement(); } } -?> \ No newline at end of file +?> Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/limit.conf.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/limit.conf.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/limit.conf.php Sun Feb 15 12:22:15 2009 @@ -32,9 +32,9 @@ private function get_params_array() { $query = sprintf('SELECT * FROM limit_conf;'); $res = $this -> db -> query($query); - if (MDB2::isError($res)) { + if (FS_PDO::isError($res)) { $this -> comment($query); - $this -> comment($res -> getMessage()); + $this -> comment($this -> db -> getMessage()); return array(); } $this -> comment($res -> numRows() . 'rows'); Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/local_stream.conf.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/local_stream.conf.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/local_stream.conf.php Sun Feb 15 12:22:15 2009 @@ -30,11 +30,11 @@ , "WHERE stream_id=$profile_id " , "ORDER BY stream_id, param_name" ); - $settings_array = $this -> db -> queryAll($query, null, MDB2_FETCHMODE_ASSOC); + $settings_array = $this -> db -> queryAll($query); $settings_count = count($settings_array); - if (MDB2::isError($settings_array)) { + if (FS_PDO::isError($settings_array)) { $this -> comment($query); - $this -> comment($settings_array -> getMessage()); + $this -> comment($this -> db -> getMessage()); return ; } if ($settings_count < 1) { @@ -54,10 +54,10 @@ private function get_directories() { $query = sprintf('SELECT * FROM local_stream_conf;'); - $profiles = $this -> db -> queryAll($query, null, MDB2_FETCHMODE_ASSOC); - if (MDB2::isError($profiles)) { + $profiles = $this -> db -> queryAll($query); + if (FS_PDO::isError($profiles)) { $this -> comment($query); - $this -> comment($profiles -> getMessage()); + $this -> comment($this -> db -> getMessage()); return array(); } return $profiles; @@ -70,4 +70,4 @@ } } } -?> \ No newline at end of file +?> Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/post_load_modules.conf.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/post_load_modules.conf.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/post_load_modules.conf.php Sun Feb 15 12:22:15 2009 @@ -35,7 +35,7 @@ 'SELECT * FROM post_load_modules_conf WHERE load_module=1 ORDER BY priority;' ); $res = $this -> db -> query($query); - if (MDB2::isError($res)) { + if (FS_PDO::isError($res)) { $this -> comment($query); $this -> comment($res -> getMessage()); return array(); @@ -44,7 +44,7 @@ if ($res -> numRows() == 0) { return array(); } - while ($row = $res -> fetchRow(MDB2_FETCHMODE_ASSOC)) { + while ($row = $res -> fetchRow()) { $feeds_array[] = $row; } return $feeds_array; Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/rss.conf.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/rss.conf.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/rss.conf.php Sun Feb 15 12:22:15 2009 @@ -35,10 +35,10 @@ 'SELECT * FROM rss_conf ORDER BY priority, local_file;' ); $res = $this -> db -> query($query); - if (MDB2::isError($res)) { + if (FS_PDO::isError($res)) { return false; } - while ($row = $res -> fetchRow(MDB2_FETCHMODE_ASSOC)) { + while ($row = $res -> fetchRow()) { $feeds_array[] = $row; } return $feeds_array; @@ -67,4 +67,4 @@ } } -?> \ No newline at end of file +?> Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/sofia.conf.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/sofia.conf.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/sofia.conf.php Sun Feb 15 12:22:15 2009 @@ -28,10 +28,10 @@ */ private function get_profiles() { $query = "SELECT * FROM sofia_conf"; - $profiles = $this -> db -> queryAll($query, null, MDB2_FETCHMODE_ASSOC); - if (MDB2::isError($profiles)) { + $profiles = $this -> db -> queryAll($query); + if (FS_PDO::isError($profiles)) { $this -> comment($query); - $this -> comment($profiles -> getMessage()); + $this -> comment($this -> db -> getMessage()); $this -> file_not_found(); } return $profiles; @@ -43,11 +43,11 @@ */ private function write_aliases($profile_id) { $query = "SELECT * FROM sofia_aliases WHERE sofia_id=$profile_id "; - $aliases_array = $this -> db -> queryAll($query, null, MDB2_FETCHMODE_ASSOC); + $aliases_array = $this -> db -> queryAll($query); $aliases_count = count($aliases_array); - if (MDB2::isError($aliases_array)) { + if (FS_PDO::isError($aliases_array)) { $this -> comment($query); - $this -> comment($aliases_array -> getMessage()); + $this -> comment($this -> db -> getMessage()); return ; } if ($aliases_count < 1) { @@ -71,11 +71,11 @@ private function write_settings($profile_id) { $query = "SELECT * FROM sofia_settings WHERE sofia_id=$profile_id " . "ORDER BY sofia_id, param_name"; - $settings_array = $this -> db -> queryAll($query, null, MDB2_FETCHMODE_ASSOC); + $settings_array = $this -> db -> queryAll($query); $settings_count = count($settings_array); - if (MDB2::isError($settings_array)) { + if (FS_PDO::isError($settings_array)) { $this -> comment($query); - $this -> comment($settings_array -> getMessage()); + $this -> comment($this -> db -> getMessage()); return ; } if ($settings_count < 1) { @@ -100,12 +100,12 @@ private function write_gateways($profile_id) { $query = "SELECT * FROM sofia_gateways WHERE sofia_id=$profile_id " . "ORDER BY gateway_name, gateway_param"; - $gateway_array = $this -> db -> queryAll($query, null, MDB2_FETCHMODE_ASSOC); + $gateway_array = $this -> db -> queryAll($query); $gateway_count = count($gateway_array); //$this -> comment_array($gateway_array); - if (MDB2::isError($gateway_array)) { + if (FS_PDO::isError($gateway_array)) { $this -> comment($query); - $this -> comment($gateway_array -> getMessage()); + $this -> comment($this -> db -> getMessage()); return ; } if ($gateway_count < 1) { @@ -137,11 +137,11 @@ */ private function write_domains($profile_id) { $query = "SELECT * FROM sofia_domains WHERE sofia_id=$profile_id"; - $domain_array = $this -> db -> queryAll($query, null, MDB2_FETCHMODE_ASSOC); + $domain_array = $this -> db -> queryAll($query); $domain_count = count($domain_array); - if (MDB2::isError($domain_array)) { + if (FS_PDO::isError($domain_array)) { $this -> comment($query); - $this -> comment($domain_array -> getMessage()); + $this -> comment($this -> db -> getMessage()); return ; } if ($domain_count < 1) { @@ -193,4 +193,4 @@ } } -?> \ No newline at end of file +?> Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/voicemail.conf.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/voicemail.conf.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/configuration/voicemail.conf.php Sun Feb 15 12:22:15 2009 @@ -30,7 +30,7 @@ */ private function get_profiles() { $query = "SELECT * FROM voicemail_conf ORDER BY id"; - $profiles = $this -> db -> queryAll($query, null, MDB2_FETCHMODE_ASSOC); + $profiles = $this -> db -> queryAll($query); return $profiles; } @@ -44,11 +44,11 @@ , "WHERE voicemail_id=$profile_id " , "ORDER BY voicemail_id, param_name" ); - $settings_array = $this -> db -> queryAll($query, null, MDB2_FETCHMODE_ASSOC); + $settings_array = $this -> db -> queryAll($query); $settings_count = count($settings_array); - if (MDB2::isError($settings_array)) { + if (FS_PDO::isError($settings_array)) { $this -> comment($query); - $this -> comment($settings_array -> getMessage()); + $this -> comment($this -> db -> getMessage()); return ; } if ($settings_count < 1) { @@ -77,11 +77,11 @@ , "WHERE voicemail_id=$profile_id " , "ORDER BY voicemail_id, param_name" ); - $settings_array = $this -> db -> queryAll($query, null, MDB2_FETCHMODE_ASSOC); + $settings_array = $this -> db -> queryAll($query); $settings_count = count($settings_array); - if (MDB2::isError($settings_array)) { + if (FS_PDO::isError($settings_array)) { $this -> comment($query); - $this -> comment($settings_array -> getMessage()); + $this -> comment($this -> db -> getMessage()); return ; } if ($settings_count < 1) { @@ -129,4 +129,4 @@ } } -?> \ No newline at end of file +?> Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/dialplans/lcr.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/dialplans/lcr.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/dialplans/lcr.php Sun Feb 15 12:22:15 2009 @@ -50,9 +50,9 @@ $query = sprintf("SELECT l.digits, c.Carrier_Name, l.rate, cg.id, cg.gateway, cg.id AS gwid, l.lead_strip, l.trail_strip, l.prefix, l.suffix FROM lcr l JOIN carriers c ON l.carrier_id=c.id JOIN carrier_gateway cg ON c.id=cg.carrier_id %s ORDER BY length(digits) DESC, rate;", $where_clause); $res = $obj -> db -> query($query); $obj -> comment($query); - if (MDB2::isError($res)) { + if (FS_PDO::isError($res)) { $obj -> comment($query); - $obj -> comment($res -> getMessage()); + $obj -> comment($this -> db -> getMessage()); $obj -> file_not_found(); } $carriers = array(); @@ -70,4 +70,4 @@ } -?> \ No newline at end of file +?> Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_configuration.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_configuration.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_configuration.php Sun Feb 15 12:22:15 2009 @@ -53,12 +53,12 @@ , "WHERE module_name='$mod_name' AND load_module=1" ); $res = $this -> db -> query($query); - if (MDB2::isError($res)) { + if ($this->db->errorCode() !== FS_SQL_SUCCESS) { $this -> comment($query); - $this -> comment($res -> getMessage()); + $this -> comment($this->db->errorCode()); return true; //default allow policy return false; //comment previous line to default deny - } elseif ($res -> numRows() == 1) { + } elseif ($res -> rowCount() == 1) { return true; } else { return false; @@ -77,7 +77,7 @@ "SELECT COUNT(*) cnt FROM modless_conf WHERE conf_name = '$conf';" ); $res = $this -> db -> query($query); - if (MDB2::isError($res)) { + if (FS_PDO::isError($res)) { $this -> comment($query); $this -> comment($res -> getMessage()); return true; //default allow policy Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_curl.php Sun Feb 15 12:22:15 2009 @@ -20,9 +20,9 @@ */ class fs_curl { /** - * MDB2 Object - * @link http://pear.php.net/MDB2 - * @var $db MDB2 + * FS_PDO Object + * @link http://www.php.net/pdo + * @var $db FS_PDO */ public $db; /** @@ -45,8 +45,8 @@ private $comments; /** - * Instantiation of XMLWriter and MDB2 - * This method will instantiate the MDB2 and XMLWriter classes for use + * Instantiation of XMLWriter and FS_PDO + * This method will instantiate the FS_PDO and XMLWriter classes for use * in child classes * @return void */ @@ -55,27 +55,27 @@ header('Content-Type: text/xml'); $this -> open_xml(); $this -> generate_request_array(); - $inc = array('required'=>'MDB2.php'); + $inc = array('required'=>'fs_pdo.php'); // include an external file. i.e. 'required'=>'important_file.php' $this -> include_files($inc); - $this -> connect_db(DEFAULT_DSN); + $this -> connect_db(DEFAULT_DSN, DEFAULT_DSN_LOGIN, DEFAULT_DSN_PASSWORD ); set_error_handler(array($this, 'error_handler')); //trigger_error('blah', E_USER_ERROR); } /** - * Connect to a database via MDB2 + * Connect to a database via FS_PDO * @param mixed $dsn data source for database connection (array or string) * @return void */ - public function connect_db($dsn) { - $this -> db = MDB2::connect($dsn); - if (MDB2::isError($this -> db)) { - $this -> comment($this -> db -> getMessage()); - $this -> file_not_found(); - } - $this -> db -> setFetchMode(MDB2_FETCHMODE_ASSOC); + public function connect_db($dsn, $login, $password) { + try { + $this -> db = new FS_PDO($dsn, $login, $password); + } catch(Exception $e) { + $this -> comment($e->getMessage()); + $this -> file_not_found(); //program terminates in function file_not_found() + } } - + /** * Method to add comments to XML * Adds a comment to be displayed in the final XML @@ -181,6 +181,14 @@ * @return void */ public function output_xml() { + $this->comment( + sprintf('Total # of Queries Run: %d', $this->db->counter) + ); + $this -> comment(sprintf("Estimated Execution Time Is: %s" + , (ereg_replace( + '^0\.([0-9]+) ([0-9]+)$', '\2.\1', microtime()) - START_TIME) + )); + $this -> close_xml(); $comment_count = count($this -> comments); for ($i = 0; $i < $comment_count; $i++) { @@ -191,7 +199,7 @@ $this -> debug(explode("\n", $xml_out)); $this -> debug('---- End XML Output ----'); echo $xml_out; - exit(); + exit(); } /** Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php Sun Feb 15 12:22:15 2009 @@ -61,9 +61,9 @@ "SELECT * FROM dialplan_special WHERE context='%s'", $context ); $res = $this -> db -> query($query); - if (MDB2::isError($res)) { + if (FS_PDO::isError($res)) { $this -> comment($query); - $this -> comment($res -> getMessage()); + $this -> comment($this -> db -> getMessage()); $this -> file_not_found(); } if ($res -> numRows() == 1) { @@ -88,8 +88,8 @@ , "global_weight, context, extension, weight" ); $res = $this -> db -> query($dpQuery); - if (MDB2::isError($res)) { - $this -> comment($res -> getMessage()); + if (FS_PDO::isError($res)) { + $this -> comment($this -> db -> getMessage()); $this -> file_not_found(); } $condition_number = 0; Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_directory.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_directory.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_directory.php Sun Feb 15 12:22:15 2009 @@ -61,9 +61,10 @@ , $where_clause ); $res = $this -> db -> queryAll($query); - if (MDB2::isError($res)) { + if (FS_PDO::isError($res)) { $this -> comment($query); - $this -> comment($res -> getMessage()); + $this -> comment($this -> db -> getMessage()); + $this -> comment($this -> db -> getMessage()); $this -> file_not_found(); } return $res; @@ -80,9 +81,9 @@ "SELECT * FROM directory_params WHERE directory_id='$user_id';" ); $res = $this -> db -> queryAll($query); - if (MDB2::isError($res)) { + if (FS_PDO::isError($res)) { $this -> comment($query); - $this -> comment($res -> getMessage()); + $this -> comment($this -> db -> getMessage()); $this -> file_not_found(); } $param_count = count($res); @@ -109,8 +110,8 @@ "SELECT * FROM directory_vars WHERE directory_id='$user_id';" ); $res = $this -> db -> queryAll($query); - if (MDB2::isError($res)) { - $this -> comment($res -> getMessage()); + if (FS_PDO::isError($res)) { + $this -> comment($this -> db -> getMessage()); $this -> file_not_found(); } $var_count = count($res); @@ -139,8 +140,8 @@ "SELECT * FROM directory_gateways WHERE directory_id='$user_id';" ); $res = $this -> db -> queryAll($query); - if (MDB2::isError($res)) { - $this -> comment($res -> getMessage()); + if (FS_PDO::isError($res)) { + $this -> comment($this -> db -> getMessage()); $this -> file_not_found(); } $gw_count = count($res); @@ -167,8 +168,8 @@ "SELECT * FROM directory_gateway_params WHERE d_gw_id='%s';", $d_gw_id ); $res = $this -> db -> queryAll($query); - if (MDB2::isError($res)) { - $this -> comment($res -> getMessage()); + if (FS_PDO::isError($res)) { + $this -> comment($this -> db -> getMessage()); $this -> file_not_found(); } $param_count = count($res); @@ -193,10 +194,10 @@ "WHERE dd.domain_name='" . $this -> request['domain'] . "'" ); $res = $this -> db -> queryAll($query); - if (MDB2::isError($res)) { + if (FS_PDO::isError($res)) { $this -> comment($query); $error_msg = sprintf("Error while selecting global params - %s" - , $res -> getMessage() + , $this -> db -> getMessage() ); trigger_error($error_msg); } @@ -222,10 +223,10 @@ "WHERE dd.domain_name='" . $this -> request['domain'] . "'" ); $res = $this -> db -> queryAll($query); - if (MDB2::isError($res)) { + if (FS_PDO::isError($res)) { $this -> comment($query); $error_msg = sprintf("Error while selecting global vars - %s" - , $res -> getMessage() + , $this -> db -> getMessage() ); trigger_error($error_msg); } Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/global_defines.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/global_defines.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/global_defines.php Sun Feb 15 12:22:15 2009 @@ -11,14 +11,26 @@ } /** - * Defines the default dsn for the MDB2 PEAR class + * Defines the default dsn for the FS_PDO class */ -define('DEFAULT_DSN', 'mysql://freeswitch:Fr33Sw1tch@localhost/freeswitch'); +define('DEFAULT_DSN', 'mysql:dbname=freeswitch;host=127.0.0.1'); +/** + * Defines the default dsn login for the PDO class + */ +define('DEFAULT_DSN_LOGIN', 'freeswitch'); +/** + * Defines the default dsn password for the PDOclass + */ +define('DEFAULT_DSN_PASSWORD', 'fr33sw1tch'); /** * Generic return success */ define('FS_CURL_SUCCESS', 0); /** + * Generic return success + */ +define('FS_SQL_SUCCESS', '00000'); +/** * Generic return warning */ define('FS_CURL_WARNING', 1); Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/index.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/index.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/index.php Sun Feb 15 12:22:15 2009 @@ -14,6 +14,12 @@ * class is successfully instantiated. * @return void */ + +/** + * define for the time that execution of the script started + */ +define('START_TIME', ereg_replace('^0\.([0-9]+) ([0-9]+)$', '\2.\1', microtime())); + function file_not_found($no=false, $str=false, $file=false, $line=false) { if ($no == E_STRICT) { return; @@ -94,3 +100,4 @@ $conf -> main(); $conf -> output_xml(); +?>

1 0

[commit] r12028 - freeswitch/branches/gmaruzz/mod_skypiax/configs
by FreeSWITCH SVN 15 Feb '09

15 Feb '09

Author: gmaruzz Date: Sun Feb 15 08:59:03 2009 New Revision: 12028 Log: skypiax: cosmetic on skypiax.conf.xml Modified: freeswitch/branches/gmaruzz/mod_skypiax/configs/skypiax.conf.xml Modified: freeswitch/branches/gmaruzz/mod_skypiax/configs/skypiax.conf.xml ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/configs/skypiax.conf.xml (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/configs/skypiax.conf.xml Sun Feb 15 08:59:03 2009 @@ -7,6 +7,7 @@ <param name="codec-prefs" value="gsm,ulaw"/> <param name="codec-rates" value="8000,16000"/> <param name="hold-music" value="$${moh_uri}"/> + <param name="destination" value="5000"/> </global_settings>  <per_interface_settings>

1 0

[commit] r12027 - in freeswitch/trunk: src/mod/applications/mod_lcr w32/Library
by FreeSWITCH SVN 15 Feb '09

15 Feb '09

Author: robertj Date: Sat Feb 14 22:10:31 2009 New Revision: 12027 Log: Fixed VS2008 compiler warnings, including what clearly looks like a bug! Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Sat Feb 14 22:10:31 2009 @@ -565,7 +565,7 @@ switch_stream_handle_t order_by = { 0 }; switch_stream_handle_t pre_order = { 0 }; switch_stream_handle_t *thisorder = NULL; - char *reorder_by_rate = SWITCH_FALSE; + char *reorder_by_rate = NULL; char *id_s = NULL; char *custom_sql = NULL; int argc, x = 0; @@ -655,7 +655,7 @@ } } - if (!switch_strlen_zero("reorder_by_rate")) { + if (!switch_strlen_zero(reorder_by_rate)) { profile->reorder_by_rate = switch_true(reorder_by_rate); } Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Sat Feb 14 22:10:31 2009 @@ -72,7 +72,7 @@ Name="VCLinkerTool" LinkLibraryDependencies="true" OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.dll" - LinkIncremental="1" + LinkIncremental="2" AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\$(OutDir)";"$(InputDir)..\..\libs\sqlite\$(OutDir) DLL";"$(InputDir)..\..\libs\apr-util\$(OutDir)";"$(InputDir)..\..\libs\apr-iconv\$(OutDir)";"$(InputDir)..\..\libs\libresample\win";"$(InputDir)..\..\libs\srtp\$(OutDir)"" AddModuleNamesToAssembly="" GenerateDebugInformation="true"

1 0