Mercurial > hg > fapweb

diff admajax.php @ 872:5e9958f78b16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More work.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 26 Nov 2014 13:31:56 +0200
parents b5176d174bf5
children 5c5bd09d15f3
line wrap: on
line diff
--- a/admajax.php	Wed Nov 26 13:31:12 2014 +0200
+++ b/admajax.php	Wed Nov 26 13:31:56 2014 +0200
@@ -180,7 +180,8 @@
   $eid = $entry["id"];
   $str = "<div class=\"editControl\"><span class=\"editControlTitle\">".chentities($title)."</span>\n";
 
-  if (($efile = stFetchSQL("SELECT * FROM files WHERE id=".$entry[$file_id])) !== false)
+  // Show currently selected / active file
+  if (($efile = stFetchSQL("SELECT * FROM files WHERE deleted=0 AND id=".$entry[$file_id])) !== false)
   {
     $str .=
       "<div>File: <b>".chentities($efile["filename"])."</b></div>\n".
@@ -188,11 +189,12 @@
   }
   else
   {
-    $str .= "<div>No file stored</div>\n";
+    $str .= "<div>No file stored OR selected</div>\n";
   }
 
   if ($mode == 1)
   {
+    // Show upload form
     $handler = "admajax.php";
     $str .=
     "     ".stGetFormStart($type."UploadForm".$eid, $handler, FALSE, "enctype=\"multipart/form-data\" id=\"".$type."UploadForm".$eid."\"").
@@ -433,7 +435,7 @@
         "<span class=\"entryAuthor\">".chentities($entry["author"])."</span>".
         "</div>";
 
-      if (($efile = stFetchSQL("SELECT * FROM files WHERE id=".$entry["file_id"])) !== false)
+      if (($efile = stFetchSQL("SELECT * FROM files WHERE deleted=0 AND id=".$entry["file_id"])) !== false)
       {
         foreach (array("S" => "filename", "O" => "origname") as $ftitle => $fid)
         {