<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14914] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14914">14914</a></dd>
<dt>Author</dt> <dd>intralanman</dd>
<dt>Date</dt> <dd>2009-09-17 23:53:14 -0500 (Thu, 17 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>adding in a simple xml cdr to db module</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribintralanmanPHPfs_curlfs_curlphp">freeswitch/trunk/contrib/intralanman/PHP/fs_curl/fs_curl.php</a></li>
<li><a href="#freeswitchtrunkcontribintralanmanPHPfs_curlfs_dialplanphp">freeswitch/trunk/contrib/intralanman/PHP/fs_curl/fs_dialplan.php</a></li>
<li><a href="#freeswitchtrunkcontribintralanmanPHPfs_curlindexphp">freeswitch/trunk/contrib/intralanman/PHP/fs_curl/index.php</a></li>
<li><a href="#freeswitchtrunkcontribintralanmanPHPfs_curlsqlmysql50withsamplessql">freeswitch/trunk/contrib/intralanman/PHP/fs_curl/sql/mysql-5.0-with-samples.sql</a></li>
<li><a href="#freeswitchtrunkcontribintralanmanPHPfs_curlsqlmysql50sql">freeswitch/trunk/contrib/intralanman/PHP/fs_curl/sql/mysql-5.0.sql</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribintralanmanPHPfs_curlfs_cdrphp">freeswitch/trunk/contrib/intralanman/PHP/fs_curl/fs_cdr.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribintralanmanPHPfs_curlfs_cdrphp"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/contrib/intralanman/PHP/fs_curl/fs_cdr.php (0 => 14914)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/intralanman/PHP/fs_curl/fs_cdr.php (rev 0)
+++ freeswitch/trunk/contrib/intralanman/PHP/fs_curl/fs_cdr.php 2009-09-18 04:53:14 UTC (rev 14914)
</span><span class="lines">@@ -0,0 +1,103 @@
</span><ins>+<?php
+/**
+ * @package FS_CURL
+ * fs_cdr.php
+ */
+if (basename($_SERVER['PHP_SELF']) == basename(__FILE__)) {
+ header('Location: index.php');
+}
+
+/**
+ * @package FS_CURL
+ * @license BSD
+ * @author Raymond Chandler (intralanman) <intralanman@gmail.com>
+ * @version 0.1
+ * Class for inserting xml CDR records
+ * @return object
+ */
+class fs_cdr extends fs_curl {
+/**
+ * This variable will hold the XML CDR string
+ * @var string
+ */
+ public $cdr;
+ /**
+ * This object is the objectified representation of the XML CDR
+ * @var XMLSimple Object
+ */
+ public $xml_cdr;
+
+ /**
+ * This array will hold the db field and their corresponding value
+ * @var array
+ */
+ public $values = array();
+
+ /**
+ * This array maps the database field names to XMLSimple paths
+ * @var array
+ */
+ public $fields = array(
+ 'caller_id_name' => '$this->xml_cdr->callflow[0]->caller_profile->caller_id_name',
+ 'caller_id_number' => '$this->xml_cdr->callflow[0]->caller_profile->caller_id_number',
+ 'destination_number' => '$this->xml_cdr->callflow[0]->caller_profile->destination_number',
+ 'context' => '$this->xml_cdr->callflow[0]->caller_profile->context',
+ 'start_stamp' => 'urldecode($this->xml_cdr->variables->start_stamp)',
+ 'answer_stamp' => 'urldecode($this->xml_cdr->variables->answer_stamp)',
+ 'end_stamp' => 'urldecode($this->xml_cdr->variables->end_stamp)',
+ 'duration' => '$this->xml_cdr->variables->duration',
+ 'billsec' => '$this->xml_cdr->variables->billsec',
+ 'hangup_cause' => '$this->xml_cdr->variables->hangup_cause',
+ 'uuid' => '$this->xml_cdr->callflow[0]->caller_profile->uuid',
+ 'bleg_uuid' => '$this->xml_cdr->callflow[0]->caller_profile->bleg_uuid',
+ 'accountcode' => '$this->xml_cdr->variables->accountcode',
+ 'read_codec' => '$this->xml_cdr->variables->read_codec',
+ 'write_codec' => '$this->xml_cdr->variables->write_codec'
+ );
+
+ /**
+ * This is where we instantiate our parent and set up our CDR object
+ */
+ public function fs_cdr() {
+ $this->fs_curl();
+ $this->cdr = $this->request['cdr'];
+ $this->xml_cdr = new SimpleXMLElement($this->cdr);
+ }
+
+ /**
+ * This is where we run the bulk of our logic through other methods
+ */
+ public function main() {
+ $this->set_record_values();
+ $this->insert_cdr();
+ }
+
+ /**
+ * This method will take the db fields and paths defined above and
+ * set the values array to be used for the insert
+ */
+ public function set_record_values() {
+ foreach ($this->fields as $field => $run) {
+ eval("\$str = $run;");
+ $this->values["$field"] = "'$str'";
+ $this->debug($str);
+ }
+ $this->debug(print_r($this->values, true));
+ print_r($this->values);
+ }
+
+ /**
+ * finally do the insert of the CDR
+ */
+ public function insert_cdr() {
+ $query = sprintf(
+ "INSERT INTO cdr (%s) VALUES (%s);",
+ join(',', array_keys($this->values)), join(',', $this->values)
+ );
+ $this->debug($query);
+ $this->db->exec($query);
+ }
+
+}
+
+
</ins></span></pre></div>
<a id="freeswitchtrunkcontribintralanmanPHPfs_curlfs_curlphp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/intralanman/PHP/fs_curl/fs_curl.php (14913 => 14914)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/intralanman/PHP/fs_curl/fs_curl.php 2009-09-17 23:30:17 UTC (rev 14913)
+++ freeswitch/trunk/contrib/intralanman/PHP/fs_curl/fs_curl.php 2009-09-18 04:53:14 UTC (rev 14914)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> for ($i = 0; $i < $comment_count; $i++) {
</span><span class="cx"> if (array_key_exists($i, $comments)) {
</span><span class="cx"> if (!is_array($comments[$i])) {
</span><del>- $xml_obj -> writeComment($comments[$i]);
</del><ins>+ $xml_obj -> writeComment(" " . $comments[$i] . " ");
</ins><span class="cx"> } else {
</span><span class="cx"> $this -> comments2xml($xml_obj, $comments[$i], $space_pad + 2);
</span><span class="cx"> }
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> if ($no == E_STRICT) {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>- $file = ereg_replace('\.(inc|php)$', '', $file);
</del><ins>+ $file = preg_replace('/\.(inc|php)$/', '', $file);
</ins><span class="cx"> $this -> comment(basename($file) . ":$line - $no:$str");
</span><span class="cx">
</span><span class="cx"> switch ($no) {
</span><span class="lines">@@ -320,7 +320,7 @@
</span><span class="cx"> syslog(LOG_NOTICE, $debug_str);
</span><span class="cx"> break;
</span><span class="cx"> case 1:
</span><del>- $debug_str = preg_replace('/-/', ' - ', $debug_str);
</del><ins>+ $debug_str = preg_replace('/--/', '- - ', $debug_str);
</ins><span class="cx"> $this -> comment($debug_str);
</span><span class="cx"> break;
</span><span class="cx"> case 2:
</span></span></pre></div>
<a id="freeswitchtrunkcontribintralanmanPHPfs_curlfs_dialplanphp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/intralanman/PHP/fs_curl/fs_dialplan.php (14913 => 14914)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/intralanman/PHP/fs_curl/fs_dialplan.php 2009-09-17 23:30:17 UTC (rev 14913)
+++ freeswitch/trunk/contrib/intralanman/PHP/fs_curl/fs_dialplan.php 2009-09-18 04:53:14 UTC (rev 14914)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> }
</span><span class="cx"> if ($res -> numRows() == 1) {
</span><span class="cx"> $row = $res -> fetchRow();
</span><del>- $this -> special_class_file = $row['class_file'];
</del><ins>+ $this -> special_class_file = sprintf('dialplans/%s', $row['class_file']);
</ins><span class="cx"> return true;
</span><span class="cx"> } else {
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="freeswitchtrunkcontribintralanmanPHPfs_curlindexphp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/intralanman/PHP/fs_curl/index.php (14913 => 14914)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/intralanman/PHP/fs_curl/index.php 2009-09-17 23:30:17 UTC (rev 14913)
+++ freeswitch/trunk/contrib/intralanman/PHP/fs_curl/index.php 2009-09-18 04:53:14 UTC (rev 14914)
</span><span class="lines">@@ -54,7 +54,12 @@
</span><span class="cx"> if (!is_array($_REQUEST)) {
</span><span class="cx"> trigger_error('$_REQUEST is not an array');
</span><span class="cx"> }
</span><del>-$section = $_REQUEST['section'];
</del><ins>+
+if (array_key_exists('cdr', $_REQUEST)) {
+ $section = 'cdr';
+} else {
+ $section = $_REQUEST['section'];
+}
</ins><span class="cx"> $section_file = sprintf('fs_%s.php', $section);
</span><span class="cx"> /**
</span><span class="cx"> * this include will differ based on the section that's passed
</span><span class="lines">@@ -82,6 +87,9 @@
</span><span class="cx"> case 'directory':
</span><span class="cx"> $conf = new fs_directory();
</span><span class="cx"> break;
</span><ins>+ case 'cdr':
+ $conf = new fs_cdr();
+ break;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $conf -> debug('---- Start _REQUEST ----');
</span></span></pre></div>
<a id="freeswitchtrunkcontribintralanmanPHPfs_curlsqlmysql50withsamplessql"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/intralanman/PHP/fs_curl/sql/mysql-5.0-with-samples.sql (14913 => 14914)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/intralanman/PHP/fs_curl/sql/mysql-5.0-with-samples.sql 2009-09-17 23:30:17 UTC (rev 14913)
+++ freeswitch/trunk/contrib/intralanman/PHP/fs_curl/sql/mysql-5.0-with-samples.sql 2009-09-18 04:53:14 UTC (rev 14914)
</span><span class="lines">@@ -67,6 +67,32 @@
</span><span class="cx"> -- --------------------------------------------------------
</span><span class="cx">
</span><span class="cx"> --
</span><ins>+-- Table structure for table `cdr`
+--
+
+CREATE TABLE IF NOT EXISTS `cdr` (
+ `id` int(11) NOT NULL auto_increment,
+ `caller_id_name` varchar(255) NOT NULL default '',
+ `caller_id_number` varchar(255) NOT NULL default '',
+ `destination_number` varchar(255) NOT NULL default '',
+ `context` varchar(255) NOT NULL default '',
+ `start_stamp` varchar(255) NOT NULL default '',
+ `answer_stamp` varchar(255) NOT NULL default '',
+ `end_stamp` varchar(255) NOT NULL default '',
+ `duration` varchar(255) NOT NULL default '',
+ `billsec` varchar(255) NOT NULL default '',
+ `hangup_cause` varchar(255) NOT NULL default '',
+ `uuid` varchar(255) NOT NULL default '',
+ `bleg_uuid` varchar(255) NOT NULL default '',
+ `accountcode` varchar(255) NOT NULL default '',
+ `read_codec` varchar(255) NOT NULL default '',
+ `write_codec` varchar(255) NOT NULL default '',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uuid` (`uuid`)
+) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
</ins><span class="cx"> -- Table structure for table `conference_advertise`
</span><span class="cx"> --
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkcontribintralanmanPHPfs_curlsqlmysql50sql"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/intralanman/PHP/fs_curl/sql/mysql-5.0.sql (14913 => 14914)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/intralanman/PHP/fs_curl/sql/mysql-5.0.sql 2009-09-17 23:30:17 UTC (rev 14913)
+++ freeswitch/trunk/contrib/intralanman/PHP/fs_curl/sql/mysql-5.0.sql 2009-09-18 04:53:14 UTC (rev 14914)
</span><span class="lines">@@ -59,6 +59,39 @@
</span><span class="cx"> -- --------------------------------------------------------
</span><span class="cx">
</span><span class="cx"> --
</span><ins>+-- Table structure for table `cdr`
+--
+
+DROP TABLE IF EXISTS `cdr`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `cdr` (
+ `id` int(11) NOT NULL auto_increment,
+ `caller_id_name` varchar(255) NOT NULL default '',
+ `caller_id_number` varchar(255) NOT NULL default '',
+ `destination_number` varchar(255) NOT NULL default '',
+ `context` varchar(255) NOT NULL default '',
+ `start_stamp` varchar(255) NOT NULL default '',
+ `answer_stamp` varchar(255) NOT NULL default '',
+ `end_stamp` varchar(255) NOT NULL default '',
+ `duration` varchar(255) NOT NULL default '',
+ `billsec` varchar(255) NOT NULL default '',
+ `hangup_cause` varchar(255) NOT NULL default '',
+ `uuid` varchar(255) NOT NULL default '',
+ `bleg_uuid` varchar(255) NOT NULL default '',
+ `accountcode` varchar(255) NOT NULL default '',
+ `read_codec` varchar(255) NOT NULL default '',
+ `write_codec` varchar(255) NOT NULL default '',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uuid` (`uuid`)
+) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+
+-- --------------------------------------------------------
+
+
+--
</ins><span class="cx"> -- Table structure for table `conference_advertise`
</span><span class="cx"> --
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>