[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/class.vfs_sql.php, 1.1.2.2
From: |
nomail |
Subject: |
[Phpgroupware-cvs] property/class.vfs_sql.php, 1.1.2.2 |
Date: |
Sun, 23 May 2004 02:59:28 -0000 |
Update of /property
Modified Files:
Branch: proposal-branch
class.vfs_sql.php
date: 2004/05/01 20:00:29; author: sigurdne; state: Exp; lines: +17 -16
Log Message:
no message
=====================================================================
Index: property/class.vfs_sql.php
diff -u property/class.vfs_sql.php:1.1.2.1 property/class.vfs_sql.php:1.1.2.2
--- property/class.vfs_sql.php:1.1.2.1 Fri Apr 30 17:35:58 2004
+++ property/class.vfs_sql.php Sat May 1 20:00:29 2004
@@ -72,7 +72,7 @@
unlink(), rmdir(), touch(), etc.). If not, then
we're working completely
in the database.
*/
- $conf = CreateObject($this->currentapp.'_config',
'phpgwapi');
+ $conf = CreateObject($this->currentapp.'_config',
'property');
$conf->read_repository();
$this->basedir = $conf->config_data['files_dir'];
@@ -2168,15 +2168,15 @@
We don't use ls () because it calls file_type () to
determine if it has been
passed a directory
*/
- $db2 = $GLOBALS['phpgw']->db;
- $db2->query ("SELECT mime_type FROM fm_vfs WHERE
directory='$p->fake_leading_dirs_clean' AND name='$p->fake_name_clean'" .
$this->extra_sql (array ('query_type' => VFS_SQL_SELECT)), __LINE__, __FILE__);
- $db2->next_record ();
- $mime_type = $db2->Record['mime_type'];
+ // $db2 = $GLOBALS['phpgw']->db;
+ $dbresult = $GLOBALS['phpgw']->db->Execute("SELECT
mime_type FROM fm_vfs WHERE directory='$p->fake_leading_dirs_clean' AND
name='$p->fake_name_clean'" . $this->extra_sql (array ('query_type' =>
VFS_SQL_SELECT)));
+ // $db2->next_record ();
+ $mime_type = $dbresult->fields['mime_type'];
if(!$mime_type)
{
$mime_type = $this->get_ext_mime_type (array
('string' => $data['string']));
{
- $db2->query ("UPDATE fm_vfs SET
mime_type='".$mime_type."' WHERE directory='".$p->fake_leading_dirs_clean."'
AND name='".$p->fake_name_clean."'" . $this->extra_sql (array ('query_type' =>
VFS_SQL_SELECT)), __LINE__, __FILE__);
+ $GLOBALS['phpgw']->db->Execute("UPDATE
fm_vfs SET mime_type='".$mime_type."' WHERE
directory='".$p->fake_leading_dirs_clean."' AND name='".$p->fake_name_clean."'"
. $this->extra_sql (array ('query_type' => VFS_SQL_SELECT)));
}
}
@@ -2213,10 +2213,10 @@
return $rr;
}
- $db2 = $GLOBALS['phpgw']->db;
- $db2->query ("SELECT name FROM fm_vfs WHERE
directory='".$p->fake_leading_dirs_clean."' AND name='".$p->fake_name_clean."'"
. $this->extra_sql (array ('query_type' => VFS_SQL_SELECT)), __LINE__,
__FILE__);
+// $db2 = $GLOBALS['phpgw']->db;
+ $dbresult = $GLOBALS['phpgw']->db->Execute("SELECT name
FROM fm_vfs WHERE directory='".$p->fake_leading_dirs_clean."' AND
name='".$p->fake_name_clean."'" . $this->extra_sql (array ('query_type' =>
VFS_SQL_SELECT)));
- if ($db2->next_record ())
+ if ($dbresult->fields[0])
{
return True;
}
@@ -2353,6 +2353,7 @@
*/
function ls ($data)
{
+//html_print_r($data);
if (!is_array ($data))
{
$data = array ();
@@ -2400,7 +2401,7 @@
$sql .= " FROM fm_vfs WHERE
directory='".$p->fake_leading_dirs_clean."' AND
name='".$p->fake_name_clean."'".$this->extra_sql (array ('query_type' =>
VFS_SQL_SELECT));
- $query = $GLOBALS['phpgw']->db->Execute($sql,
__LINE__, __FILE__);
+ $query = $GLOBALS['phpgw']->db->Execute($sql);
$record = $GLOBALS['phpgw']->db->Record;
@@ -2411,7 +2412,7 @@
{
if ($attribute == 'mime_type' &&
!$record[$attribute])
{
- $db2 = $GLOBALS['phpgw']->db;
+ // $db2 = $GLOBALS['phpgw']->db;
$record[$attribute] =
$this->get_ext_mime_type (array(
'string' =>
$p->fake_name_clean
)
@@ -2419,7 +2420,7 @@
if($record[$attribute])
{
- $db2->query ("UPDATE
fm_vfs SET mime_type='".$record[$attribute]."' WHERE
directory='".$p->fake_leading_dirs_clean."' AND name='".$p->fake_name_clean."'"
. $this->extra_sql (array ('query_type' => VFS_SQL_SELECT)), __LINE__,
__FILE__);
+
$GLOBALS['phpgw']->db->Execute("UPDATE fm_vfs SET
mime_type='".$record[$attribute]."' WHERE
directory='".$p->fake_leading_dirs_clean."' AND name='".$p->fake_name_clean."'"
. $this->extra_sql (array ('query_type' => VFS_SQL_SELECT)));
}
}
@@ -2493,7 +2494,7 @@
$sql .= ' ORDER BY '.$data['orderby'];
- $query = $GLOBALS['phpgw']->db->Execute($sql, __LINE__,
__FILE__);
+ $query = $GLOBALS['phpgw']->db->Execute($sql);
$rarray = array ();
while (!$query->EOF)
@@ -2526,7 +2527,7 @@
if($record[$attribute])
{
-
$GLOBALS['phpgw']->db->Execute("UPDATE fm_vfs SET
mime_type='".$record[$attribute]."' WHERE
directory='".$p->fake_leading_dirs_clean."' AND name='".$p->fake_name_clean."'"
. $this->extra_sql (array ('query_type' => VFS_SQL_SELECT)), __LINE__,
__FILE__);
+
$GLOBALS['phpgw']->db->Execute("UPDATE fm_vfs SET
mime_type='".$record[$attribute]."' WHERE
directory='".$p->fake_leading_dirs_clean."' AND name='".$p->fake_name_clean."'"
. $this->extra_sql (array ('query_type' => VFS_SQL_SELECT)));
}
}
@@ -2676,7 +2677,7 @@
if($mime_type)
{
- $GLOBALS['phpgw']->db->Execute("UPDATE
fm_vfs SET mime_type='".$mime_type."' WHERE
directory='".$p->fake_leading_dirs_clean."' AND name='".$p->fake_name_clean."'"
. $this->extra_sql (array ('query_type' => VFS_SQL_SELECT)), __LINE__,
__FILE__);
+ $GLOBALS['phpgw']->db->Execute("UPDATE
fm_vfs SET mime_type='".$mime_type."' WHERE
directory='".$p->fake_leading_dirs_clean."' AND name='".$p->fake_name_clean."'"
. $this->extra_sql (array ('query_type' => VFS_SQL_SELECT)));
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/class.vfs_sql.php, 1.1.2.2,
nomail <=