From 452a19254cb659fdefd6335a4782fab6489673a7 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Fri, 27 Feb 2015 20:33:03 +0100
Subject: [PATCH 1/5] Fixed move photo

---
 src/scripts/contextMenu.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/contextMenu.js b/src/scripts/contextMenu.js
index d5a1fa1..9659fb9 100644
--- a/src/scripts/contextMenu.js
+++ b/src/scripts/contextMenu.js
@@ -225,7 +225,7 @@ contextMenu.move = function(photoIDs, e) {
 				var that = this;
 
 				if (!that.thumb0) that.thumb0 = 'src/images/no_cover.svg';
-				that.title = "<img class='albumCover' width='16' height='16' src='" + that.thumb0 + "'><div class='albumTitle'>" + that.title + "</div>";
+				that.title = "<img class='cover' width='16' height='16' src='" + that.thumb0 + "'><div class='title'>" + that.title + "</div>";
 
 				if (that.id!=album.getID()) items.push({ type: 'item', title: that.title, fn: function() { photo.setAlbum(photoIDs, that.id) } });
 

From 67dce773e634c7d00a72e62bedd63c35520e2571 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Fri, 27 Feb 2015 20:37:24 +0100
Subject: [PATCH 2/5] Updated Album::getAll

---
 dist/main.css              | Bin 34408 -> 33566 bytes
 dist/main.js               | Bin 173915 -> 174199 bytes
 php/modules/Album.php      |  55 +++++++++++++++++++++++--------------
 src/scripts/album.js       |  10 +++----
 src/scripts/albums.js      |  42 ++++++++++++++--------------
 src/scripts/contextMenu.js |   4 +--
 src/scripts/password.js    |   2 +-
 src/scripts/view.js        |  21 ++++++++------
 8 files changed, 77 insertions(+), 57 deletions(-)

diff --git a/dist/main.css b/dist/main.css
index 932de008b6283b727b67c0616ac301ac92c69699..980c5d30cfaaf386057b24528cb4095c949be54c 100644
GIT binary patch
delta 1440
zcmah}TTmNi6rSDGGzm!w0Ry>_4UtQdC4@^9f-saaU@I*KXUgRPyJR=8W5|YNfiP<j
zsW_v956<VP9ji{|$%l5Rf34%-IO=;x(ec5tSo`AmfVb&uwQjftY#kqV_x#^Ed(NKk
zoNs?wq2GOpemFSJWyIKNiRTh0q@>J=Ng>Tb)CDO&rcI1`*|AolqZDi!tMN{a9@mXE
z&YU-<1`A1<^@_>3G%jVC;9QzZrG&JCzgs+OTNEj!JGE%nJ76(*$Tzx|Y4nelSlD2k
z<AsySo#()etl(;W3!d^DbbBDaV6CVOv|+{P#+4CcV=lN`ZB&w`@=*tlYK8}-yySDi
z7_i``-(tvl6B5UZ$q5!$7j5`$NsFrU7QD4&Bcnx6Q!tm=A-T2qK`wzpm6Bf59SUO$
z$IxXjBWuMUm)Hu;?iP+j#)Y_)7SQmh?MP!NRE^_~QrvadkoP=yHB>t`+@)Boy@89>
zAL09G5%jfgd|h*qMC(c@ZEl+awMz$9{5s_PR_1>?%ySgR#z+U{Q}3lJDF(VJgXKUE
zmV9M-^BUWiH!GVmIj=ayO$f81Fvske>>dFM?!Dm91e-JD=lW5thHVU?v&C7S>v~q0
zkEgjQA;Y9*5*a}WRqy&-`-4_e9G@pK5)P%ZOo(Z2PG#{^iwl)u7a0!!L7U_>m&_zM
zSs1Ac`Oq=uw5BClJ*ua}u4CGY|8lLjUUwb{Zd7X(ULLNi$8^MDt#9Imi2^)Qw;hHr
z+kEDKzl*=xh7N-Dt!hHVBZ2$D)ky7qAh{VaYVEu@EApx;3ah@0D431=9l0F|oyZF!
zt1e?fQ0mxDx#-7yWV366!fL#Vyw?3H1$R#a26_TS=~<v)>)i?$5>E=MIMU2yBfD#P
zC#8%m@N=R(xev*roDdY;?)4xvuSZeeG=8NlR6BXD@6Hi3<K6Z%K~Y^+F~*`JT8@qA
z6GZCw(71LchWDev^4wnj2LylB<HFiWYlXT=d)gLwQ9hW_j@9u1Ss&=4iVEw-;_bm!
z=%YL=gKv^=2PF;SXV2q8!a{UIuhZ&&`czp5$&;hEH2Qru5p65QGpF^)ovTFun4K()
zeMjNPs1}#c%@i}i!=)b=80>sszNtrGj_FaweSj@)5gUS&m}8eI+~$|nCL8jA8c>8S
z-h`_7S+W}cM2pTTgZg7JVSU7aPnRmlt*IAjXiRR3#phX@`QZHWbHJrJYw;m4wM{+U
z<imLCPj!A?yfJ-+Or|#}ba&ek>OD$ck<ZY$QF#;>oJLYScaOsHY#Dx6jAU^BvxjiX
gXe3?F_i4z7OGC6;H@sY>%k7L!foGW^!^>vsAIr-LZU6uP

delta 1282
zcmb7DU2Icj7|wUvo=X4LpZ(OXj?>Pv9m*;FVQuLlh@0CGV=WP+grC_zwKC2rYX`$^
zty>7j1jfpf7)OY3!3~KC=!aY_a$`(1{_Mg?7)%$#g^7k}xF9jcdAe){p*P%oU-G=~
z`@GNl_t8n_*Ha9&livx3`)o+{HBz-|E88Nb<q@Hne<v@!8Oz90DJPW#1wu+{s`3t`
zrAE4E%~b}|Iz62=_LJ(z8;Mwb&x0?`4y-k^*f3<lGiwcWTf<)u8{Js6YH7xD)q+c0
z5LetRooxSGg@c{ftDmi_QTQ<5Zbg~5V=I52jH1%9NPpy;2tFy>Fz3~g(Ai287T;Fm
z8-o=)j8-CIo6(7g(S~zLAL2S4W|Ds5!#``DMm)*F;B9-tU@Ulh@M+nq<THR&8dbhv
zahc-Lbn6*j#B_2K;St`@|D+**`s_F*%+RuMS%ZO)12<HyY+-n?m>b1`kTV|e`#qy_
zA(hFOj>iJy<LxVx7%j-fd?_zWu~fP!4-S`dVj-2y)@Ie^FN|=0E)*(^h{y8T(p#|_
ziFi0K2{^LX#zqwbFIFG8%&TOvSUUHHJe0$%`&o1(jJVjUrguVjnFg*jl#+^rsZwrl
zr=REWZP@b|wiI?fh6$1D)`w#QiY6ueenhAT`=fk4I3L~fKUjz^lgvfE^<e$xjyf>y
z-fUp$&FA(LEQC5?$$IGS=T8&D;g{}>%4_NI5{_=^DHDA0Vhf2tEqk%>!dF=8Jx1T}
zyRW9dz2ssr+3RA0JoND_E^bdF*wu)y2P_!dWl(-APQUsT&At*LxUox%n~6iXusu`9
zNsApj&)`~OJ-xM4R;`lu?>=G3=8J{F)bW@kOF3`}J3Qmf7<*YyRj*0R%1%A9_A84{
zXObp0s)7@oR*m^^11{{-qm6B)ngc%&oC#>K#F}tBY+5#ax8I3PT~_>ja2R(7E-Tme
zz=f&TD|O0p&|vBk!9=gSR=Pi9$G!C7dVaW)$<?|`E!kPNzSs|qcI8H=jBd&vI>Epx
z{qbMBZ>{u!-jRPIt38<ywPLDSOK%^EGicdj!gQ}qQ9(OPHU_%xb!YoDNEEf0I%>qy
zh=%Sv`nd+??lyejY@>lOQMD{%HLDM%cOCRvrGdfs6D^96dlMYyCYp&zO_OHwFZa^M
AUH||9

diff --git a/dist/main.js b/dist/main.js
index a2b128b4f6d3506ebc959cc7e88cb9dd46b5fdd4..06eb4ff8f62df1e85e1b8aedeacc41d9b87efeb7 100644
GIT binary patch
delta 2680
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

delta 2447
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
Zx9J^aT!l;L84b*P3ye^pUu7zq{|S7gPO<<1

diff --git a/php/modules/Album.php b/php/modules/Album.php
index a45d398..5c74a84 100644
--- a/php/modules/Album.php
+++ b/php/modules/Album.php
@@ -154,8 +154,15 @@ class Album extends Module {
 		# Call plugins
 		$this->plugins(__METHOD__, 0, func_get_args());
 
+		# Initialize return var
+		$return = array(
+			'smartalbums'	=> null,
+			'albums'		=> null,
+			'num'			=> 0
+		);
+
 		# Get SmartAlbums
-		if ($public===false) $return = $this->getSmartInfo();
+		if ($public===false) $return['smartalbums'] = $this->getSmartInfo();
 
 		# Albums query
 		$query = Database::prepare($this->database, 'SELECT id, title, public, sysstamp, password FROM ? WHERE public = 1 AND visible <> 0', array(LYCHEE_TABLE_ALBUMS));
@@ -192,7 +199,7 @@ class Album extends Module {
 			}
 
 			# Add to return
-			$return['content'][$album['id']] = $album;
+			$return['albums'][$album['id']] = $album;
 
 		}
 
@@ -211,29 +218,25 @@ class Album extends Module {
 		# Check dependencies
 		self::dependencies(isset($this->database, $this->settings));
 
+		# Initialize return var
+		$return = array(
+			'unsorted'	=> null,
+			'public'	=> null,
+			'starred'	=> null,
+			'recent'	=> null
+		);
+
 		# Unsorted
 		$query		= Database::prepare($this->database, 'SELECT thumbUrl FROM ? WHERE album = 0 ' . $this->settings['sorting'], array(LYCHEE_TABLE_PHOTOS));
 		$unsorted	= $this->database->query($query);
 		$i			= 0;
 		while($row = $unsorted->fetch_object()) {
 			if ($i<3) {
-				$return["unsortedThumb$i"] = LYCHEE_URL_UPLOADS_THUMB . $row->thumbUrl;
+				$return['unsorted']["thumb$i"] = LYCHEE_URL_UPLOADS_THUMB . $row->thumbUrl;
 				$i++;
 			} else break;
 		}
-		$return['unsortedNum'] = $unsorted->num_rows;
-
-		# Public
-		$query		= Database::prepare($this->database, 'SELECT thumbUrl FROM ? WHERE public = 1 ' . $this->settings['sorting'], array(LYCHEE_TABLE_PHOTOS));
-		$public		= $this->database->query($query);
-		$i			= 0;
-		while($row2 = $public->fetch_object()) {
-			if ($i<3) {
-				$return["publicThumb$i"] = LYCHEE_URL_UPLOADS_THUMB . $row2->thumbUrl;
-				$i++;
-			} else break;
-		}
-		$return['publicNum'] = $public->num_rows;
+		$return['unsorted']['num'] = $unsorted->num_rows;
 
 		# Starred
 		$query		= Database::prepare($this->database, 'SELECT thumbUrl FROM ? WHERE star = 1 ' . $this->settings['sorting'], array(LYCHEE_TABLE_PHOTOS));
@@ -241,11 +244,23 @@ class Album extends Module {
 		$i			= 0;
 		while($row3 = $starred->fetch_object()) {
 			if ($i<3) {
-				$return["starredThumb$i"] = LYCHEE_URL_UPLOADS_THUMB . $row3->thumbUrl;
+				$return['starred']["thumb$i"] = LYCHEE_URL_UPLOADS_THUMB . $row3->thumbUrl;
 				$i++;
 			} else break;
 		}
-		$return['starredNum'] = $starred->num_rows;
+		$return['starred']['num'] = $starred->num_rows;
+
+		# Public
+		$query		= Database::prepare($this->database, 'SELECT thumbUrl FROM ? WHERE public = 1 ' . $this->settings['sorting'], array(LYCHEE_TABLE_PHOTOS));
+		$public		= $this->database->query($query);
+		$i			= 0;
+		while($row2 = $public->fetch_object()) {
+			if ($i<3) {
+				$return['public']["thumb$i"] = LYCHEE_URL_UPLOADS_THUMB . $row2->thumbUrl;
+				$i++;
+			} else break;
+		}
+		$return['public']['num'] = $public->num_rows;
 
 		# Recent
 		$query		= Database::prepare($this->database, 'SELECT thumbUrl FROM ? WHERE LEFT(id, 10) >= unix_timestamp(DATE_SUB(NOW(), INTERVAL 1 DAY)) ' . $this->settings['sorting'], array(LYCHEE_TABLE_PHOTOS));
@@ -253,11 +268,11 @@ class Album extends Module {
 		$i			= 0;
 		while($row3 = $recent->fetch_object()) {
 			if ($i<3) {
-				$return["recentThumb$i"] = LYCHEE_URL_UPLOADS_THUMB . $row3->thumbUrl;
+				$return['recent']["thumb$i"] = LYCHEE_URL_UPLOADS_THUMB . $row3->thumbUrl;
 				$i++;
 			} else break;
 		}
-		$return['recentNum'] = $recent->num_rows;
+		$return['recent']['num'] = $recent->num_rows;
 
 		return $return;
 
diff --git a/src/scripts/album.js b/src/scripts/album.js
index 61c52b9..b75460f 100644
--- a/src/scripts/album.js
+++ b/src/scripts/album.js
@@ -179,7 +179,7 @@ album.delete = function(albumIDs) {
 				albumIDs.forEach(function(id) {
 					albums.json.num--;
 					view.albums.content.delete(id);
-					delete albums.json.content[id];
+					delete albums.json.albums[id];
 				});
 
 			} else {
@@ -209,7 +209,7 @@ album.delete = function(albumIDs) {
 
 		// Get title
 		if (album.json)			albumTitle = album.json.title;
-		else if (albums.json)	albumTitle = albums.json.content[albumIDs].title;
+		else if (albums.json)	albumTitle = albums.json.albums[albumIDs].title;
 
 		msg = "<p>Are you sure you want to delete the album '" + albumTitle + "' and all of the photos it contains? This action can't be undone!</p>";
 
@@ -253,7 +253,7 @@ album.setTitle = function(albumIDs) {
 
 		// Get old title if only one album is selected
 		if (album.json)			oldTitle = album.json.title;
-		else if (albums.json)	oldTitle = albums.json.content[albumIDs].title;
+		else if (albums.json)	oldTitle = albums.json.albums[albumIDs].title;
 
 		if (!oldTitle) oldTitle = '';
 		oldTitle = oldTitle.replace("'", '&apos;');
@@ -280,13 +280,13 @@ album.setTitle = function(albumIDs) {
 
 			if (albums.json) {
 				var id = albumIDs[0];
-				albums.json.content[id].title = newTitle;
+				albums.json.albums[id].title = newTitle;
 			}
 
 		} else if (visible.albums()) {
 
 			albumIDs.forEach(function(id) {
-				albums.json.content[id].title = newTitle;
+				albums.json.albums[id].title = newTitle;
 				view.albums.content.title(id);
 			});
 
diff --git a/src/scripts/albums.js b/src/scripts/albums.js
index 8a447ea..a93f176 100644
--- a/src/scripts/albums.js
+++ b/src/scripts/albums.js
@@ -25,44 +25,44 @@ albums.load = function() {
 		api.post('Album::getAll', {}, function(data) {
 
 			/* Smart Albums */
-			data.unsortedAlbum = {
+			data.smartalbums.unsorted = {
 				id:			0,
 				title:		'Unsorted',
-				sysdate:	data.unsortedNum + ' photos',
+				sysdate:	data.smartalbums.unsorted.num + ' photos',
 				unsorted: 	'1',
-				thumb0:		data.unsortedThumb0,
-				thumb1:		data.unsortedThumb1,
-				thumb2:		data.unsortedThumb2
+				thumb0:		data.smartalbums.unsorted.thumb0,
+				thumb1:		data.smartalbums.unsorted.thumb1,
+				thumb2:		data.smartalbums.unsorted.thumb2
 			};
 
-			data.starredAlbum = {
+			data.smartalbums.starred = {
 				id:			'f',
 				title:		'Starred',
-				sysdate:	data.starredNum + ' photos',
+				sysdate:	data.smartalbums.starred.num + ' photos',
 				star:		'1',
-				thumb0:		data.starredThumb0,
-				thumb1:		data.starredThumb1,
-				thumb2:		data.starredThumb2
+				thumb0:		data.smartalbums.starred.thumb0,
+				thumb1:		data.smartalbums.starred.thumb1,
+				thumb2:		data.smartalbums.starred.thumb2
 			};
 
-			data.publicAlbum = {
+			data.smartalbums.public = {
 				id:			's',
 				title:		'Public',
-				sysdate:	data.publicNum + ' photos',
+				sysdate:	data.smartalbums.public.num + ' photos',
 				public:		'1',
-				thumb0:		data.publicThumb0,
-				thumb1:		data.publicThumb1,
-				thumb2:		data.publicThumb2
+				thumb0:		data.smartalbums.public.thumb0,
+				thumb1:		data.smartalbums.public.thumb1,
+				thumb2:		data.smartalbums.public.thumb2
 			};
 
-			data.recentAlbum = {
+			data.smartalbums.recent = {
 				id:			'r',
 				title:		'Recent',
-				sysdate:	data.recentNum + ' photos',
+				sysdate:	data.smartalbums.recent.num + ' photos',
 				recent:		'1',
-				thumb0:		data.recentThumb0,
-				thumb1:		data.recentThumb1,
-				thumb2:		data.recentThumb2
+				thumb0:		data.smartalbums.recent.thumb0,
+				thumb1:		data.smartalbums.recent.thumb1,
+				thumb2:		data.smartalbums.recent.thumb2
 			};
 
 			albums.json = data;
@@ -79,7 +79,7 @@ albums.load = function() {
 			setTimeout(function() {
 				header.setMode('albums');
 				view.albums.init();
-				lychee.animate('.album, .photo', 'contentZoomIn');
+				lychee.animate('.album', 'contentZoomIn');
 			}, waitTime);
 		});
 
diff --git a/src/scripts/contextMenu.js b/src/scripts/contextMenu.js
index 9659fb9..2a3e70f 100644
--- a/src/scripts/contextMenu.js
+++ b/src/scripts/contextMenu.js
@@ -82,7 +82,7 @@ contextMenu.albumTitle = function(albumID, e) {
 			items.push({ type: 'separator' });
 
 			// Generate list of albums
-			$.each(data.content, function(index) {
+			$.each(data.albums, function(index) {
 
 				var that	= this,
 					title	= '';
@@ -220,7 +220,7 @@ contextMenu.move = function(photoIDs, e) {
 		} else {
 
 			// Generate list of albums
-			$.each(data.content, function(index) {
+			$.each(data.albums, function(index) {
 
 				var that = this;
 
diff --git a/src/scripts/password.js b/src/scripts/password.js
index 10440c6..6267559 100644
--- a/src/scripts/password.js
+++ b/src/scripts/password.js
@@ -16,7 +16,7 @@ password.get = function(albumID, callback) {
 
 	if (!lychee.publicMode)												callback();
 	else if (album.json&&album.json.password==false)					callback();
-	else if (albums.json&&albums.json.content[albumID].password==false)	callback();
+	else if (albums.json&&albums.json.albums[albumID].password==false)	callback();
 	else if (!albums.json&&!album.json) {
 
 		// Continue without password
diff --git a/src/scripts/view.js b/src/scripts/view.js
index 2668b71..8385358 100644
--- a/src/scripts/view.js
+++ b/src/scripts/view.js
@@ -49,16 +49,21 @@ view.albums = {
 				albumsData	= '';
 
 			/* Smart Albums */
-			albums.parse(albums.json.unsortedAlbum);
-			albums.parse(albums.json.publicAlbum);
-			albums.parse(albums.json.starredAlbum);
-			albums.parse(albums.json.recentAlbum);
-			if (!lychee.publicMode) smartData = build.divider('Smart Albums') + build.album(albums.json.unsortedAlbum) + build.album(albums.json.starredAlbum) + build.album(albums.json.publicAlbum) + build.album(albums.json.recentAlbum);
+			if (!lychee.publicMode) {
+
+				albums.parse(albums.json.smartalbums.unsorted);
+				albums.parse(albums.json.smartalbums.public);
+				albums.parse(albums.json.smartalbums.starred);
+				albums.parse(albums.json.smartalbums.recent);
+
+				smartData = build.divider('Smart Albums') + build.album(albums.json.smartalbums.unsorted) + build.album(albums.json.smartalbums.public) + build.album(albums.json.smartalbums.starred) + build.album(albums.json.smartalbums.recent);
+
+			}
 
 			/* Albums */
-			if (albums.json.content&&albums.json.num!==0) {
+			if (albums.json.albums&&albums.json.num!==0) {
 
-				$.each(albums.json.content, function() {
+				$.each(albums.json.albums, function() {
 					albums.parse(this);
 
 					// Display albums in reverse order
@@ -88,7 +93,7 @@ view.albums = {
 		title: function(albumID) {
 
 			var longTitle	= '',
-				title		= albums.json.content[albumID].title;
+				title		= albums.json.albums[albumID].title;
 
 			if (title!==null&&title.length>18) {
 				longTitle	= title;

From b226f879b0027a13bbe9548c9aa4e051f6d6be6e Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Fri, 27 Feb 2015 21:16:22 +0100
Subject: [PATCH 3/5] Streamlines type of password

---
 dist/main.js            | Bin 174199 -> 174382 bytes
 dist/view.js            | Bin 93496 -> 93613 bytes
 php/modules/Album.php   |   4 ++--
 src/scripts/album.js    |  10 +++++-----
 src/scripts/albums.js   |   2 +-
 src/scripts/build.js    |  20 ++++++++++----------
 src/scripts/header.js   |   2 +-
 src/scripts/password.js |   6 +++---
 src/scripts/photo.js    |   2 +-
 src/scripts/view.js     |   9 +++++----
 10 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index 06eb4ff8f62df1e85e1b8aedeacc41d9b87efeb7..f44d49812ebb8888fc76ccc2aee145048a7be943 100644
GIT binary patch
delta 616
zcmex<fot6*u7)j)&zEp387gU7Y2@1~Dd|iXT*fHOVyk4JG~I70qvmwIrHnIKfIQpj
z?>;k%a{yIZ0eKK*tRQ6&31%Q`yTCF=KW0{2TU$kg?Qts^x!Bl%%7NVJ8S5EkIl$uf
z8mZF{Tw@g3K4(2+I;Q|cK2@(EvADQAzbIw;=^cz3+pTsoT5wJF3FNRX%g;<vFaYXI
zEJ`oUP0cGQjy8<7S2VOj=Ii8v91e25bx~?bX;Gd+3CJ$P=@Sn#3Qu2uf{}wUe|rCE
zMyct?4>R5YnX5*exzkr4VeA3>2idGlh*=G%8CkcNA7xa4_!y#MJJ7ZoMpCRWKE>G1
z3Jg4}%;^u0Fp5mSc#5$E!^&c?mD_<<_9{cem-juR1MBp4Ul}E~r+i`bVw}Dm7(LsM
zePxWW0C|~J+`dFZ(<(71sWewFt2jSTO$`)Rz_<X#@AMKqCINP+&~*6;OybjX^qBr^
z&(UY{Q-xSC9T<To+uwySManR8ZFetZddRq4vzTd~Bsf5~pXy<fVFELmN^GYqL@-Hg
UXYOZm;D*IG$d>JqvzX-g0EgAc{{R30

delta 407
zcmZ2?iR=3Xu7)j)&zCS7PJgw8QD%DJQbw)mMoSrIG8#-Tn8_s0Y-nXL{o@iwQ7E6$
zV7tOHMnC51DWOaz+n29oyv8b<s#lO$TwI=Cl%l4VQ<<ER3KS?!%E?Uj%}+_)zH~if
z9Vb6RjjgS%qQUgnI~X;#NAF~`;F?}z#Kb9KtE8lp4<xLMQcFsU@)SxGLCVzBrXP5~
zC^r4WVa8uzb<-t}GIp~g%WXe+l+l@)6)ZIU{%J<(?J6f3OBkoWea6T={p2ae7BNLb
zt4v!ZzkDU@q@vWsZ0qF2;#8muQcp9MqMG#mG~;UJ?aSXYI<QXn{KhCgJwcj@Z9D5%
zMi<8E&%ZEAY)|;c7-1n`pO}+WnyZ&poS&zrW?*YOU2z$s@bu?;OhUlG`K!ky!pLk@
zqOo1TfXQEVJ204fWww7RWO~TR$hG})G1ELrrka}V6}?QdOd!Ubex_({W<#hc+XZGb
H$?*XI7SfE`

diff --git a/dist/view.js b/dist/view.js
index 3b2d68fd6b43bda9379a39112af085dba07f3993..21537be3d8af79bff80a60a2a1bd819576ddbb1c 100644
GIT binary patch
delta 311
zcmdmSi*@a7)`l&N{r>z)hDx@!wyAmriN(d``9;$O{Ta2kANOZ8=bG#j$YEcWpP8ay
z0927!lwO*fnpaXBZ5V5>XlRAZ*U7V0Qqsu;64phjC8b4q3MD`tiiT=x(|!CHB^fiP
zOD8c(O%IM@yaO^+jW|Q6?@wTqnC>6VSi+8M+V;oMj1J7GLeBAwC5$8*-7cYIpk!5K
jtK^rjWSvx$nwV{!oLHO+43FtCiHxPF7JN)(bms;D2F78z

delta 251
zcmZ2`n{~%6)`l&N{r>!^dIgEa#pU@$DYmw@iU!jQ{TRij=lU}WZ9neMXu&nvdlr|W
zl9EoQt&);;QEEwPQJzAHB1om0T25thMk-K$X;MyRvTuG$DpXt}bGl&+qxAIZD8}0$
z{nOi`8M|chYTB+F!|2S+3RW}SJBd+x`-FJL5=O9YlSIZ=F-1eGB3mWDd?o9oqSVA}
g>*U1ZRG@1wCNh>P;x$=KO(PNH9Qo~SNsQ{;0Mg7(SO5S3

diff --git a/php/modules/Album.php b/php/modules/Album.php
index 5c74a84..7ed8d76 100644
--- a/php/modules/Album.php
+++ b/php/modules/Album.php
@@ -83,7 +83,7 @@ class Album extends Module {
 						$albums = $this->database->query($query);
 						$return = $albums->fetch_assoc();
 						$return['sysdate']	= date('d M. Y', $return['sysstamp']);
-						$return['password']	= ($return['password']=='' ? false : true);
+						$return['password']	= ($return['password']=='' ? '0' : '1');
 						$query	= Database::prepare($this->database, "SELECT id, title, tags, public, star, album, thumbUrl, takestamp, url FROM ? WHERE album = '?' " . $this->settings['sorting'], array(LYCHEE_TABLE_PHOTOS, $this->albumIDs));
 						break;
 
@@ -180,7 +180,7 @@ class Album extends Module {
 
 			# Parse info
 			$album['sysdate']	= date('F Y', $album['sysstamp']);
-			$album['password']	= ($album['password'] != '');
+			$album['password']	= ($album['password']=='' ? '0' : '1');
 
 			# Thumbs
 			if (($public===true&&$album['password']===false)||($public===false)) {
diff --git a/src/scripts/album.js b/src/scripts/album.js
index b75460f..cd604bc 100644
--- a/src/scripts/album.js
+++ b/src/scripts/album.js
@@ -456,10 +456,10 @@ album.setPublic = function(albumID, e) {
 
 		if ($('.basicModal .choice input[name="password"]:checked').length===1) {
 			password			= $('.basicModal .choice input[data-name="password"]').val();
-			album.json.password	= 1;
+			album.json.password	= '1';
 		} else {
 			password			= '';
-			album.json.password	= 0;
+			album.json.password	= '0';
 		}
 
 		if ($('.basicModal .choice input[name="listed"]:checked').length===1)		listed = true;
@@ -469,8 +469,8 @@ album.setPublic = function(albumID, e) {
 
 	if (visible.album()) {
 
-		album.json.public	= (album.json.public==0) ? 1 : 0;
-		album.json.password	= (album.json.public==0) ? 0 : album.json.password;
+		album.json.public	= (album.json.public==='0') ? '1' : '0';
+		album.json.password	= (album.json.public==='0') ? '0' : album.json.password;
 
 		view.album.public();
 		view.album.password();
@@ -526,7 +526,7 @@ album.getArchive = function(albumID) {
 	if (location.href.indexOf('index.html')>0)	link = location.href.replace(location.hash, '').replace('index.html', url);
 	else										link = location.href.replace(location.hash, '') + url;
 
-	if (lychee.publicMode) link += '&password=' + password.value;
+	if (lychee.publicMode===true) link += '&password=' + password.value;
 
 	location.href = link;
 
diff --git a/src/scripts/albums.js b/src/scripts/albums.js
index a93f176..b0a0289 100644
--- a/src/scripts/albums.js
+++ b/src/scripts/albums.js
@@ -96,7 +96,7 @@ albums.load = function() {
 
 albums.parse = function(album) {
 
-	if (album.password&&lychee.publicMode) {
+	if (album.password==='1'&&lychee.publicMode===true) {
 		album.thumb0 = 'src/images/password.svg';
 		album.thumb1 = 'src/images/password.svg';
 		album.thumb2 = 'src/images/password.svg';
diff --git a/src/scripts/build.js b/src/scripts/build.js
index 9fcd1c3..15fd865 100644
--- a/src/scripts/build.js
+++ b/src/scripts/build.js
@@ -92,7 +92,7 @@ build.album = function(data) {
 		if (data.public==='1')		html += `<a class='badge icn-share'>${ build.iconic('eye') }</a>`;
 		if (data.unsorted==='1')	html += `<a class='badge'>${ build.iconic('list') }</a>`;
 		if (data.recent==='1')		html += `<a class='badge'>${ build.iconic('clock') }</a>`;
-		if (data.password===true)	html += `<a class='badge'>${ build.iconic('lock-locked') }</a>`;
+		if (data.password==='1')	html += `<a class='badge'>${ build.iconic('lock-locked') }</a>`;
 
 	}
 
@@ -244,12 +244,12 @@ build.uploadModal = function(title, files) {
 
 }
 
-build.tags = function(tags, forView) {
+build.tags = function(tags, forView = false) {
 
 	var html			= '',
 		editTagsHTML	= '';
 
-	if (forView!==true&&lychee.publicMode!==true) editTagsHTML = ' ' + build.editIcon('edit_tags');
+	if (forView===false&&lychee.publicMode===false) editTagsHTML = ' ' + build.editIcon('edit_tags');
 
 	if (tags!=='') {
 
@@ -271,7 +271,7 @@ build.tags = function(tags, forView) {
 
 }
 
-build.infoboxPhoto = function(data, forView) {
+build.infoboxPhoto = function(data, forView = false) {
 
 	var html				= '',
 		visible				= '',
@@ -293,7 +293,7 @@ build.infoboxPhoto = function(data, forView) {
 
 	}
 
-	if (forView!==true&&lychee.publicMode!==true) {
+	if (forView===false&&lychee.publicMode===false) {
 		editTitleHTML		= ' ' + build.editIcon('edit_title');
 		editDescriptionHTML	= ' ' + build.editIcon('edit_description');
 	}
@@ -355,7 +355,7 @@ build.infoboxPhoto = function(data, forView) {
 			case 'Tags':
 
 				// Tags
-				if (forView!==true&&lychee.publicMode===false) {
+				if (forView===false&&lychee.publicMode===false) {
 
 					html +=	`
 							</table>
@@ -395,7 +395,7 @@ build.infoboxPhoto = function(data, forView) {
 
 }
 
-build.infoboxAlbum = function(data, forView) {
+build.infoboxAlbum = function(data, forView = false) {
 
 	var html				= '',
 		visible				= '',
@@ -418,9 +418,9 @@ build.infoboxAlbum = function(data, forView) {
 
 	switch (data.password) {
 
-		case false:	password = 'No';
+		case '0':	password = 'No';
 					break;
-		case true:	password = 'Yes';
+		case '1':	password = 'Yes';
 					break;
 		default:	password = '-';
 					break;
@@ -438,7 +438,7 @@ build.infoboxAlbum = function(data, forView) {
 
 	}
 
-	if (forView!==true&&lychee.publicMode!==true) {
+	if (forView===false&&lychee.publicMode===false) {
 		editTitleHTML		= ' ' + build.editIcon('edit_title_album');
 		editDescriptionHTML	= ' ' + build.editIcon('edit_description_album');
 	}
diff --git a/src/scripts/header.js b/src/scripts/header.js
index 9d4aa90..e03da05 100644
--- a/src/scripts/header.js
+++ b/src/scripts/header.js
@@ -91,7 +91,7 @@ header.setMode = function(mode) {
 			album.json.content === false ? $('#button_archive').hide() : $('#button_archive').show();
 
 			// Hide download button when not logged in and album not downloadable
-			if (lychee.publicMode&&album.json.downloadable==='0') $('#button_archive').hide();
+			if (lychee.publicMode===true&&album.json.downloadable==='0') $('#button_archive').hide();
 
 			if (albumID==='s'||albumID==='f'||albumID==='r') {
 				$('#button_info_album, #button_trash_album, #button_share_album').hide();
diff --git a/src/scripts/password.js b/src/scripts/password.js
index 6267559..247c39f 100644
--- a/src/scripts/password.js
+++ b/src/scripts/password.js
@@ -14,9 +14,9 @@ password.get = function(albumID, callback) {
 	var passwd = $('.basicModal input.text').val(),
 		params;
 
-	if (!lychee.publicMode)												callback();
-	else if (album.json&&album.json.password==false)					callback();
-	else if (albums.json&&albums.json.albums[albumID].password==false)	callback();
+	if (lychee.publicMode===false)										callback();
+	else if (album.json&&album.json.password==='0')						callback();
+	else if (albums.json&&albums.json.albums[albumID].password==='0')	callback();
 	else if (!albums.json&&!album.json) {
 
 		// Continue without password
diff --git a/src/scripts/photo.js b/src/scripts/photo.js
index df69c58..bb9d21a 100644
--- a/src/scripts/photo.js
+++ b/src/scripts/photo.js
@@ -698,7 +698,7 @@ photo.getArchive = function(photoID) {
 	if (location.href.indexOf('index.html')>0)	link = location.href.replace(location.hash, '').replace('index.html', url);
 	else										link = location.href.replace(location.hash, '') + url;
 
-	if (lychee.publicMode) link += '&password=' + password.value;
+	if (lychee.publicMode===true) link += '&password=' + password.value;
 
 	location.href = link;
 
diff --git a/src/scripts/view.js b/src/scripts/view.js
index 8385358..1b7280e 100644
--- a/src/scripts/view.js
+++ b/src/scripts/view.js
@@ -49,7 +49,7 @@ view.albums = {
 				albumsData	= '';
 
 			/* Smart Albums */
-			if (!lychee.publicMode) {
+			if (lychee.publicMode===false) {
 
 				albums.parse(albums.json.smartalbums.unsorted);
 				albums.parse(albums.json.smartalbums.public);
@@ -70,7 +70,8 @@ view.albums = {
 					albumsData = build.album(this) + albumsData;
 				});
 
-				if (!lychee.publicMode) albumsData = build.divider('Albums') + albumsData;
+				// Add divider
+				if (lychee.publicMode===false) albumsData = build.divider('Albums') + albumsData;
 
 			}
 
@@ -275,8 +276,8 @@ view.album = {
 
 	password: function() {
 
-		if (album.json.password==1)	$('#infobox .attr_password').html('Yes');
-		else						$('#infobox .attr_password').html('No');
+		if (album.json.password==='1')	$('#infobox .attr_password').html('Yes');
+		else							$('#infobox .attr_password').html('No');
 
 	},
 

From 138bf714c5d938bb7aa4266ac70f3aa75659827b Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Fri, 27 Feb 2015 22:14:19 +0100
Subject: [PATCH 4/5] Streamlined type of star and public

---
 dist/main.js          | Bin 174382 -> 174298 bytes
 src/scripts/album.js  |   4 +-
 src/scripts/albums.js |  84 ++++++++++++++++++++++--------------------
 src/scripts/photo.js  |  10 ++---
 src/scripts/view.js   |   8 ++--
 5 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index f44d49812ebb8888fc76ccc2aee145048a7be943..922236e310c5a11b59c4a7eb87e124364af9091f 100644
GIT binary patch
delta 661
zcmZ2?iR;!yu7)j)=JQyT43uoA7tCZ5o4((biEVqxJVrha79~Td;P%R8jNB~KAD(8E
z&`8WlD$Om{i%%{}O)N<b&P^;TaRdu#<m(lKcn}4e+pnx;yw0S6sm?a7G%vX%Ge1uw
zRkJ#E`ovX?nvAK_kFR3XVN9L2no&YGRj)L!IKQYQHASx^qck_kPzOvIS)of9)#{{9
z&s+`GKYul&x^t>taY<rP5lo{2M57^4BZ@eZfhgi&^DNgeY60C-u!d1rIyG9Upfo8b
zGg&DX;uM65(=V)HloZ8K05(EwEu%Wn2(Pt_8bGRkEu)xvs$NlQa%x@)hL4bijcT_q
z+Q8`QGTrkVqxkd$X<$UKer0rFoc{a^qr~=vZ;ZlzvY?2vwJpfVFUi--D$dUX`^+8~
zQ&vEk>76c2u1rb>(-RjniBF#}jftHDF165_Nq9R@)|3ev*$bG&5VHJpm?WU_4HTaa
zjBnxTQ{0(!rk`HQC@?*LF%#$XsOd~R2n|5vM7RHTXZohO{Zk>+Lq<lf?U#$0mMbwS
p8NzMf0^@84>J<gr3rtVjfr;!t8{8_OrADAc2DEhh`~^(?9026F-;@9V

delta 742
zcmcb0k!#&0u7)j)=JOa0wp-6*)Z$<?+@86NQIUl=U#~bfv8W_5C#f{Ic>2M$jGAad
zuh%l_7@?@rE6pp;FDgk*(JRR)%}p}U0aJ!nD2k>Vu49zYK@mdJXH<(SJw0|EhUM++
z7}e3-vwj_;xIe17#U+VFMKI?WLY!lS>Kr{3H5gWZT*s(|W{=EzM%`Q#d!m&JN|SOj
zla*rec^q98cK4vG0=a1V#6BkB=`+_eDlkIX2iG$yLfHc7c7jzyMG<y@ML8g9jcT`_
zTE%#sX}jhIMjMyu$G$R3Our|^#J0WZ3!@9;^z)w?#kb%4$|&q7W?*Yukda@Kua{Mv
zp9c;qdqXRO>3l9suFOEW=?g8H#HQ!FFtIWNg|}C`FnKUB8cb(&XA+YIDby*;OfA;~
zn}G0_hNg}oNJ%Kn1kvgLr!jG{fK8USW)j^#!=34yCL`DOzCxyljN1!}nU*Ut8^UZe
sp2oBh#uMER)G5paOtWG$nf|jeg3T41p8J_mYP#-BCc*8o3z%v-08@<!%>V!Z

diff --git a/src/scripts/album.js b/src/scripts/album.js
index cd604bc..00ced60 100644
--- a/src/scripts/album.js
+++ b/src/scripts/album.js
@@ -384,7 +384,7 @@ album.setPublic = function(albumID, e) {
 
 	albums.refresh();
 
-	if (!basicModal.visible()&&album.json.public==0) {
+	if (!basicModal.visible()&&album.json.public==='0') {
 
 		var msg = '',
 			action;
@@ -475,7 +475,7 @@ album.setPublic = function(albumID, e) {
 		view.album.public();
 		view.album.password();
 
-		if (album.json.public==1) contextMenu.shareAlbum(albumID, e);
+		if (album.json.public==='1') contextMenu.shareAlbum(albumID, e);
 
 	}
 
diff --git a/src/scripts/albums.js b/src/scripts/albums.js
index b0a0289..72dbb81 100644
--- a/src/scripts/albums.js
+++ b/src/scripts/albums.js
@@ -25,45 +25,7 @@ albums.load = function() {
 		api.post('Album::getAll', {}, function(data) {
 
 			/* Smart Albums */
-			data.smartalbums.unsorted = {
-				id:			0,
-				title:		'Unsorted',
-				sysdate:	data.smartalbums.unsorted.num + ' photos',
-				unsorted: 	'1',
-				thumb0:		data.smartalbums.unsorted.thumb0,
-				thumb1:		data.smartalbums.unsorted.thumb1,
-				thumb2:		data.smartalbums.unsorted.thumb2
-			};
-
-			data.smartalbums.starred = {
-				id:			'f',
-				title:		'Starred',
-				sysdate:	data.smartalbums.starred.num + ' photos',
-				star:		'1',
-				thumb0:		data.smartalbums.starred.thumb0,
-				thumb1:		data.smartalbums.starred.thumb1,
-				thumb2:		data.smartalbums.starred.thumb2
-			};
-
-			data.smartalbums.public = {
-				id:			's',
-				title:		'Public',
-				sysdate:	data.smartalbums.public.num + ' photos',
-				public:		'1',
-				thumb0:		data.smartalbums.public.thumb0,
-				thumb1:		data.smartalbums.public.thumb1,
-				thumb2:		data.smartalbums.public.thumb2
-			};
-
-			data.smartalbums.recent = {
-				id:			'r',
-				title:		'Recent',
-				sysdate:	data.smartalbums.recent.num + ' photos',
-				recent:		'1',
-				thumb0:		data.smartalbums.recent.thumb0,
-				thumb1:		data.smartalbums.recent.thumb1,
-				thumb2:		data.smartalbums.recent.thumb2
-			};
+			if (lychee.publicMode===false) albums._createSmartAlbums(data.smartalbums);
 
 			albums.json = data;
 
@@ -108,6 +70,50 @@ albums.parse = function(album) {
 
 }
 
+albums._createSmartAlbums = function(data) {
+
+	data.unsorted = {
+		id:			0,
+		title:		'Unsorted',
+		sysdate:	data.unsorted.num + ' photos',
+		unsorted: 	'1',
+		thumb0:		data.unsorted.thumb0,
+		thumb1:		data.unsorted.thumb1,
+		thumb2:		data.unsorted.thumb2
+	};
+
+	data.starred = {
+		id:			'f',
+		title:		'Starred',
+		sysdate:	data.starred.num + ' photos',
+		star:		'1',
+		thumb0:		data.starred.thumb0,
+		thumb1:		data.starred.thumb1,
+		thumb2:		data.starred.thumb2
+	};
+
+	data.public = {
+		id:			's',
+		title:		'Public',
+		sysdate:	data.public.num + ' photos',
+		public:		'1',
+		thumb0:		data.public.thumb0,
+		thumb1:		data.public.thumb1,
+		thumb2:		data.public.thumb2
+	};
+
+	data.recent = {
+		id:			'r',
+		title:		'Recent',
+		sysdate:	data.recent.num + ' photos',
+		recent:		'1',
+		thumb0:		data.recent.thumb0,
+		thumb1:		data.recent.thumb1,
+		thumb2:		data.recent.thumb2
+	};
+
+}
+
 albums.refresh = function() {
 
 	albums.json = null;
diff --git a/src/scripts/photo.js b/src/scripts/photo.js
index bb9d21a..9755c44 100644
--- a/src/scripts/photo.js
+++ b/src/scripts/photo.js
@@ -393,12 +393,12 @@ photo.setStar = function(photoIDs) {
 
 	if (!photoIDs) return false;
 	if (visible.photo()) {
-		photo.json.star = (photo.json.star==0) ? 1 : 0;
+		photo.json.star = (photo.json.star==='0') ? '1' : '0';
 		view.photo.star();
 	}
 
 	photoIDs.forEach(function(id, index, array) {
-		album.json.content[id].star = (album.json.content[id].star==0) ? 1 : 0;
+		album.json.content[id].star = (album.json.content[id].star==='0') ? '1' : '0';
 		view.album.content.star(id);
 	});
 
@@ -449,13 +449,13 @@ photo.setPublic = function(photoID, e) {
 
 	if (visible.photo()) {
 
-		photo.json.public = (photo.json.public==0) ? 1 : 0;
+		photo.json.public = (photo.json.public==='0') ? '1' : '0';
 		view.photo.public();
-		if (photo.json.public==1) contextMenu.sharePhoto(photoID, e);
+		if (photo.json.public==='1') contextMenu.sharePhoto(photoID, e);
 
 	}
 
-	album.json.content[photoID].public = (album.json.content[photoID].public==0) ? 1 : 0;
+	album.json.content[photoID].public = (album.json.content[photoID].public==='0') ? '1' : '0';
 	view.album.content.public(photoID);
 
 	albums.refresh();
diff --git a/src/scripts/view.js b/src/scripts/view.js
index 1b7280e..745087a 100644
--- a/src/scripts/view.js
+++ b/src/scripts/view.js
@@ -209,14 +209,14 @@ view.album = {
 		star: function(photoID) {
 
 			$('.photo[data-id="' + photoID + '"] .iconic-star').remove();
-			if (album.json.content[photoID].star==1) $('.photo[data-id="' + photoID + '"]').append("<a class='badge iconic-star'>" + build.iconic('star') + "</a>");
+			if (album.json.content[photoID].star==='1') $('.photo[data-id="' + photoID + '"]').append("<a class='badge iconic-star'>" + build.iconic('star') + "</a>");
 
 		},
 
 		public: function(photoID) {
 
 			$('.photo[data-id="' + photoID + '"] .iconic-share').remove();
-			if (album.json.content[photoID].public==1) $('.photo[data-id="' + photoID + '"]').append("<a class='badge iconic-share'>" + build.iconic('eye') + "</a>");
+			if (album.json.content[photoID].public==='1') $('.photo[data-id="' + photoID + '"]').append("<a class='badge iconic-share'>" + build.iconic('eye') + "</a>");
 
 		},
 
@@ -253,7 +253,7 @@ view.album = {
 
 	public: function() {
 
-		if (album.json.public==1) {
+		if (album.json.public==='1') {
 
 			$('#button_share_album')
 				.addClass('active')
@@ -378,7 +378,7 @@ view.photo = {
 
 	public: function() {
 
-		if (photo.json.public==1||photo.json.public==2) {
+		if (photo.json.public==='1'||photo.json.public==='2') {
 			// Photo public
 			$('#button_share')
 				.addClass('active')

From 1490dcbe9e34b2a12154371498b48de3efc80dee Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Fri, 27 Feb 2015 22:39:07 +0100
Subject: [PATCH 5/5] Removed md5 from search, renamed code var to hash

---
 php/modules/misc.php   | 10 ++++++++++
 src/bower.json         |  1 -
 src/gulpfile.js        |  1 -
 src/scripts/lychee.js  |  4 ++--
 src/scripts/search.js  | 32 ++++++++++++++++----------------
 src/scripts/visible.js |  2 +-
 6 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/php/modules/misc.php b/php/modules/misc.php
index c449e4a..2094790 100755
--- a/php/modules/misc.php
+++ b/php/modules/misc.php
@@ -13,6 +13,13 @@ function search($database, $settings, $term) {
 
 	$return['albums'] = '';
 
+	# Initialize return var
+	$return = array(
+		'photos'	=> null,
+		'albums'	=> null,
+		'hash'		=> ''
+	);
+
 	# Photos
 	$query	= Database::prepare($database, "SELECT id, title, tags, public, star, album, thumbUrl FROM ? WHERE title LIKE '%?%' OR description LIKE '%?%' OR tags LIKE '%?%'", array(LYCHEE_TABLE_PHOTOS, $term, $term, $term));
 	$result	= $database->query($query);
@@ -48,6 +55,9 @@ function search($database, $settings, $term) {
 
 	}
 
+	# Hash
+	$return['hash'] = md5(json_encode($return));
+
 	return $return;
 
 }
diff --git a/src/bower.json b/src/bower.json
index 13a28eb..892d78a 100644
--- a/src/bower.json
+++ b/src/bower.json
@@ -3,7 +3,6 @@
   "private": true,
   "dependencies": {
     "jQuery": "~2.1.3",
-    "js-md5": "~1.1.0",
     "mousetrap": "~1.4.6",
     "basicContext": "~2.0.2",
     "basicModal": "~2.0.3"
diff --git a/src/gulpfile.js b/src/gulpfile.js
index fbec696..08ba53a 100644
--- a/src/gulpfile.js
+++ b/src/gulpfile.js
@@ -59,7 +59,6 @@ paths.main = {
 	],
 	scripts: [
 		'bower_components/jQuery/dist/jquery.min.js',
-		'bower_components/js-md5/js/md5.min.js',
 		'bower_components/mousetrap/mousetrap.min.js',
 		'bower_components/mousetrap/plugins/global-bind/mousetrap-global-bind.min.js',
 		'bower_components/basicContext/dist/basicContext.min.js',
diff --git a/src/scripts/lychee.js b/src/scripts/lychee.js
index af2d130..6cda479 100644
--- a/src/scripts/lychee.js
+++ b/src/scripts/lychee.js
@@ -201,9 +201,9 @@ lychee.load = function() {
 	} else {
 
 		// Trash albums.json when filled with search results
-		if (search.code!=='') {
+		if (search.hash!==null) {
 			albums.json = null;
-			search.code = '';
+			search.hash = null;
 		}
 
 		// Trash data
diff --git a/src/scripts/search.js b/src/scripts/search.js
index 987d569..10c181c 100755
--- a/src/scripts/search.js
+++ b/src/scripts/search.js
@@ -5,15 +5,15 @@
 
 search = {
 
-	code: null
+	hash: null
 
 }
 
 search.find = function(term) {
 
-	var albumsData = '',
-		photosData = '',
-		code;
+	var albumsData	= '',
+		photosData	= '',
+		html		= '';
 
 	clearTimeout($(window).data('timeout'));
 	$(window).data('timeout', setTimeout(function() {
@@ -24,8 +24,8 @@ search.find = function(term) {
 
 				// Build albums
 				if (data&&data.albums) {
-					albums.json = { content: data.albums };
-					$.each(albums.json.content, function() {
+					albums.json = { albums: data.albums };
+					$.each(albums.json.albums, function() {
 						albums.parse(this);
 						albumsData += build.album(this);
 					});
@@ -43,28 +43,28 @@ search.find = function(term) {
 				// 2. Only photos found
 				// 3. Only albums found
 				// 4. Albums and photos found
-				if (albumsData===''&&photosData==='')	code = 'error';
-				else if (albumsData==='')				code = build.divider('Photos') + photosData;
-				else if (photosData==='')				code = build.divider('Albums') + albumsData;
-				else									code = build.divider('Photos') + photosData + build.divider('Albums') + albumsData;
+				if (albumsData===''&&photosData==='')	html = 'error';
+				else if (albumsData==='')				html = build.divider('Photos') + photosData;
+				else if (photosData==='')				html = build.divider('Albums') + albumsData;
+				else									html = build.divider('Photos') + photosData + build.divider('Albums') + albumsData;
 
 				// Only refresh view when search results are different
-				if (search.code!==md5(code)) {
+				if (search.hash!==data.hash) {
 
 					$('.no_content').remove();
 
 					lychee.animate('.album, .photo', 'contentZoomOut');
 					lychee.animate('.divider', 'fadeOut');
 
-					search.code = md5(code);
+					search.hash = data.hash;
 
 					setTimeout(function() {
 
-						if (code==='error') {
+						if (html==='error') {
 							lychee.content.html('');
 							$('body').append(build.no_content('magnifying-glass'));
 						} else {
-							lychee.content.html(code);
+							lychee.content.html(html);
 							lychee.animate('.album, .photo', 'contentZoomIn');
 							$('img[data-type!="svg"]').retina();
 						}
@@ -86,13 +86,13 @@ search.reset = function() {
 	$('#search').val('');
 	$('.no_content').remove();
 
-	if (search.code!=='') {
+	if (search.hash!==null) {
 
 		// Trash data
 		albums.json	= null;
 		album.json	= null;
 		photo.json	= null;
-		search.code	= '';
+		search.hash	= null;
 
 		lychee.animate('.divider', 'fadeOut');
 		albums.load();
diff --git a/src/scripts/visible.js b/src/scripts/visible.js
index 15ad6d3..58a40ca 100755
--- a/src/scripts/visible.js
+++ b/src/scripts/visible.js
@@ -21,7 +21,7 @@ visible.photo = function() {
 }
 
 visible.search = function() {
-	if (search.code!==null&&search.code!=='') return true;
+	if (search.hash!==null) return true;
 	return false;
 }