Sort People tags descending; Albums ascending.

This reverts commit 94427a4c5c03b1368356279781bddf6c82527831.

TODO.md

@@ -1,4 +1,11 @@
 TODO:
 
-* Taggen door gebruikers
+* Gebruikers *persoons*tags laten verwijderen
-* Album management
+
+* Bij taggen van user: thumbnail setten
+
+* Grid herberekenen; captions weglaten.
+
+* Sortering: alleen *albums* ASC, personen DESC!
+
+* Album/tag management

app.php

@@ -23,7 +23,7 @@ $user->updateAccessTime();
 Registry::set('user', $user);
 
 // Handle errors our own way.
-//set_error_handler('ErrorHandler::handleError');
+set_error_handler('ErrorHandler::handleError');
 ini_set("display_errors", DEBUG ? "On" : "Off");
 
 // The real magic starts here!

controllers/Login.php

@@ -30,8 +30,8 @@ class Login extends HTMLController
 					header('Location: ' . base64_decode($_POST['redirect_url']));
 				elseif (isset($_SESSION['login_url']))
 				{
-					unset($_SESSION['redirect_url']);
+					header('Location: ' . $_SESSION['login_url']);
-					header('Location: ' . $_SESSION['redirect_url']);
+					unset($_SESSION['login_url']);
 				}
 				else
 					header('Location: ' . BASEURL . '/');

controllers/ManageTags.php

@@ -14,9 +14,6 @@ class ManageTags extends HTMLController
 		if (!Registry::get('user')->isAdmin())
 			throw new NotAllowedException();
 
-		if (isset($_REQUEST['create']) && isset($_POST['tag']))
-			$this->handleTagCreation();
-
 		$options = [
 			'columns' => [
 				'id_post' => [
@@ -92,36 +89,4 @@ class ManageTags extends HTMLController
 		parent::__construct('Tag management - Page ' . $table->getCurrentPage() .' - ' . SITE_TITLE);
 		$this->page->adopt(new TabularData($table));
 	}
-
-	private function handleTagCreation()
-	{
-		header('Content-Type: text/json; charset=utf-8');
-
-		// It better not already exist!
-		if (Tag::exactMatch($_POST['tag']))
-		{
-			echo '{"error":"Tag already exists!"}';
-			exit;
-		}
-
-		$label = htmlentities(trim($_POST['tag']));
-		$slug = strtr(strtolower($label), [' ' => '-']);
-		$tag = Tag::createNew([
-			'tag' => $label,
-			'slug' => $slug,
-		]);
-
-		// Did we succeed?
-		if (!$tag)
-		{
-			echo '{"error":"Could not create tag."}';
-			exit;
-		}
-
-		echo json_encode([
-			'label' => $tag->tag,
-			'id_tag' => $tag->id_tag,
-		]);
-		exit;
-	}
 }

controllers/ProvideAutoSuggest.php

@@ -14,14 +14,22 @@ class ProvideAutoSuggest extends JSONController
 		if (!Registry::get('user')->isLoggedIn())
 			throw new NotAllowedException();
 
-		if (!isset($_GET['type']))
+		if (!isset($_REQUEST['type']))
 			throw new UnexpectedValueException('Unsupported autosuggest request.');
 
-		if ($_GET['type'] === 'tags' && isset($_GET['data']))
+		if ($_REQUEST['type'] === 'tags' && isset($_REQUEST['data']))
+			return $this->handleTagSearch();
+
+		if ($_REQUEST['type'] === 'createtag' && isset($_REQUEST['tag']))
+			return $this->handleTagCreation();
+	}
+
+	private function handleTagSearch()
 	{
-			$data = array_unique(explode(' ', urldecode($_GET['data'])));
+		{
+			$data = array_unique(explode(' ', urldecode($_REQUEST['data'])));
 			$data = array_filter($data, function($item) {
-				return strlen($item) >= 3;
+				return strlen($item) >= 2;
 			});
 
 			$this->payload = ['items' => []];
@@ -30,7 +38,7 @@ class ProvideAutoSuggest extends JSONController
 			if (count($data) === 0)
 				return;
 
-			$results = Tag::match($data);
+			$results = Tag::matchPeople($data);
 			foreach ($results as $id_tag => $tag)
 				$this->payload['items'][] = [
 					'label' => $tag,
@@ -38,4 +46,35 @@ class ProvideAutoSuggest extends JSONController
 				];
 		}
 	}
+
+	private function handleTagCreation()
+	{
+		// It better not already exist!
+		if (Tag::exactMatch($_REQUEST['tag']))
+		{
+			$this->payload = ['error' => true, 'msg' => "Tag already exists!"];
+			return;
+		}
+
+		$label = htmlentities(trim($_REQUEST['tag']));
+		$slug = strtr($label, [' ' => '-']);
+		$tag = Tag::createNew([
+			'tag' => $label,
+			'kind' => 'Person',
+			'slug' => $slug,
+		]);
+
+		// Did we succeed?
+		if (!$tag)
+		{
+			$this->payload = ['error' => true, 'msg' => "Could not create tag."];
+			return;
+		}
+
+		$this->payload = [
+			'success' => true,
+			'label' => $tag->tag,
+			'id_tag' => $tag->id_tag,
+		];
+	}
 }

controllers/ViewPhoto.php

@@ -18,6 +18,9 @@ class ViewPhoto extends HTMLController
 		if (empty($photo))
 			throw new NotFoundException();
 
+		if (!empty($_POST))
+			$this->handleTagging($photo->getImage());
+
 		parent::__construct($photo->getTitle() . ' - ' . SITE_TITLE);
 		$page = new PhotoPage($photo->getImage());
 
@@ -47,4 +50,21 @@ class ViewPhoto extends HTMLController
 		if (Registry::get('user')->isAdmin())
 			$this->admin_bar->appendItem(BASEURL . '/editasset/?id=' . $photo->getId(), 'Edit this photo');
 	}
+
+	private function handleTagging(Image $photo)
+	{
+		header('Content-Type: text/json; charset=utf-8');
+
+		// Are we tagging a photo?
+		if (!isset($_POST['id_tag']))
+		{
+			echo json_encode(['error' => true, 'msg' => 'Invalid tag request.']);
+			exit;
+		}
+
+		// We are!
+		$photo->linkTags([(int) $_POST['id_tag']]);
+		echo json_encode(['success' => true]);
+		exit;
+	}
 }

controllers/ViewPhotoAlbum.php

@@ -39,6 +39,7 @@ class ViewPhotoAlbum extends HTMLController
 			{
 				$back_link = BASEURL . '/people/';
 				$back_link_title = 'Back to "People"';
+				$is_person = true;
 			}
 
 			$header_box = new AlbumHeaderBox($title, $description, $back_link, $back_link_title);
@@ -84,7 +85,7 @@ class ViewPhotoAlbum extends HTMLController
 		}
 
 		// Load a photo mosaic for the current tag.
-		list($mosaic, $total_count) = $this->getPhotoMosaic($id_tag, $page);
+		list($mosaic, $total_count) = $this->getPhotoMosaic($id_tag, $page, !isset($is_person));
 		if (isset($mosaic))
 		{
 			$index = new PhotosIndex($mosaic, Registry::get('user')->isAdmin());
@@ -111,13 +112,13 @@ class ViewPhotoAlbum extends HTMLController
 			($page > 1 ? 'page/' . $page . '/' : ''));
 	}
 
-	public function getPhotoMosaic($id_tag, $page)
+	public function getPhotoMosaic($id_tag, $page, $sort_linear)
 	{
 		// Create an iterator.
 		list($this->iterator, $total_count) = AssetIterator::getByOptions([
 			'id_tag' => $id_tag,
 			'order' => 'date_captured',
-			'direction' => $id_tag > 0 ? 'asc' : 'desc',
+			'direction' => $sort_linear ? 'asc' : 'desc',
 			'limit' => self::PER_PAGE,
 			'page' => $page,
 		], true);

models/Email.php

@@ -14,7 +14,7 @@ class Email
 		$boundary = uniqid('sr');
 
 		if (empty($headers))
-			$headers .= "From: HashRU Pics <no-reply@pics.hashru.nl>\r\n";
+			$headers .= "From: HashRU Pics <no-reply@aaronweb.net>\r\n";
 
 		// Set up headers.
 		$headers .= "MIME-Version: 1.0\r\n";
@@ -44,7 +44,7 @@ class Email
 		if (DEBUG)
 			return file_put_contents(BASEDIR . '/mail_dumps.txt', "To: \"$addressee\" <$address>\r\n$headers\r\nSubject: $subject\r\n" . self::wrapLines($message), FILE_APPEND);
 		else
-			return mail("\"$addressee\" <$address>", $subject, $message, $headers, '-fbounces@pics.hashru.nl');
+			return mail("\"$addressee\" <$address>", $subject, $message, $headers);
 	}
 
 	public static function wrapLines($body, $maxlength = 80, $break = "\r\n")

models/Member.php

@@ -81,7 +81,7 @@ class Member extends User
 			'emailaddress' => 'string-255',
 			'password_hash' => 'string-255',
 			'creation_time' => 'int',
-			'ip_address' => 'string-15',
+			'ip_address' => 'string-45',
 			'is_admin' => 'int',
 		], $new_user, ['id_user']);
 

models/Tag.php

@@ -226,6 +226,9 @@ class Tag
 		if (!isset($data['id_parent']))
 			$data['id_parent'] = 0;
 
+		if (!isset($data['description']))
+			$data['description'] = '';
+
 		if (!isset($data['count']))
 			$data['count'] = 0;
 
@@ -297,6 +300,23 @@ class Tag
 			['tokens' => '%' . strtolower(implode('%', $tokens)) . '%']);
 	}
 
+	public static function matchPeople($tokens)
+	{
+		if (!is_array($tokens))
+			$tokens = explode(' ', $tokens);
+
+		return Registry::get('db')->queryPair('
+			SELECT id_tag, tag
+			FROM tags
+			WHERE LOWER(tag) LIKE {string:tokens} AND
+				kind = {string:person}
+			ORDER BY tag ASC',
+			[
+				'tokens' => '%' . strtolower(implode('%', $tokens)) . '%',
+				'person' => 'Person',
+			]);
+	}
+
 	public static function exactMatch($tag)
 	{
 		if (!is_string($tag))

public/css/default.css

@@ -588,6 +588,20 @@ a#previous_photo:hover, a#next_photo:hover {
 	margin: 25px 3.5% 25px 0;
 	width: 68.5%;
 }
+#sub_photo #tag_list {
+	list-style: none;
+	margin: 1em 0;
+	padding: 0;
+}
+#sub_photo #tag_list li {
+	display: inline;
+}
+#sub_photo #tag_list li:after {
+	content: ', ';
+}
+#sub_photo #tag_list li:last-child:after {
+	content: '';
+}
 
 #photo_exif_box {
 	background: #fff;

public/js/autosuggest.js

@@ -69,7 +69,7 @@ AutoSuggest.prototype.onType = function(input, event) {
     }
 
     var tokens = input.value.split(/\s+/).filter(function(token) {
-        return token.length >= 3;
+        return token.length >= 2;
     });
 
     if (tokens.length === 0) {
@@ -173,6 +173,6 @@ TagAutoSuggest.prototype.fillContainer = function(response) {
 };
 
 TagAutoSuggest.prototype.createNewTag = function(callback) {
-    var request_uri = this.baseurl + '/managetags/?create';
+    var request_uri = this.baseurl + '/suggest/?type=createtag';
     var request = new HttpRequest('post', request_uri, 'tag=' + encodeURIComponent(this.input.value), callback, this);
 }

public/js/photonav.js

@@ -4,14 +4,14 @@ function enableKeyDownNavigation() {
 			var target = document.getElementById("previous_photo").href;
 			if (target) {
 				event.preventDefault();
-				document.location.href = target;
+				document.location.href = target + '#photo_frame';
 			}
 		}
 		else if (event.keyCode == 39) {
 			var target = document.getElementById("next_photo").href;
 			if (target) {
 				event.preventDefault();
-				document.location.href = target;
+				document.location.href = target + '#photo_frame';
 			}
 		}
 	}, false);
@@ -53,13 +53,13 @@ function enableTouchNavigation() {
 				var target = document.getElementById("previous_photo").href;
 				if (target) {
 					event.preventDefault();
-					document.location.href = target;
+					document.location.href = target + '#photo_frame';
 				}
 			} else {
 				var target = document.getElementById("next_photo").href;
 				if (target) {
 					event.preventDefault();
-					document.location.href = target;
+					document.location.href = target + '#photo_frame';
 				}
 			}
 		}

public/js/upload_queue.js

@@ -17,6 +17,7 @@ UploadQueue.prototype.addEvents = function() {
 				that.hideSpinner();
 				that.submit.disabled = false;
 			};
+			that.addPreviewBoxForQueueSlot(i);
 			that.addPreviewForFile(that.queue.files[i], i, callback);
 		};
 	});
@@ -33,6 +34,12 @@ UploadQueue.prototype.clearPreviews = function() {
 	this.current_upload_index = -1;
 }
 
+UploadQueue.prototype.addPreviewBoxForQueueSlot = function(index) {
+	var preview_box = document.createElement('div');
+	preview_box.id = 'upload_preview_' + index;
+	this.preview_area.appendChild(preview_box);
+};
+
 UploadQueue.prototype.addPreviewForFile = function(file, index, callback) {
 	if (!file) {
 		return false;
@@ -42,30 +49,19 @@ UploadQueue.prototype.addPreviewForFile = function(file, index, callback) {
 	preview.title = file.name;
 	preview.style.maxHeight = '150px';
 
-	var preview_box = document.createElement('div');
+	var preview_box = document.getElementById('upload_preview_' + index);
-	preview_box.id = 'upload_preview_' + index;
 	preview_box.appendChild(preview);
 
 	var reader = new FileReader();
 	var that = this;
-	var appendMe = function() {
+	reader.addEventListener('load', function() {
 		preview.src = reader.result;
 		if (callback) {
 			preview.addEventListener('load', function() {
 				callback();
 			});
 		}
-		that.preview_area.appendChild(preview_box);
+	}, false);
-	};
-	var waitForMe = function() {
-		var previews = that.preview_area.childNodes;
-		if (previews.length === 0 || previews[previews.length - 1].id === 'upload_preview_' + (index - 1)) {
-			appendMe();
-		} else {
-			setTimeout(waitForMe, 10);
-		}
-	};
-	reader.addEventListener('load', waitForMe, false);
 	reader.readAsDataURL(file);
 };
 

templates/PhotoPage.php

@@ -134,7 +134,7 @@ class PhotoPage extends SubTemplate
 	{
 		echo '
 					<h3>Tags</h3>
-					<ul>';
+					<ul id="tag_list">';
 
 		foreach ($this->photo->getTags() as $tag)
 		{
@@ -153,9 +153,7 @@ class PhotoPage extends SubTemplate
 		echo '
 				<div>
 					<h3>Link tags</h3>
-					<ul id="tag_list">
+					<p style="position: relative"><input type="text" id="new_tag" placeholder="Type to link a new tag"></p>
-						<li id="new_tag_container"><input type="text" id="new_tag" placeholder="Type to link a new tag"></li>
-					</ul>
 				</div>
 				<script type="text/javascript" src="', BASEURL, '/js/ajax.js"></script>
 				<script type="text/javascript" src="', BASEURL, '/js/autosuggest.js"></script>
@@ -166,26 +164,15 @@ class PhotoPage extends SubTemplate
 							listElement: "tag_list",
 							baseUrl: "', BASEURL, '",
 							appendCallback: function(item) {
-								if (document.getElementById("linked_tag_" + item.id_tag)) {
+								var request = new HttpRequest("post", "', $this->photo->getPageUrl(), '",
-									return;
+									"id_tag=" + item.id_tag, function(response) {
-								}
-
-								var newCheck = document.createElement("input");
-								newCheck.type = "checkbox";
-								newCheck.name = "tag[" + item.id_tag + "]";
-								newCheck.id = "linked_tag_" + item.id_tag;
-								newCheck.title = "Uncheck to delete";
-								newCheck.checked = "checked";
-
 										var newNode = document.createElement("li");
-								newNode.appendChild(newCheck);
-
 										var newLabel = document.createTextNode(item.label);
 										newNode.appendChild(newLabel);
 
 										var list = document.getElementById("tag_list");
-								var input = document.getElementById("new_tag_container");
+										list.appendChild(newNode);
-								list.insertBefore(newNode, input);
+									}, this);
 							}
 						});
 					}, 100);