From dca8b5555d577869c455110e10602367cbc1daf5 Mon Sep 17 00:00:00 2001 From: Matthias Gutjahr Date: Mon, 7 Dec 2015 22:44:42 +0100 Subject: [PATCH 1/8] Set undefined vars, remove unused vars nad code that cannot be reached. --- php/access/Guest.php | 4 ++-- php/modules/Album.php | 2 +- php/modules/Database.php | 1 + php/modules/Import.php | 1 - php/modules/Photo.php | 7 +------ php/modules/Plugins.php | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/php/access/Guest.php b/php/access/Guest.php index cbb06ae..611d310 100644 --- a/php/access/Guest.php +++ b/php/access/Guest.php @@ -33,7 +33,7 @@ class Guest extends Access { # Error default: exit('Error: Function not found! Please check the spelling of the called function.'); - return false; break; + break; } @@ -177,4 +177,4 @@ class Guest extends Access { } -?> \ No newline at end of file +?> diff --git a/php/modules/Album.php b/php/modules/Album.php index a04dcac..708dab1 100644 --- a/php/modules/Album.php +++ b/php/modules/Album.php @@ -195,7 +195,7 @@ class Album extends Module { # Execute query $albums = $this->database->query($query); if (!$albums) { - Log::error($database, __METHOD__, __LINE__, 'Could not get all albums (' . $database->error . ')'); + Log::error($this->database, __METHOD__, __LINE__, 'Could not get all albums (' . $this->database->error . ')'); exit('Error: ' . $this->database->error); } diff --git a/php/modules/Database.php b/php/modules/Database.php index 280de73..d7764e4 100755 --- a/php/modules/Database.php +++ b/php/modules/Database.php @@ -277,6 +277,7 @@ if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!'); # This avoids problems with placeholders in user-input # $skip = Number of placeholders which need to be skipped $skip = 0; + $temp = ''; $num = array( 'placeholder' => substr_count($query, '?'), 'data' => count($data) diff --git a/php/modules/Import.php b/php/modules/Import.php index 1872bbe..621c562 100644 --- a/php/modules/Import.php +++ b/php/modules/Import.php @@ -11,7 +11,6 @@ class Import extends Module { private $database = null; private $settings = null; - private $albumIDs = null; public function __construct($database, $plugins, $settings) { diff --git a/php/modules/Photo.php b/php/modules/Photo.php index 1035f21..bc745dd 100755 --- a/php/modules/Photo.php +++ b/php/modules/Photo.php @@ -486,8 +486,6 @@ class Photo extends Module { if (extension_loaded('imagick')&&$this->settings['imagick']==='1') { - $rotateImage = 0; - switch ($info['orientation']) { case 3: @@ -535,7 +533,6 @@ class Photo extends Module { break; case 3: - $process = true; $sourceImg = imagerotate($sourceImg, -180, 0); break; @@ -552,7 +549,6 @@ class Photo extends Module { break; case 6: - $process = true; $sourceImg = imagerotate($sourceImg, -90, 0); $newWidth = $info['height']; $newHeight = $info['width']; @@ -566,7 +562,6 @@ class Photo extends Module { break; case 8: - $process = true; $sourceImg = imagerotate($sourceImg, 90, 0); $newWidth = $info['height']; $newHeight = $info['width']; @@ -1251,4 +1246,4 @@ class Photo extends Module { } -?> \ No newline at end of file +?> diff --git a/php/modules/Plugins.php b/php/modules/Plugins.php index 1cca42b..9663814 100644 --- a/php/modules/Plugins.php +++ b/php/modules/Plugins.php @@ -20,7 +20,6 @@ class Plugins implements \SplSubject { if (!isset($files)) return false; # Init vars - $plugins = $this; $this->files = $files; # Load plugins @@ -92,4 +91,4 @@ class Plugins implements \SplSubject { } -?> \ No newline at end of file +?> From 0e09fbdc675702044bc82984fd6849417d3f8feb Mon Sep 17 00:00:00 2001 From: Tobias Reich Date: Tue, 8 Dec 2015 10:06:00 +0100 Subject: [PATCH 2/8] Updated deps and gulpfile to work with babel 6 --- dist/main.js | 8 +-- src/gulpfile.js | 144 ++++++++++++++++++++++------------------------- src/package.json | 7 ++- 3 files changed, 74 insertions(+), 85 deletions(-) diff --git a/dist/main.js b/dist/main.js index 6cfbd91..9fe76ff 100644 --- a/dist/main.js +++ b/dist/main.js @@ -1,6 +1,6 @@ function _taggedTemplateLiteral(e,t){return Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function gup(e){e=e.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");var t="[\\?&]"+e+"=([^&#]*)",n=new RegExp(t),o=n.exec(window.location.href);return null===o?"":o[1]}!function(e,t){"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){function n(e){var t="length"in e&&e.length,n=J.type(e);return"function"===n||J.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e}function o(e,t,n){if(J.isFunction(t))return J.grep(e,function(e,o){return!!t.call(e,o,e)!==n});if(t.nodeType)return J.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(se.test(t))return J.filter(t,e,n);t=J.filter(t,e)}return J.grep(e,function(e){return X.call(t,e)>=0!==n})}function i(e,t){for(;(e=e[t])&&1!==e.nodeType;);return e}function a(e){var t=fe[e]={};return J.each(e.match(he)||[],function(e,n){t[n]=!0}),t}function r(){Z.removeEventListener("DOMContentLoaded",r,!1),e.removeEventListener("load",r,!1),J.ready()}function s(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=J.expando+s.uid++}function l(e,t,n){var o;if(void 0===n&&1===e.nodeType)if(o="data-"+t.replace(we,"-$1").toLowerCase(),n=e.getAttribute(o),"string"==typeof n){try{n="true"===n?!0:"false"===n?!1:"null"===n?null:+n+""===n?+n:ye.test(n)?J.parseJSON(n):n}catch(i){}ve.set(e,t,n)}else n=void 0;return n}function c(){return!0}function u(){return!1}function d(){try{return Z.activeElement}catch(e){}}function p(e,t){return J.nodeName(e,"table")&&J.nodeName(11!==t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function h(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function f(e){var t=Oe.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function m(e,t){for(var n=0,o=e.length;o>n;n++)ge.set(e[n],"globalEval",!t||ge.get(t[n],"globalEval"))}function b(e,t){var n,o,i,a,r,s,l,c;if(1===t.nodeType){if(ge.hasData(e)&&(a=ge.access(e),r=ge.set(t,a),c=a.events)){delete r.handle,r.events={};for(i in c)for(n=0,o=c[i].length;o>n;n++)J.event.add(t,i,c[i][n])}ve.hasData(e)&&(s=ve.access(e),l=J.extend({},s),ve.set(t,l))}}function g(e,t){var n=e.getElementsByTagName?e.getElementsByTagName(t||"*"):e.querySelectorAll?e.querySelectorAll(t||"*"):[];return void 0===t||t&&J.nodeName(e,t)?J.merge([e],n):n}function v(e,t){var n=t.nodeName.toLowerCase();"input"===n&&Te.test(e.type)?t.checked=e.checked:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}function y(t,n){var o,i=J(n.createElement(t)).appendTo(n.body),a=e.getDefaultComputedStyle&&(o=e.getDefaultComputedStyle(i[0]))?o.display:J.css(i[0],"display");return i.detach(),a}function w(e){var t=Z,n=Fe[e];return n||(n=y(e,t),"none"!==n&&n||(Re=(Re||J("