Update of /cvsroot/openfirst/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12450
Modified Files:
workspace.php
Log Message:
Fix bug #58
Index: workspace.php
===================================================================
RCS file: /cvsroot/openfirst/members/workspace.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** workspace.php 21 Jan 2004 00:33:16 -0000 1.21
--- workspace.php 12 Apr 2004 12:42:28 -0000 1.22
***************
*** 16,23 ****
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
--- 16,19 ----
***************
*** 113,117 ****
// Handle directory deletion
if($_GET["action"] == "removedirectory" && isset($_GET["confirmed"]) == true) {
! $del = ofirst_dbquery("DELETE FROM ofirst_workspace_files WHERE name='" . $_GET["directory"] . "' AND owner='$user->user' AND location='" . $_GET["filepath"] ."';");
// deldir() based on code originally written by: fl...@cu...
--- 109,115 ----
// Handle directory deletion
if($_GET["action"] == "removedirectory" && isset($_GET["confirmed"]) == true) {
! $_GET["directory"] = urldecode($_GET["directory"]);
!
! $del = ofirst_dbquery("DELETE FROM ofirst_workspace_files WHERE name='" . urldecode($_GET["directory"]) . "' AND owner='$user->user' AND location='" . $_GET["filepath"] ."';");
// deldir() based on code originally written by: fl...@cu...
***************
*** 133,146 ****
if($filepath == "/") {
! deldir($ws->virtfspath . $_GET["directory"]);
} else {
! deldir($ws->virtfspath . $filepath . "/" . $_GET["directory"]);
}
echo("The sub directory <strong>"" . $_GET["directory"] . ""</strong> has been deleted. [ <a href='workspace.php'>Workspace</a> ]");
die(include_once($footer));
! } elseif($_GET["action"] == "removedirectory" && isset($_GET["confirmed"]) == false) {
echo("Are you sure you want to delete "" . $_GET["directory"] . "" in the " . $_GET["filepath"] . " directory? This <strong>will also remove all
sub directories and files underneath the sub directory.</strong>
! <br><a href='workspace.php?confirmed=true&directory=" . $_GET["directory"] . "&action=removedirectory&filepath=" . $_GET["filepath"] .
"'>Yes, I'm sure</a> <a href='workspace.php'>No, I've changed my mind</a>");
die(include_once($footer));
--- 131,144 ----
if($filepath == "/") {
! deldir($ws->virtfspath . urldecode($_GET["directory"]));
} else {
! deldir($ws->virtfspath . $filepath . "/" . urldecode($_GET["directory"]));
}
echo("The sub directory <strong>"" . $_GET["directory"] . ""</strong> has been deleted. [ <a href='workspace.php'>Workspace</a> ]");
die(include_once($footer));
! } elseif($_GET["action"] == "removedirectory" && isset($_GET["directory"]) && isset($_GET["filepath"]) && isset($_GET["confirmed"]) == false) {
echo("Are you sure you want to delete "" . $_GET["directory"] . "" in the " . $_GET["filepath"] . " directory? This <strong>will also remove all
sub directories and files underneath the sub directory.</strong>
! <br><a href='workspace.php?confirmed=true&directory=" . urlencode($_GET["directory"]) . "&action=removedirectory&filepath=" . urlencode($_GET["filepath"]) .
"'>Yes, I'm sure</a> <a href='workspace.php'>No, I've changed my mind</a>");
die(include_once($footer));
***************
*** 306,310 ****
echo("<tr><th>Icon</th><th>Name</th><th>Date Created</th><th>Actions</th></tr>");
while($d = ofirst_dbfetch_object($dirs)) {
! echo("<tr><td>" . fileicon($d->filetype) . "</td><td><a href='workspace.php?filepath=$d->location$d->name'>$d->name</a></td><td>$d->date</td><td><a href='workspace.php?action=removedirectory&directory=$d->name&filepath=$filepath'>Remove Directory</a></td></tr>");
}
?>
--- 304,308 ----
echo("<tr><th>Icon</th><th>Name</th><th>Date Created</th><th>Actions</th></tr>");
while($d = ofirst_dbfetch_object($dirs)) {
! echo("<tr><td>" . fileicon($d->filetype) . "</td><td><a href='workspace.php?filepath=$d->location$d->name'>$d->name</a></td><td>$d->date</td><td><a href='workspace.php?action=removedirectory&directory=" . urlencode($d->name) . "&filepath=$filepath'>Remove Directory</a></td></tr>");
}
?>
|
