From 2619c88db46968a15b8de9ba3e31df96e36d4ec0 Mon Sep 17 00:00:00 2001
From: Sarjuuk <junkdump@gmx.net>
Date: Sat, 4 Jul 2015 16:01:37 +0200
Subject: [PATCH] Admins/Screenshots   * allow empty captions on edit   * set
 date of reputation reward to time of upload not approve

---
 includes/ajaxHandler.class.php | 8 ++++----
 includes/utilities.php         | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/includes/ajaxHandler.class.php b/includes/ajaxHandler.class.php
index d3d1d6c8..684ebec0 100644
--- a/includes/ajaxHandler.class.php
+++ b/includes/ajaxHandler.class.php
@@ -1141,11 +1141,11 @@ class AjaxHandler
     // resp: ''
     private function admin_handleSSEditalt()
     {
-        if (!$this->get('id') || !$this->post('alt'))
+        if (!$this->get('id') || $this->post('alt') === null)
             return '';
 
         // doesn't need to be htmlEscaped, ths javascript does that
-        DB::Aowow()->query('UPDATE ?_screenshots SET caption = ? WHERE id = ?d', $this->post('alt'), $this->get('id'));
+        DB::Aowow()->query('UPDATE ?_screenshots SET caption = ? WHERE id = ?d', trim($this->post('alt')), $this->get('id'));
 
         return '';
     }
@@ -1167,7 +1167,7 @@ class AjaxHandler
         foreach ($ids as $id)
         {
             // must not be already approved
-            if ($_ = DB::Aowow()->selectCell('SELECT userIdOwner FROM ?_screenshots WHERE (status & ?d) = 0 AND id = ?d', CC_FLAG_APPROVED, $id))
+            if ($_ = DB::Aowow()->selectRow('SELECT userIdOwner, date FROM ?_screenshots WHERE (status & ?d) = 0 AND id = ?d', CC_FLAG_APPROVED, $id))
             {
                 // should also error-log
                 if (!file_exists(sprintf($path, 'pending', $id)))
@@ -1209,7 +1209,7 @@ class AjaxHandler
 
                 // set as approved in DB and gain rep (once!)
                 DB::Aowow()->query('UPDATE ?_screenshots SET status = ?d, userIdApprove = ?d WHERE id = ?d', CC_FLAG_APPROVED, User::$id, $id);
-                Util::gainSiteReputation($_, SITEREP_ACTION_UPLOAD, ['id' => $id, 'what' => 1]);
+                Util::gainSiteReputation($_['userIdOwner'], SITEREP_ACTION_UPLOAD, ['id' => $id, 'what' => 1, 'date' => $_['date']]);
             }
         }
 
diff --git a/includes/utilities.php b/includes/utilities.php
index a4819978..a8827cad 100644
--- a/includes/utilities.php
+++ b/includes/utilities.php
@@ -1477,7 +1477,7 @@ class Util
                     return false;
 
                 $x['sourceA'] = $miscData['id'];            // screenshotId or videoId
-                $x['sourceB'] = $miscData['what'];          // screenshot or video
+                $x['sourceB'] = $miscData['what'];          // screenshot:1 or video:NYD
                 $x['amount']  = CFG_REP_REWARD_UPLOAD;
                 break;
             case SITEREP_ACTION_GOOD_REPORT:                // NYI
@@ -1508,7 +1508,7 @@ class Util
         $x = array_merge($x, array(
             'userId' => $user,
             'action' => $action,
-            'date'   => time()
+            'date'   => !empty($miscData['date']) ? $miscData['date'] : time()
         ));
 
         return DB::Aowow()->query('INSERT IGNORE INTO ?_account_reputation (?#) VALUES (?a)', array_keys($x), array_values($x));