V3.2.11 candidate

.gitignore

@@ -7,6 +7,7 @@ uploads/small/*
 uploads/thumb/*
 
 dist/user.css
+dist/frame.js
 
 !uploads/big/index.html
 !uploads/import/index.html

php/Access/Admin.php

@@ -58,6 +58,7 @@ public static function init($fn) {
 
 			// Settings functions
 			case 'Settings::setImageOverlay':     self::setImageOverlay(); break;
+			case 'Settings::setOverlayType':	  self::setOverlayType(); break;
 			case 'Settings::setLayout':     self::setLayoutAction(); break;
 			case 'Settings::setLang':      	self::setLangAction(); break;
 			case 'Settings::setDefaultLicense':	  self::setDefaultLicenseAction(); break;
@@ -355,6 +356,13 @@ private static function setImageOverlay() {
 		Response::json(Settings::setImageOverlay($_POST['image_overlay']));
 	}
 
+	private static function setOverlayType() {
+
+		Validator::required(isset($_POST['image_overlay_type']), __METHOD__);
+
+		Response::json(Settings::setOverlayType($_POST['image_overlay_type']));
+	}
+
 	private static function setSortingAction() {
 
 		Validator::required(isset($_POST['typeAlbums'], $_POST['orderAlbums'], $_POST['typePhotos'], $_POST['orderPhotos']), __METHOD__);

php/Locale/English.php

@@ -32,6 +32,7 @@ static public function get_locale()
 			'UPDATE_AVAILABLE'	=> 'Update available!',
 			'DEFAULT_LICENSE'	=> 'Default license for new uploads:',
 			'SET_LICENSE'		=> 'Set License',
+			'SET_OVERLAY_TYPE'	=> 'Set Overlay',
 
 			'SMART_ALBUMS'		=> 'Smart albums',
 			'SHARED_ALBUMS'		=> 'Shared albums',
@@ -277,7 +278,12 @@ static public function get_locale()
 			'LANG_TITLE'				=> 'Change Language',
 
 			'LAYOUT_TEXT'				=> 'Use justified layout:',
-			'IMAGE_OVERLAY_TEXT'		=> 'Display EXIF data overlay by default:',
+			'IMAGE_OVERLAY_TEXT'		=> 'Display data overlay by default:',
+
+			'LAYOUT_TYPE'				=> 'Data to use in image overlay:',
+			'OVERLAY_EXIF'				=> 'Photo EXIF data',
+			'OVERLAY_DESCRIPTION'		=> 'Photo description',
+			'OVERLAY_DATE'				=> 'Photo date taken',
 
 			'VIEW_NO_RESULT'			=> 'No results',
 			'VIEW_NO_PUBLIC_ALBUMS'		=> 'No public albums',

php/Modules/Import.php

@@ -98,6 +98,13 @@ public function url($urls, $albumID = 0) {
 	 */
 	public function server($path, $albumID = 0) {
 
+		// Fixes #177
+		$php_script_limit = Settings::get()['php_script_limit'];
+		if ($php_script_limit == 1) {
+			set_time_limit(0);
+			Log::notice(Database::get(), __METHOD__, __LINE__, 'Importing using unlimited execution time');
+		}
+
 		// Parse path
 		if (!isset($path))           $path = LYCHEE_UPLOADS_IMPORT;
 		if (substr($path, -1)==='/') $path = substr($path, 0, -1);

php/Modules/Photo.php

@@ -886,7 +886,7 @@ public static function prepareData(array $data) {
 			// Use takestamp
 			$photo['cameraDate'] = '1';
 			$photo['sysdate']    = strftime('%d %B %Y', substr($data['id'], 0, -4));
-			$photo['takedate']    = strftime('%d %B %Y', $data['takestamp']);
+			$photo['takedate']    = strftime('%d %B %Y - %k:%M', $data['takestamp']);
 
 		} else {
 

php/Modules/Session.php

@@ -53,6 +53,7 @@ public function init($public = true) {
 			unset($return['config']['location']);
 			unset($return['config']['imagick']);
 			unset($return['config']['plugins']);
+			unset($return['config']['php_script_limit']);
 
 		}
 

php/Modules/Settings.php

@@ -207,6 +207,26 @@ public static function setImageOverlay($imageOverlay) {
 		return true;
 	}
 
+	public static function setOverlayType($imageOverlayType) {
+		$overlays = [ 'exif', 'desc', 'takedate' ];
+
+		$found = false;
+		$i = 0;
+
+		while(!$found && $i < count($overlays)) {
+			if ($overlays[$i] === $imageOverlayType) $found = true;
+			$i++;
+		}
+
+		if(!$found) {
+			Log::error(Database::get(), __METHOD__, __LINE__, 'Cound not find the submitted overlay type');
+			Response::error(Database::get(), __METHOD__, __LINE__, 'Cound not find the submitted overlay type');
+		}
+		else {
+			if (self::set('image_overlay_type', $imageOverlayType, true)===false) return false;
+			return true;
+		}
+	}
 
 	/**
 	 * Sets a new sorting for the photos.

php/database/update_030211.php

@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Update to version 3.2.11
+ */
+
+use Lychee\Modules\Database;
+use Lychee\Modules\Response;
+
+// Add image_overlay_type to settings
+$query  = Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'image_overlay_type' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$result = Database::execute($connection, $query, 'update_030211', __LINE__);
+
+if ($result===false) Response::error('Could not get current image_overlay_type from database!');
+
+if ($result->num_rows===0) {
+
+	$query  = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('image_overlay_type', 'exif')", array(LYCHEE_TABLE_SETTINGS));
+	$result = Database::execute($connection, $query, 'update_030211', __LINE__);
+
+	if ($result===false) Response::error('Could not add image_overlay_type to database!');
+
+}
+
+// Add php_script_limit to settings
+$query  = Database::prepare($connection, "SELECT `key` FROM `?` WHERE `key` = 'php_script_limit' LIMIT 1", array(LYCHEE_TABLE_SETTINGS));
+$result = Database::execute($connection, $query, 'update_030211', __LINE__);
+
+if ($result===false) Response::error('Could not get current php_script_limit from database!');
+
+if ($result->num_rows===0) {
+
+   $query  = Database::prepare($connection, "INSERT INTO `?` (`key`, `value`) VALUES ('php_script_limit', '0')", array(LYCHEE_TABLE_SETTINGS));
+   $result = Database::execute($connection, $query, 'update_030211', __LINE__);
+
+   if ($result===false) Response::error('Could not add php_script_limit to database!');
+}
+
+
+// Set version
+if (Database::setVersion($connection, 'update_030211')===false) Response::error('Could not update version of database!');

version.md

@@ -1 +1 @@
-3.2.10
+3.2.11