diff options
-rw-r--r-- | modules-available/dozmod/pages/expiredimages.inc.php | 20 | ||||
-rw-r--r-- | modules-available/dozmod/templates/images-delete.html | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/modules-available/dozmod/pages/expiredimages.inc.php b/modules-available/dozmod/pages/expiredimages.inc.php index ffd7b026..3217ae1e 100644 --- a/modules-available/dozmod/pages/expiredimages.inc.php +++ b/modules-available/dozmod/pages/expiredimages.inc.php @@ -10,16 +10,16 @@ class SubPage private static function loadExpiredImages() { - $res = Database::simpleQuery("SELECT b.displayname," - . " own.firstname, own.lastname, own.email," - . " v.imageversionid, v.createtime, v.filesize, v.deletestate," - . " lat.expiretime AS latexptime, lat.deletestate AS latdelstate" - . " FROM sat.imageversion v" - . " INNER JOIN sat.imagebase b ON (b.imagebaseid = v.imagebaseid)" - . " INNER JOIN sat.user own ON (b.ownerid = own.userid)" - . " LEFT JOIN sat.imageversion lat ON (b.latestversionid = lat.imageversionid)" - . " WHERE v.deletestate <> 'KEEP'" - . " ORDER BY b.displayname ASC, v.createtime ASC"); + $res = Database::simpleQuery("SELECT b.displayname, + own.firstname, own.lastname, own.userid, + v.imageversionid, v.createtime, v.filesize, v.deletestate, + lat.expiretime AS latexptime, lat.deletestate AS latdelstate + FROM sat.imageversion v + INNER JOIN sat.imagebase b ON (b.imagebaseid = v.imagebaseid) + INNER JOIN sat.user own ON (b.ownerid = own.userid) + LEFT JOIN sat.imageversion lat ON (b.latestversionid = lat.imageversionid) + WHERE v.deletestate <> 'KEEP' + ORDER BY b.displayname ASC, v.createtime ASC"); $NOW = time(); $rows = array(); while ($row = $res->fetch(PDO::FETCH_ASSOC)) { diff --git a/modules-available/dozmod/templates/images-delete.html b/modules-available/dozmod/templates/images-delete.html index 9d61559f..5bbebdc3 100644 --- a/modules-available/dozmod/templates/images-delete.html +++ b/modules-available/dozmod/templates/images-delete.html @@ -34,7 +34,7 @@ <td class="text-left text-nowrap {{name_extra_class}}">{{displayname}}<br><span class="small">{{imageversionid}}</span> </td> <td class="text-left text-nowrap" data-sort-value="{{createtime}}">{{version}}</td> - <td class="text-left text-nowrap"><a href="mailto:{{email}}">{{lastname}}, {{firstname}}</a></td> + <td class="text-left text-nowrap"><a href="?do=dozmod&section=actionlog&action=showuser&uuid={{userid}}">{{lastname}}, {{firstname}}</a></td> <td class="text-left text-nowrap"><span class="glyphicon {{hasNewerClass}}"></span></td> <td class="text-left text-nowrap" data-sort-value="{{rawfilesize}}">{{filesize}}</td> <td> |