extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

one big irritation was that the pwd() function would return an extra space at the end of the directory name. This shouldn't have occured, because spaces are not allowed as the first/last character of the name.

Browse Source
This commit is contained in:
skeeter 2001-12-27 15:20:03 +00:00
parent 42a23a93c3
commit 827eb9a223
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpgwapi/inc/class.vfs_sql.inc.php
View File

@ -1124,7 +1124,7 @@
$currentdir = '/'; $currentdir = '/';
} }
return $currentdir; return trim($currentdir);
} }
/*! /*!
@ -1621,9 +1621,9 @@
if ($this->file_type ($string, array ($relatives[0])) != 'Directory') if ($this->file_type ($string, array ($relatives[0])) != 'Directory')
{ {
$this->add_journal ($p->fake_full_path, array ($p->mask), VFS_OPERATION_DELETED); $this->add_journal ($string, array ($relatives[0]), VFS_OPERATION_DELETED);
$query = $GLOBALS['phpgw']->db->query ("DELETE FROM phpgw_vfs WHERE directory='$p->fake_leading_dirs_clean' AND name='$p->fake_name_clean'" . $this->extra_sql (VFS_SQL_DELETE), __LINE__, __FILE__); $query = $GLOBALS['phpgw']->db->query ("DELETE FROM phpgw_vfs WHERE directory='".$p->fake_leading_dirs_clean."' AND name='".$p->fake_name_clean."'".$this->extra_sql (VFS_SQL_DELETE), __LINE__, __FILE__);
$rr = unlink ($p->real_full_path); $rr = unlink ($p->real_full_path);
if ($query || $rr) if ($query || $rr)
@ -1647,7 +1647,7 @@
continue; continue;
} }
$this->rm ("$entry[directory]/$entry[name]", array ($p->mask)); $this->rm ($entry[directory].SEP.$entry[name], array ($p->mask));
} }
/* Now we cycle through again and delete the directories */ /* Now we cycle through again and delete the directories */