<!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][16286] </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=16286">16286</a></dd>
<dt>Author</dt> <dd>intralanman</dd>
<dt>Date</dt> <dd>2010-01-13 13:43:59 -0600 (Wed, 13 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>handle group lookups a little better</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribintralanmanPHPfs_curlfs_directoryphp">freeswitch/trunk/contrib/intralanman/PHP/fs_curl/fs_directory.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribintralanmanPHPfs_curlfs_directoryphp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/intralanman/PHP/fs_curl/fs_directory.php (16285 => 16286)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/intralanman/PHP/fs_curl/fs_directory.php 2010-01-13 19:40:28 UTC (rev 16285)
+++ freeswitch/trunk/contrib/intralanman/PHP/fs_curl/fs_directory.php 2010-01-13 19:43:59 UTC (rev 16286)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> FROM %1$sdirectory%1$s
</span><span class="cx"> WHERE %1$susername%1$s = \'%3$s\'
</span><span class="cx"> AND %1$sdomain%1$s = \'%4$s\')'
</span><del>- , DB_FIELD_QUOTE, $new_pin, $username, $this->request['domain']
</del><ins>+ , DB_FIELD_QUOTE, $new_pin, $username, $this->request['domain']
</ins><span class="cx"> );
</span><span class="cx"> $this->debug($query);
</span><span class="cx"> $this->db->exec($query);
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> $where_clause = '';
</span><span class="cx"> }
</span><span class="cx"> $query = sprintf("SELECT * FROM directory d %s %s ORDER BY username"
</span><del>- , $join_clause, $where_clause
</del><ins>+ , $join_clause, $where_clause
</ins><span class="cx"> );
</span><span class="cx"> $this->debug($query);
</span><span class="cx"> $res = $this -> db -> queryAll($query);
</span><span class="lines">@@ -144,8 +144,8 @@
</span><span class="cx"> */
</span><span class="cx"> private function write_params($user_id) {
</span><span class="cx"> if (array_key_exists($user_id, $this->users_params)
</span><del>- && is_array($this->users_params[$user_id])
- && count($this->users_params[$user_id]) > 0) {
</del><ins>+ && is_array($this->users_params[$user_id])
+ && count($this->users_params[$user_id]) > 0) {
</ins><span class="cx"> $this -> xmlw -> startElement('params');
</span><span class="cx"> foreach($this->users_params[$user_id] as $pname => $pvalue) {
</span><span class="cx"> $this -> xmlw -> startElement('param');
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> */
</span><span class="cx"> private function write_variables($user_id) {
</span><span class="cx"> if (array_key_exists($user_id, $this->users_vars)
</span><del>- && is_array($this->users_vars[$user_id])) {
</del><ins>+ && is_array($this->users_vars[$user_id])) {
</ins><span class="cx"> $this -> xmlw -> startElement('variables');
</span><span class="cx"> foreach($this->users_vars[$user_id] as $vname => $vvalue) {
</span><span class="cx"> $this -> xmlw -> startElement('variable');
</span><span class="lines">@@ -231,18 +231,18 @@
</span><span class="cx"> */
</span><span class="cx"> private function write_gateways($user_id) {
</span><span class="cx"> if (is_array($this->users_gateways)
</span><del>- && array_key_exists($user_id, $this->users_gateways)
- && is_array($this -> users_gateways[$user_id])) {
</del><ins>+ && array_key_exists($user_id, $this->users_gateways)
+ && is_array($this -> users_gateways[$user_id])) {
</ins><span class="cx"> $this -> xmlw -> startElement('gateways');
</span><span class="cx"> $gateway_count = count($this -> users_gateways[$user_id]);
</span><span class="cx"> for ($i=0; $i<$gateway_count; $i++) {
</span><span class="cx"> $this -> xmlw -> startElement('gateway');
</span><span class="cx"> $this -> xmlw -> writeAttribute(
</span><del>- 'name', $this -> users_gateways[$user_id][$i]['gateway_name']
</del><ins>+ 'name', $this -> users_gateways[$user_id][$i]['gateway_name']
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $this -> write_user_gateway_params(
</span><del>- $this -> users_gateways[$user_id][$i]['id']
</del><ins>+ $this -> users_gateways[$user_id][$i]['id']
</ins><span class="cx"> );
</span><span class="cx"> $this -> xmlw -> endElement();
</span><span class="cx"> }
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx"> */
</span><span class="cx"> private function write_user_gateway_params($d_gw_id) {
</span><span class="cx"> if (is_array($this->users_gateway_params[$d_gw_id])
</span><del>- && count($this->users_gateway_params[$d_gw_id]) > 0) {
</del><ins>+ && count($this->users_gateway_params[$d_gw_id]) > 0) {
</ins><span class="cx"> foreach($this->users_gateway_params[$d_gw_id] as $pname => $pvalue) {
</span><span class="cx"> $this -> xmlw -> startElement('param');
</span><span class="cx"> $this -> xmlw -> writeAttribute('name', $pname);
</span><span class="lines">@@ -293,15 +293,15 @@
</span><span class="cx"> */
</span><span class="cx"> function write_global_params() {
</span><span class="cx"> $query = sprintf('%s %s %s;',
</span><del>- 'SELECT * FROM directory_global_params dgp',
- 'JOIN directory_domains dd ON dd.id=dgp.domain_id',
- "WHERE dd.domain_name='" . $this -> request['domain'] . "'"
</del><ins>+ 'SELECT * FROM directory_global_params dgp',
+ 'JOIN directory_domains dd ON dd.id=dgp.domain_id',
+ "WHERE dd.domain_name='" . $this -> request['domain'] . "'"
</ins><span class="cx"> );
</span><span class="cx"> $res = $this -> db -> queryAll($query);
</span><span class="cx"> if (FS_PDO::isError($res)) {
</span><span class="cx"> $this -> comment($query);
</span><span class="cx"> $error_msg = sprintf("Error while selecting global params - %s"
</span><del>- , $this -> db -> getMessage()
</del><ins>+ , $this -> db -> getMessage()
</ins><span class="cx"> );
</span><span class="cx"> trigger_error($error_msg);
</span><span class="cx"> }
</span><span class="lines">@@ -325,15 +325,15 @@
</span><span class="cx"> */
</span><span class="cx"> function write_global_vars() {
</span><span class="cx"> $query = sprintf('%s %s %s;',
</span><del>- 'SELECT * FROM directory_global_vars dgv',
- 'JOIN directory_domains dd ON dd.id=dgv.domain_id',
- "WHERE dd.domain_name='" . $this -> request['domain'] . "'"
</del><ins>+ 'SELECT * FROM directory_global_vars dgv',
+ 'JOIN directory_domains dd ON dd.id=dgv.domain_id',
+ "WHERE dd.domain_name='" . $this -> request['domain'] . "'"
</ins><span class="cx"> );
</span><span class="cx"> $res = $this -> db -> queryAll($query);
</span><span class="cx"> if (FS_PDO::isError($res)) {
</span><span class="cx"> $this -> comment($query);
</span><span class="cx"> $error_msg = sprintf("Error while selecting global vars - %s"
</span><del>- , $this -> db -> getMessage()
</del><ins>+ , $this -> db -> getMessage()
</ins><span class="cx"> );
</span><span class="cx"> trigger_error($error_msg);
</span><span class="cx"> }
</span><span class="lines">@@ -390,13 +390,9 @@
</span><span class="cx"> $mailbox = empty($directory[$i]['mailbox']) ? $username : $directory[$i]['mailbox'];
</span><span class="cx"> $this -> xmlw -> startElement('user');
</span><span class="cx"> $this -> xmlw -> writeAttribute('id', $username);
</span><del>- if (empty($directory[$i]['group_name'])) {
- $this -> write_params($directory[$i]['id']);
- $this -> write_variables($directory[$i]['id']);
- $this -> write_gateways($directory[$i]['id']);
- } else {
- $this->xmlw->writeAttribute('type', 'pointer');
- }
</del><ins>+ $this -> write_params($directory[$i]['id']);
+ $this -> write_variables($directory[$i]['id']);
+ $this -> write_gateways($directory[$i]['id']);
</ins><span class="cx"> $this -> xmlw -> endElement();
</span><span class="cx"> }
</span><span class="cx"> $this->xmlw->endElement();
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>