extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-27 16:29:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed nested DB queries, start on group support

Browse Source
This commit is contained in:
zone 2001-05-25 02:14:20 +00:00
parent b0b883cc20
commit 17b9ea80b1
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
filemanager/index.php
View File

@ -29,12 +29,14 @@ $homedir = "$fakebase/$userinfo[account_lid]";
$phpwh_debug = 0; $phpwh_debug = 0;
/* This doesn't work yet
if ($download && $fileman[0]) if ($download && $fileman[0])
{ {
$phpgw->browser->content_header ($fn); $phpgw->browser->content_header ($fn);
echo $phpgw->vfs->read ($path/$fileman[0]); echo $phpgw->vfs->read ($path/$fileman[0]);
$phpgw->common->phpgw_exit (); $phpgw->common->phpgw_exit ();
} }
*/
### ###
# Default is to sort by name # Default is to sort by name
@ -105,13 +107,7 @@ if ($phpwh_debug)
if ($path != $homedir && $path != "/" && $path != $fakebase) if ($path != $homedir && $path != "/" && $path != $fakebase)
{ {
if ($phpwh_debug) if (!$phpgw->vfs->file_exists ($path, array (RELATIVE_NONE)))
{
echo "SELECT name FROM phpgw_vfs WHERE owner_id = '$userinfo[username]' AND name = '$cwd' AND mime_type = 'Directory' AND directory = '$lesspath'<br>";
}
$query = db_query ("SELECT name FROM phpgw_vfs WHERE owner_id = '$userinfo[username]' AND name = '$cwd' AND mime_type = 'Directory' AND directory = '$lesspath'");
if (!$phpgw->db->next_record ($query))
{ {
html_text_error ("Directory $dir does not exist", 1); html_text_error ("Directory $dir does not exist", 1);
html_break (2); html_break (2);
@ -127,8 +123,28 @@ if ($path != $homedir && $path != "/" && $path != $fakebase)
# $files in the loop below uses $query # $files in the loop below uses $query
### ###
$files_query = db_query ("SELECT * FROM phpgw_vfs WHERE owner_id = '$userinfo[username]' AND directory = '$path' AND name != '' ORDER BY $sortby"); if ($path == $fakebase)
$numoffiles = db_call ("affected_rows", $files_query); {
$files_array = array ();
$files_array[] = $phpgw->vfs->ls ($homedir, array (RELATIVE_NONE), False, False, True);
$numoffiles++;
$groups = $phpgw->accounts->memberships ($userinfo["username"]);
while (list ($num, $group_array) = each ($groups))
{
$files_array[] = $phpgw->vfs->ls ("$fakebase/$group_array[account_name]", array (RELATIVE_NONE), False, False, True);
$numoffiles++;
}
}
else
{
$files_query = db_query ("SELECT * FROM phpgw_vfs WHERE directory = '$path' AND name != '' ORDER BY $sortby");
$numoffiles = db_call ("affected_rows", $files_query);
while ($files_array[] = db_fetch_array ($files_query))
;
}
### ###
# Start Main Page # Start Main Page
@ -248,9 +264,10 @@ if (!$op && !$delete && !$createdir && !$renamefiles && !$move && !$copy && !$ed
# List all of the files, with their attributes # List all of the files, with their attributes
### ###
reset ($files_array);
for ($i = 0; $i != $numoffiles; $i++) for ($i = 0; $i != $numoffiles; $i++)
{ {
$files = db_fetch_array ($files_query); $files = $files_array[$i];
if ($rename || $edit_comments) if ($rename || $edit_comments)
{ {