Modified: freeswitch/trunk/contrib/intralanman/PHP/fs_curl/fs_directory.php (15130 => 15131)
--- freeswitch/trunk/contrib/intralanman/PHP/fs_curl/fs_directory.php 2009-10-09 16:42:10 UTC (rev 15130)
+++ freeswitch/trunk/contrib/intralanman/PHP/fs_curl/fs_directory.php 2009-10-09 18:53:03 UTC (rev 15131)
@@ -49,7 +49,10 @@
SET %1$sparam_value%1$s = \'%2$s\'
WHERE %1$sparam_name%1$s = \'vm-password\'
AND %1$sdirectory_id%1$s =
- (SELECT %1$sid%1$s FROM %1$sdirectory%1$s WHERE %1$susername%1$s = \'%3$s\' AND %1$sdomain%1$s = \'%4$s\')'
+ (SELECT %1$sid%1$s
+ FROM %1$sdirectory%1$s
+ WHERE %1$susername%1$s = \'%3$s\'
+ AND %1$sdomain%1$s = \'%4$s\')'
, DB_FIELD_QUOTE, $new_pin, $username, $this->request['domain']
);
$this->debug($query);
@@ -90,9 +93,10 @@
} else {
$where_clause = '';
}
- $query = sprintf("SELECT * FROM directory d %s ORDER BY username"
+ $query = sprintf("SELECT * FROM directory d %s %s ORDER BY username"
, $join_clause, $where_clause
);
+ $this->debug($query);
$res = $this -> db -> queryAll($query);
if (FS_PDO::isError($res)) {
$this -> comment($query);
@@ -139,7 +143,8 @@
* @return void
*/
private function write_params($user_id) {
- if (is_array($this->users_params[$user_id])
+ if (array_key_exists($user_id, $this->users_params)
+ && is_array($this->users_params[$user_id])
&& count($this->users_params[$user_id]) > 0) {
$this -> xmlw -> startElement('params');
foreach($this->users_params[$user_id] as $pname => $pvalue) {
Modified: freeswitch/trunk/contrib/intralanman/PHP/fs_curl/sql/postgres-8.4.sql (15130 => 15131)
--- freeswitch/trunk/contrib/intralanman/PHP/fs_curl/sql/postgres-8.4.sql 2009-10-09 16:42:10 UTC (rev 15130)
+++ freeswitch/trunk/contrib/intralanman/PHP/fs_curl/sql/postgres-8.4.sql 2009-10-09 18:53:03 UTC (rev 15131)
@@ -740,7 +740,7 @@
id integer NOT NULL,
param_name character varying(64) NOT NULL,
param_value character varying(128) NOT NULL,
- directory_id integer NOT NULL
+ domain_id integer NOT NULL
);
@@ -775,7 +775,7 @@
id integer NOT NULL,
var_name character varying(64) NOT NULL,
var_value character varying(128) NOT NULL,
- directory_id integer NOT NULL
+ domain_id integer NOT NULL
);
@@ -2565,7 +2565,7 @@
--
ALTER TABLE ONLY directory_global_params
- ADD CONSTRAINT directory_global_params_directory_id_key UNIQUE (directory_id, param_name);
+ ADD CONSTRAINT directory_global_params_directory_id_key UNIQUE (domain_id, param_name);
--
@@ -2581,7 +2581,7 @@
--
ALTER TABLE ONLY directory_global_vars
- ADD CONSTRAINT directory_global_vars_directory_id_key UNIQUE (directory_id, var_name);
+ ADD CONSTRAINT directory_global_vars_directory_id_key UNIQUE (domain_id, var_name);
--
@@ -3427,7 +3427,7 @@
--
ALTER TABLE ONLY directory_global_params
- ADD CONSTRAINT directory_global_params_directory_id_fkey1 FOREIGN KEY (directory_id) REFERENCES directory_domains(id) ON UPDATE CASCADE ON DELETE CASCADE;
+ ADD CONSTRAINT directory_global_params_directory_id_fkey1 FOREIGN KEY (domain_id) REFERENCES directory_domains(id) ON UPDATE CASCADE ON DELETE CASCADE;
--
@@ -3435,7 +3435,7 @@
--
ALTER TABLE ONLY directory_global_vars
- ADD CONSTRAINT directory_global_vars_directory_id_fkey1 FOREIGN KEY (directory_id) REFERENCES directory_domains(id) ON UPDATE CASCADE ON DELETE CASCADE;
+ ADD CONSTRAINT directory_global_vars_directory_id_fkey1 FOREIGN KEY (domain_id) REFERENCES directory_domains(id) ON UPDATE CASCADE ON DELETE CASCADE;
--