Mercurial > hg > fapweb

changeset 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 9b9939fce097
children 9a8fe613e73a
files admajax.php dbdefs.inc.php msite.inc.php
diffstat 3 files changed, 10 insertions(+), 6 deletions(-) [+]
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)
         {
--- a/dbdefs.inc.php	Wed Nov 26 13:31:12 2014 +0200
+++ b/dbdefs.inc.php	Wed Nov 26 13:31:56 2014 +0200
@@ -1,6 +1,6 @@
 <?
 
-$dbVersion = 26;
+$dbVersion = 27;
 
 //
 // Site settings and defaults we put in
@@ -295,9 +295,11 @@
     array("filename"     , "VARCHAR(".SET_LEN_ENTRY_FILENAME.")", "DEFAULT NULL"), // stored filename
     array("origname"     , "VARCHAR(".SET_LEN_ENTRY_FILENAME.")", "DEFAULT NULL"), // original uploaded filename
     array("filetype"     , "VARCHAR(32)", "DEFAULT NULL"), // type of the file, if any, as key from $fileTypeData
+    array("uploadtype"   , "VARCHAR(32)", "DEFAULT NULL"), // "preview", "entry"
     array("filesize"     , "INT", "DEFAULT 0"), // uploaded size
     array("entry_id"     , "INT", "DEFAULT 0"), // belongs to this entry (0 = none)
     array("uploader_id"  , "INT", "DEFAULT 0"), // 0 = admin, otherwise votekey id
+    array("deleted"      , "INT", "DEFAULT 0"), // 1 = to be deleted
     array("utime"        , "INT", "DEFAULT 0"),
   ),
 
--- a/msite.inc.php	Wed Nov 26 13:31:12 2014 +0200
+++ b/msite.inc.php	Wed Nov 26 13:31:56 2014 +0200
@@ -1067,9 +1067,9 @@
 
   // Create new file entry
   $sql = stPrepareSQL(
-    "INSERT INTO files (origname,filetype,filesize,entry_id,uploader_id,utime) ".
+    "INSERT INTO files (origname,filetype,filesize,entry_id,uploader_id,uploadtype,utime) ".
     "VALUES (%s,%s,%d,%d,%d,%d)",
-    $origName, $fileType, $fileSize, $entry["id"], $uploaderID, time());
+    $origName, $fileType, $fileSize, $entry["id"], $uploaderID, $type, time());
 
   if (($fileID = stExecSQLInsert($sql)) === false)
     return stFileError($uploaderID,