Merge pull request #4 from electerious/develop

Develop

php/Modules/Import.php

@@ -65,13 +65,12 @@ final class Import {
 				continue;
 			}
 
-			$pathinfo = pathinfo($url);
+			$filename = pathinfo($url, PATHINFO_FILENAME) . $extension;
-			$filename = $pathinfo['filename'] . '.' . $pathinfo['extension'];
 			$tmp_name = LYCHEE_DATA . $filename;
 
 			if (@copy($url, $tmp_name)===false) {
 				$error = true;
-				Log::error(Database::get(), __METHOD__, __LINE__, 'Could not copy file (' . $tmp_name . ') to temp-folder (' . $tmp_name . ')');
+				Log::error(Database::get(), __METHOD__, __LINE__, 'Could not copy file (' . $url . ') to temp-folder (' . $tmp_name . ')');
 				continue;
 			}
 

php/Modules/Session.php

@@ -70,14 +70,15 @@ final class Session {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 0, func_get_args());
 
-		$username = crypt($username, Settings::get()['username']);
+		$username_crypt = crypt($username, Settings::get()['username']);
-		$password = crypt($password, Settings::get()['password']);
+		$password_crypt = crypt($password, Settings::get()['password']);
 
 		// Check login with crypted hash
-		if (Settings::get()['username']===$username&&
+		if (Settings::get()['username']===$username_crypt&&
-			Settings::get()['password']===$password) {
+			Settings::get()['password']===$password_crypt) {
 				$_SESSION['login']      = true;
 				$_SESSION['identifier'] = Settings::get()['identifier'];
+				Log::notice(Database::get(), __METHOD__, __LINE__, 'User (' . $username . ') has logged in from ' . $_SERVER['REMOTE_ADDR']);
 				return true;
 		}
 
@@ -87,6 +88,9 @@ final class Session {
 		// Call plugins
 		Plugins::get()->activate(__METHOD__, 1, func_get_args());
 
+		// Log failed log in
+		Log::error(Database::get(), __METHOD__, __LINE__, 'User (' . $username . ') has tried to log in from ' . $_SERVER['REMOTE_ADDR']);
+
 		return false;
 
 	}

php/helpers/getExtension.php

@@ -14,7 +14,6 @@ function getExtension($filename, $isURI = false) {
 	// Special cases
 	// https://github.com/electerious/Lychee/issues/482
 	list($extension) = explode(':', $extension, 2);
-	list($extension) = explode('?', $extension, 2);
 
 	if (empty($extension)===false) $extension = '.' . $extension;