From: nodiscc Date: Wed, 11 Mar 2015 18:17:13 +0000 (+0100) Subject: Merge pull request #119 from ArthurHoaro/js-link X-Git-Tag: v0.0.44beta~9 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=3ef1da28e8cc5afcfe58be067e7e60528ce72f1a;hp=f81139c9b22acb10be803165604a58f821be8f76;p=github%2Fshaarli%2FShaarli.git Merge pull request #119 from ArthurHoaro/js-link allow 'javascript:' links sharing (bookmarklets) --- diff --git a/.gitignore b/.gitignore index 6452c2c6..33d8a488 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,11 @@ pagecache .project # Ignore raintpl generated pages -*.rtpl.php \ No newline at end of file +*.rtpl.php + +# Ignore test dependencies +composer.lock +/vendor/ + +# Ignore test output +phpmd.html diff --git a/COPYING b/COPYING index 715ba35a..ec4f7681 100644 --- a/COPYING +++ b/COPYING @@ -50,9 +50,9 @@ Files: Files: inc/jquery*.js, inc/jquery-ui*.js License: MIT License (http://opensource.org/licenses/MIT) Copyright: (C) jQuery Foundation and other contributors,https://jquery.com/download/ -Files: inc/jquery-lazyload*.js +Files: inc/blazy*.js License: MIT License (http://opensource.org/licenses/MIT) -Copyright: (C) Mika Tuupola, https://github.com/tuupola +Copyright: (C) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy Files: inc/qr.js License: GPLv3 License (http://opensource.org/licenses/gpl-3.0) diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..e17c8628 --- /dev/null +++ b/Makefile @@ -0,0 +1,94 @@ +# Shaarli, the personal, minimalist, super-fast, no-database delicious clone. +# +# Makefile for PHP code analysis & testing +# +# Prerequisites: +# - install Composer, either: +# - from your distro's package manager; +# - from the official website (https://getcomposer.org/download/); +# - install/update test dependencies: +# $ composer install # 1st setup +# $ composer update +BIN = vendor/bin +PHP_SOURCE = index.php +MESS_DETECTOR_RULES = cleancode,codesize,controversial,design,naming,unusedcode + +all: static_analysis_summary + +## +# Concise status of the project +# +# These targets are non-blocking: || exit 0 +## +static_analysis_summary: code_sniffer_source copy_paste mess_detector_summary + +## +# PHP_CodeSniffer +# +# Detects PHP syntax errors +# +# Documentation (usage, output formatting): +# - http://pear.php.net/manual/en/package.php.php-codesniffer.usage.php +# - http://pear.php.net/manual/en/package.php.php-codesniffer.reporting.php +## +code_sniffer: code_sniffer_full + +# - errors by Git author +code_sniffer_blame: + @$(BIN)/phpcs $(PHP_SOURCE) --report-gitblame + +# - all errors/warnings +code_sniffer_full: + @$(BIN)/phpcs $(PHP_SOURCE) --report-full --report-width=200 + +# - errors grouped by kind +code_sniffer_source: + @$(BIN)/phpcs $(PHP_SOURCE) --report-source || exit 0 + +## +# PHP Copy/Paste Detector +# +# Detects code redundancy +# +# Documentation: https://github.com/sebastianbergmann/phpcpd +## +copy_paste: + @echo "-----------------------" + @echo "PHP COPY/PASTE DETECTOR" + @echo "-----------------------" + @$(BIN)/phpcpd $(PHP_SOURCE) || exit 0 + @echo + +## +# PHP Mess Detector +# +# Detects PHP syntax errors, sorted by category +# +# Rules documentation: http://phpmd.org/rules/index.html +# +mess_title: + @echo "-----------------" + @echo "PHP MESS DETECTOR" + @echo "-----------------" + +# - all warnings +mess_detector: mess_title + @$(BIN)/phpmd $(PHP_SOURCE) text $(MESS_DETECTOR_RULES) | sed 's_.*\/__' + +# - all warnings +# the generated HTML contains links to PHPMD's documentation +mess_detector_html: + @$(BIN)/phpmd $(PHP_SOURCE) html $(MESS_DETECTOR_RULES) \ + --reportfile phpmd.html || exit 0 + +# - warnings grouped by message, sorted by descending frequency order +mess_detector_grouped: mess_title + @$(BIN)/phpmd $(PHP_SOURCE) text $(MESS_DETECTOR_RULES) \ + | cut -f 2 | sort | uniq -c | sort -nr + +# - summary: number of warnings by rule set +mess_detector_summary: mess_title + @for rule in $$(echo $(MESS_DETECTOR_RULES) | tr ',' ' '); do \ + warnings=$$($(BIN)/phpmd $(PHP_SOURCE) text $$rule | wc -l); \ + printf "$$warnings\t$$rule\n"; \ + done; diff --git a/README.md b/README.md index 0397621a..7f0b7d5f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Shaarli, the personal, minimalist, super-fast, no-database delicious clone. You want to share the links you discover ? Shaarli is a minimalist delicious clone you can install on your own website. It is designed to be personal (single-user), fast and handy. -[![Join the chat at https://gitter.im/shaarli/Shaarli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/shaarli/Shaarli?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Join the chat at https://gitter.im/shaarli/Shaarli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/shaarli/Shaarli) [![Bountysource](https://www.bountysource.com/badge/team?team_id=19583&style=bounties_received)](https://www.bountysource.com/teams/shaarli/issues) ## Features: @@ -51,7 +51,7 @@ It is designed to be personal (single-user), fast and handy. ## Installing -Shaarli requires php 5.1 +Shaarli requires php 5.1. `php-gd` is optional and provides thumbnail resizing. * Download the latest stable release from https://github.com/shaarli/Shaarli/releases * Unpack the archive in a directory on your web server @@ -63,9 +63,8 @@ _To get the development version, download https://github.com/shaarli/Shaarli/arc ## Upgrading -Delete all files and directories except the `data` directory, then unzip the new version of Shaarli. -You will not lose your links and you will not have to reconfigure it. - + * **If you installed from the zip:** Delete all files and directories except the `data` directory, then unzip the new version of Shaarli. You will not lose your links and you will not have to reconfigure it. + * **If you installed using `git clone`**: run `git pull` in your Shaarli directory. ## About diff --git a/composer.json b/composer.json new file mode 100644 index 00000000..d1f613c1 --- /dev/null +++ b/composer.json @@ -0,0 +1,14 @@ +{ + "name": "shaarli/shaarli", + "description": "The personal, minimalist, super-fast, no-database delicious clone", + "license": "MIT", + "support": { + "issues": "https://github.com/shaarli/Shaarli/issues" + }, + "require": {}, + "require-dev": { + "phpmd/phpmd" : "@stable", + "sebastian/phpcpd": "*", + "squizlabs/php_codesniffer": "2.*" + } +} diff --git a/inc/LICENSE b/inc/LICENSE deleted file mode 100644 index 8711a29a..00000000 --- a/inc/LICENSE +++ /dev/null @@ -1,120 +0,0 @@ -JQuery 1.11.2 -=============================================================================== -Copyright jQuery Foundation and other contributors, https://jquery.org/ - -This software consists of voluntary contributions made by many -individuals. For exact contribution history, see the revision history -available at https://github.com/jquery/jquery - -The following license applies to all parts of this software except as -documented below: - -==== - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -==== - -All files located in the node_modules and external directories are -externally maintained libraries used by this software which have their -own licenses; we recommend you read them, as their terms may differ from -the terms above. - - - -JQuery UI 1.11.2 -=============================================================================== -Copyright jQuery Foundation and other contributors, https://jquery.org/ - -This software consists of voluntary contributions made by many -individuals. For exact contribution history, see the revision history -available at https://github.com/jquery/jquery-ui - -The following license applies to all parts of this software except as -documented below: - -==== - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -==== - -Copyright and related rights for sample code are waived via CC0. Sample -code is defined as all source code contained within the demos directory. - -CC0: http://creativecommons.org/publicdomain/zero/1.0/ - -==== - -All files located in the node_modules and external directories are -externally maintained libraries used by this software which have their -own licenses; we recommend you read them, as their terms may differ from -the terms above. - - - -QR.js 1.1.3 -=============================================================================== -Copyright (C) 2014 Alasdair Mercer, http://neocotic.com - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - - - - -JQuery Lazyload 1.9.3 -=============================================================================== -By Mika Tuupola (https://github.com/tuupola) - -All code licensed under the MIT License[1]. All images licensed under -Creative Commons Attribution 3.0 Unported License[2]. In other words you are -basically free to do whatever you want. Just don’t remove my name from the -source. - -[1]: http://opensource.org/licenses/mit-license.php -[2]: http://creativecommons.org/licenses/by/3.0/deed.en_US \ No newline at end of file diff --git a/inc/blazy-1.3.1.js b/inc/blazy-1.3.1.js new file mode 100644 index 00000000..cfc2dbde --- /dev/null +++ b/inc/blazy-1.3.1.js @@ -0,0 +1,232 @@ +/*! + hey, [be]Lazy.js - v1.3.1 - 2015.02.01 + A lazy loading and multi-serving image script + (c) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy +*/ +;(function(root, blazy) { + if (typeof define === 'function' && define.amd) { + // AMD. Register bLazy as an anonymous module + define(blazy); + } else if (typeof exports === 'object') { + // Node. Does not work with strict CommonJS, but + // only CommonJS-like environments that support module.exports, + // like Node. + module.exports = blazy(); + } else { + // Browser globals. Register bLazy on window + root.Blazy = blazy(); + } +})(this, function () { + 'use strict'; + + //vars + var source, options, viewport, images, count, isRetina, destroyed; + //throttle vars + var validateT, saveViewportOffsetT; + + // constructor + function Blazy(settings) { + //IE7- fallback for missing querySelectorAll support + if (!document.querySelectorAll) { + var s=document.createStyleSheet(); + document.querySelectorAll = function(r, c, i, j, a) { + a=document.all, c=[], r = r.replace(/\[for\b/gi, '[htmlFor').split(','); + for (i=r.length; i--;) { + s.addRule(r[i], 'k:v'); + for (j=a.length; j--;) a[j].currentStyle.k && c.push(a[j]); + s.removeRule(0); + } + return c; + }; + } + //init vars + destroyed = true; + images = []; + viewport = {}; + //options + options = settings || {}; + options.error = options.error || false; + options.offset = options.offset || 100; + options.success = options.success || false; + options.selector = options.selector || '.b-lazy'; + options.separator = options.separator || '|'; + options.container = options.container ? document.querySelectorAll(options.container) : false; + options.errorClass = options.errorClass || 'b-error'; + options.breakpoints = options.breakpoints || false; + options.successClass = options.successClass || 'b-loaded'; + options.src = source = options.src || 'data-src'; + isRetina = window.devicePixelRatio > 1; + viewport.top = 0 - options.offset; + viewport.left = 0 - options.offset; + //throttle, ensures that we don't call the functions too often + validateT = throttle(validate, 25); + saveViewportOffsetT = throttle(saveViewportOffset, 50); + + saveViewportOffset(); + + //handle multi-served image src + each(options.breakpoints, function(object){ + if(object.width >= window.screen.width) { + source = object.src; + return false; + } + }); + + // start lazy load + initialize(); + } + + /* public functions + ************************************/ + Blazy.prototype.revalidate = function() { + initialize(); + }; + Blazy.prototype.load = function(element, force){ + if(!isElementLoaded(element)) loadImage(element, force); + }; + Blazy.prototype.destroy = function(){ + if(options.container){ + each(options.container, function(object){ + unbindEvent(object, 'scroll', validateT); + }); + } + unbindEvent(window, 'scroll', validateT); + unbindEvent(window, 'resize', validateT); + unbindEvent(window, 'resize', saveViewportOffsetT); + count = 0; + images.length = 0; + destroyed = true; + }; + + /* private helper functions + ************************************/ + function initialize(){ + // First we create an array of images to lazy load + createImageArray(options.selector); + // Then we bind resize and scroll events if not already binded + if(destroyed) { + destroyed = false; + if(options.container) { + each(options.container, function(object){ + bindEvent(object, 'scroll', validateT); + }); + } + bindEvent(window, 'resize', saveViewportOffsetT); + bindEvent(window, 'resize', validateT); + bindEvent(window, 'scroll', validateT); + } + // And finally, we start to lazy load. Should bLazy ensure domready? + validate(); + } + + function validate() { + for(var i = 0; i 0 && ele.offsetHeight > 0)) { + var dataSrc = ele.getAttribute(source) || ele.getAttribute(options.src); // fallback to default data-src + if(dataSrc) { + var dataSrcSplitted = dataSrc.split(options.separator); + var src = dataSrcSplitted[isRetina && dataSrcSplitted.length > 1 ? 1 : 0]; + var img = new Image(); + // cleanup markup, remove data source attributes + each(options.breakpoints, function(object){ + ele.removeAttribute(object.src); + }); + ele.removeAttribute(options.src); + img.onerror = function() { + if(options.error) options.error(ele, "invalid"); + ele.className = ele.className + ' ' + options.errorClass; + }; + img.onload = function() { + // Is element an image or should we add the src as a background image? + ele.nodeName.toLowerCase() === 'img' ? ele.src = src : ele.style.backgroundImage = 'url("' + src + '")'; + ele.className = ele.className + ' ' + options.successClass; + if(options.success) options.success(ele); + }; + img.src = src; //preload image + } else { + if(options.error) options.error(ele, "missing"); + ele.className = ele.className + ' ' + options.errorClass; + } + } + } + + function elementInView(ele) { + var rect = ele.getBoundingClientRect(); + + return ( + // Intersection + rect.right >= viewport.left + && rect.bottom >= viewport.top + && rect.left <= viewport.right + && rect.top <= viewport.bottom + ); + } + + function isElementLoaded(ele) { + return (' ' + ele.className + ' ').indexOf(' ' + options.successClass + ' ') !== -1; + } + + function createImageArray(selector) { + var nodelist = document.querySelectorAll(selector); + count = nodelist.length; + //converting nodelist to array + for(var i = count; i--; images.unshift(nodelist[i])){} + } + + function saveViewportOffset(){ + viewport.bottom = (window.innerHeight || document.documentElement.clientHeight) + options.offset; + viewport.right = (window.innerWidth || document.documentElement.clientWidth) + options.offset; + } + + function bindEvent(ele, type, fn) { + if (ele.attachEvent) { + ele.attachEvent && ele.attachEvent('on' + type, fn); + } else { + ele.addEventListener(type, fn, false); + } + } + + function unbindEvent(ele, type, fn) { + if (ele.detachEvent) { + ele.detachEvent && ele.detachEvent('on' + type, fn); + } else { + ele.removeEventListener(type, fn, false); + } + } + + function each(object, fn){ + if(object && fn) { + var l = object.length; + for(var i = 0; i=window.screen.width)return r=b.src,!1});h()}function h(){y(a.selector);m&&(m=!1,a.container&&n(a.container,function(b){p(b,"scroll",f)}),p(window,"resize",t),p(window,"resize",f),p(window,"scroll",f));w()}function w(){for(var b=0;b=e.left&&c.bottom>=e.top&&c.left<=e.right&&c.top<=e.bottom||-1!==(" "+g.className+" ").indexOf(" "+a.successClass+" "))d.prototype.load(g),k.splice(b,1),l--,b--}0===l&&d.prototype.destroy()}function z(b,g){if(g||0 settings.failure_limit) { - return false; - } - } - }); - - } - - if(options) { - /* Maintain BC for a couple of versions. */ - if (undefined !== options.failurelimit) { - options.failure_limit = options.failurelimit; - delete options.failurelimit; - } - if (undefined !== options.effectspeed) { - options.effect_speed = options.effectspeed; - delete options.effectspeed; - } - - $.extend(settings, options); - } - - /* Cache container as jQuery as object. */ - $container = (settings.container === undefined || - settings.container === window) ? $window : $(settings.container); - - /* Fire one scroll event per scroll. Not one scroll event per image. */ - if (0 === settings.event.indexOf("scroll")) { - $container.bind(settings.event, function() { - return update(); - }); - } - - this.each(function() { - var self = this; - var $self = $(self); - - self.loaded = false; - - /* If no src attribute given use data:uri. */ - if ($self.attr("src") === undefined || $self.attr("src") === false) { - if ($self.is("img")) { - $self.attr("src", settings.placeholder); - } - } - - /* When appear is triggered load original image. */ - $self.one("appear", function() { - if (!this.loaded) { - if (settings.appear) { - var elements_left = elements.length; - settings.appear.call(self, elements_left, settings); - } - $("") - .bind("load", function() { - - var original = $self.attr("data-" + settings.data_attribute); - $self.hide(); - if ($self.is("img")) { - $self.attr("src", original); - } else { - $self.css("background-image", "url('" + original + "')"); - } - $self[settings.effect](settings.effect_speed); - - self.loaded = true; - - /* Remove image from array so it is not looped next time. */ - var temp = $.grep(elements, function(element) { - return !element.loaded; - }); - elements = $(temp); - - if (settings.load) { - var elements_left = elements.length; - settings.load.call(self, elements_left, settings); - } - }) - .attr("src", $self.attr("data-" + settings.data_attribute)); - } - }); - - /* When wanted event is triggered load original image */ - /* by triggering appear. */ - if (0 !== settings.event.indexOf("scroll")) { - $self.bind(settings.event, function() { - if (!self.loaded) { - $self.trigger("appear"); - } - }); - } - }); - - /* Check if something appears when window is resized. */ - $window.bind("resize", function() { - update(); - }); - - /* With IOS5 force loading images when navigating with back button. */ - /* Non optimal workaround. */ - if ((/(?:iphone|ipod|ipad).*os 5/gi).test(navigator.appVersion)) { - $window.bind("pageshow", function(event) { - if (event.originalEvent && event.originalEvent.persisted) { - elements.each(function() { - $(this).trigger("appear"); - }); - } - }); - } - - /* Force initial check if images should appear. */ - $(document).ready(function() { - update(); - }); - - return this; - }; - - /* Convenience methods in jQuery namespace. */ - /* Use as $.belowthefold(element, {threshold : 100, container : window}) */ - - $.belowthefold = function(element, settings) { - var fold; - - if (settings.container === undefined || settings.container === window) { - fold = (window.innerHeight ? window.innerHeight : $window.height()) + $window.scrollTop(); - } else { - fold = $(settings.container).offset().top + $(settings.container).height(); - } - - return fold <= $(element).offset().top - settings.threshold; - }; - - $.rightoffold = function(element, settings) { - var fold; - - if (settings.container === undefined || settings.container === window) { - fold = $window.width() + $window.scrollLeft(); - } else { - fold = $(settings.container).offset().left + $(settings.container).width(); - } - - return fold <= $(element).offset().left - settings.threshold; - }; - - $.abovethetop = function(element, settings) { - var fold; - - if (settings.container === undefined || settings.container === window) { - fold = $window.scrollTop(); - } else { - fold = $(settings.container).offset().top; - } - - return fold >= $(element).offset().top + settings.threshold + $(element).height(); - }; - - $.leftofbegin = function(element, settings) { - var fold; - - if (settings.container === undefined || settings.container === window) { - fold = $window.scrollLeft(); - } else { - fold = $(settings.container).offset().left; - } - - return fold >= $(element).offset().left + settings.threshold + $(element).width(); - }; - - $.inviewport = function(element, settings) { - return !$.rightoffold(element, settings) && !$.leftofbegin(element, settings) && - !$.belowthefold(element, settings) && !$.abovethetop(element, settings); - }; - - /* Custom selectors for your convenience. */ - /* Use as $("img:below-the-fold").something() or */ - /* $("img").filter(":below-the-fold").something() which is faster */ - - $.extend($.expr[":"], { - "below-the-fold" : function(a) { return $.belowthefold(a, {threshold : 0}); }, - "above-the-top" : function(a) { return !$.belowthefold(a, {threshold : 0}); }, - "right-of-screen": function(a) { return $.rightoffold(a, {threshold : 0}); }, - "left-of-screen" : function(a) { return !$.rightoffold(a, {threshold : 0}); }, - "in-viewport" : function(a) { return $.inviewport(a, {threshold : 0}); }, - /* Maintain BC for couple of versions. */ - "above-the-fold" : function(a) { return !$.belowthefold(a, {threshold : 0}); }, - "right-of-fold" : function(a) { return $.rightoffold(a, {threshold : 0}); }, - "left-of-fold" : function(a) { return !$.rightoffold(a, {threshold : 0}); } - }); - -})(jQuery, window, document); diff --git a/inc/jquery.lazyload-1.9.3.min.js b/inc/jquery.lazyload-1.9.3.min.js deleted file mode 100644 index 615b90e5..00000000 --- a/inc/jquery.lazyload-1.9.3.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! Lazy Load 1.9.3 - MIT license - Copyright 2010-2013 Mika Tuupola */ -!function(a,b,c,d){var e=a(b);a.fn.lazyload=function(f){function g(){var b=0;i.each(function(){var c=a(this);if(!j.skip_invisible||c.is(":visible"))if(a.abovethetop(this,j)||a.leftofbegin(this,j));else if(a.belowthefold(this,j)||a.rightoffold(this,j)){if(++b>j.failure_limit)return!1}else c.trigger("appear"),b=0})}var h,i=this,j={threshold:0,failure_limit:0,event:"scroll",effect:"show",container:b,data_attribute:"original",skip_invisible:!0,appear:null,load:null,placeholder:"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB/AAffA0nNPuCLAAAAAElFTkSuQmCC"};return f&&(d!==f.failurelimit&&(f.failure_limit=f.failurelimit,delete f.failurelimit),d!==f.effectspeed&&(f.effect_speed=f.effectspeed,delete f.effectspeed),a.extend(j,f)),h=j.container===d||j.container===b?e:a(j.container),0===j.event.indexOf("scroll")&&h.bind(j.event,function(){return g()}),this.each(function(){var b=this,c=a(b);b.loaded=!1,(c.attr("src")===d||c.attr("src")===!1)&&c.is("img")&&c.attr("src",j.placeholder),c.one("appear",function(){if(!this.loaded){if(j.appear){var d=i.length;j.appear.call(b,d,j)}a("").bind("load",function(){var d=c.attr("data-"+j.data_attribute);c.hide(),c.is("img")?c.attr("src",d):c.css("background-image","url('"+d+"')"),c[j.effect](j.effect_speed),b.loaded=!0;var e=a.grep(i,function(a){return!a.loaded});if(i=a(e),j.load){var f=i.length;j.load.call(b,f,j)}}).attr("src",c.attr("data-"+j.data_attribute))}}),0!==j.event.indexOf("scroll")&&c.bind(j.event,function(){b.loaded||c.trigger("appear")})}),e.bind("resize",function(){g()}),/(?:iphone|ipod|ipad).*os 5/gi.test(navigator.appVersion)&&e.bind("pageshow",function(b){b.originalEvent&&b.originalEvent.persisted&&i.each(function(){a(this).trigger("appear")})}),a(c).ready(function(){g()}),this},a.belowthefold=function(c,f){var g;return g=f.container===d||f.container===b?(b.innerHeight?b.innerHeight:e.height())+e.scrollTop():a(f.container).offset().top+a(f.container).height(),g<=a(c).offset().top-f.threshold},a.rightoffold=function(c,f){var g;return g=f.container===d||f.container===b?e.width()+e.scrollLeft():a(f.container).offset().left+a(f.container).width(),g<=a(c).offset().left-f.threshold},a.abovethetop=function(c,f){var g;return g=f.container===d||f.container===b?e.scrollTop():a(f.container).offset().top,g>=a(c).offset().top+f.threshold+a(c).height()},a.leftofbegin=function(c,f){var g;return g=f.container===d||f.container===b?e.scrollLeft():a(f.container).offset().left,g>=a(c).offset().left+f.threshold+a(c).width()},a.inviewport=function(b,c){return!(a.rightoffold(b,c)||a.leftofbegin(b,c)||a.belowthefold(b,c)||a.abovethetop(b,c))},a.extend(a.expr[":"],{"below-the-fold":function(b){return a.belowthefold(b,{threshold:0})},"above-the-top":function(b){return!a.belowthefold(b,{threshold:0})},"right-of-screen":function(b){return a.rightoffold(b,{threshold:0})},"left-of-screen":function(b){return!a.rightoffold(b,{threshold:0})},"in-viewport":function(b){return a.inviewport(b,{threshold:0})},"above-the-fold":function(b){return!a.belowthefold(b,{threshold:0})},"right-of-fold":function(b){return a.rightoffold(b,{threshold:0})},"left-of-fold":function(b){return!a.rightoffold(b,{threshold:0})}})}(jQuery,window,document); \ No newline at end of file diff --git a/inc/shaarli.css b/inc/shaarli.css index bb564e99..a88143ca 100644 --- a/inc/shaarli.css +++ b/inc/shaarli.css @@ -647,9 +647,21 @@ a.qrcode img { float: left; } +.b-lazy { + -webkit-transition: opacity 500ms ease-in-out; + -moz-transition: opacity 500ms ease-in-out; + -o-transition: opacity 500ms ease-in-out; + transition: opacity 500ms ease-in-out; + opacity: 0; +} +.b-lazy.b-loaded { + opacity: 1; +} + .picwall_pictureframe img { max-width: 100%; height: auto; + color: transparent; } /* Adapt the width of the image */ .picwall_pictureframe a { diff --git a/index.php b/index.php index c87b9449..066058e6 100644 --- a/index.php +++ b/index.php @@ -178,13 +178,14 @@ function checkphpversion() function checkUpdate() { if (!isLoggedIn()) return ''; // Do not check versions for visitors. + if (empty($GLOBALS['config']['ENABLE_UPDATECHECK'])) return ''; // Do not check if the user doesn't want to. // Get latest version number at most once a day. if (!is_file($GLOBALS['config']['UPDATECHECK_FILENAME']) || (filemtime($GLOBALS['config']['UPDATECHECK_FILENAME'])','',str_replace('alert("Configuration was saved.");document.location=\'?do=tools\';'; exit; @@ -1558,6 +1560,7 @@ function renderPage() if (isset($_GET['source']) && $_GET['source']=='bookmarklet') { echo ''; exit; } $returnurl = ( isset($_POST['returnurl']) ? $_POST['returnurl'] : '?' ); $returnurl .= '#'.smallHash($linkdate); // Scroll to the link which has been edited. + if (strstr($returnurl, "do=addlink")) { $returnurl = '?'; } //if we come from ?do=addlink, set returnurl to homepage instead header('Location: '.$returnurl); // After saving the link, redirect to the page the user was on. exit; } @@ -1640,10 +1643,13 @@ function renderPage() { $url=$_GET['post']; - // We remove the annoying parameters added by FeedBurner and GoogleFeedProxy (?utm_source=...) - $i=strpos($url,'&utm_source='); if ($i!==false) $url=substr($url,0,$i); - $i=strpos($url,'?utm_source='); if ($i!==false) $url=substr($url,0,$i); - $i=strpos($url,'#xtor=RSS-'); if ($i!==false) $url=substr($url,0,$i); + + // We remove the annoying parameters added by FeedBurner, GoogleFeedProxy, Facebook... + $annoyingpatterns = array('/[\?&]utm_source=[^&]*/', '/[\?&]utm_campaign=[^&]*/', '/[\?&]utm_medium=[^&]*/', '/#xtor=RSS-[^&]*/', '/[\?&]fb_[^&]*/', '/[\?&]__scoop[^&]*/', '/#tk\.rss_all\?/', '/[\?&]action_ref_map=[^&]*/', '/[\?&]action_type_map=[^&]*/', '/[\?&]action_object_map=[^&]*/'); + foreach($annoyingpatterns as $pattern) + { + $url = preg_replace($pattern, "", $url); + } $link_is_new = false; $link = $LINKSDB->getLinkFromUrl($url); // Check if URL is not already in database (in this case, we will edit the existing link) @@ -2123,11 +2129,8 @@ function lazyThumbnail($url,$href=false) $html=''; - // Lazy image (only loaded by JavaScript when in the viewport). - if (!empty($GLOBALS['disablejquery'])) // (except if jQuery is disabled) - $html.='alert("Shaarli is now configured. Please enter your login/password and start shaaring your links!");document.location=\'?do=login\';'; exit; @@ -2359,6 +2363,7 @@ function writeConfig() $config .= '$GLOBALS[\'disablejquery\']='.var_export($GLOBALS['disablejquery'],true).'; '; $config .= '$GLOBALS[\'privateLinkByDefault\']='.var_export($GLOBALS['privateLinkByDefault'],true).'; '; $config .= '$GLOBALS[\'config\'][\'ENABLE_RSS_PERMALINKS\']='.var_export($GLOBALS['config']['ENABLE_RSS_PERMALINKS'], true).'; '; + $config .= '$GLOBALS[\'config\'][\'ENABLE_UPDATECHECK\']='.var_export($GLOBALS['config']['ENABLE_UPDATECHECK'], true).'; '; $config .= ' ?>'; if (!file_put_contents($GLOBALS['config']['CONFIG_FILE'],$config) || strcmp(file_get_contents($GLOBALS['config']['CONFIG_FILE']),$config)!=0) { diff --git a/shaarli_version.php b/shaarli_version.php new file mode 100644 index 00000000..d266380a --- /dev/null +++ b/shaarli_version.php @@ -0,0 +1 @@ + diff --git a/shaarli_version.txt b/shaarli_version.txt deleted file mode 100644 index b6cffb3a..00000000 --- a/shaarli_version.txt +++ /dev/null @@ -1 +0,0 @@ -0.0.43beta diff --git a/tpl/configure.html b/tpl/configure.html index c096018b..887be327 100644 --- a/tpl/configure.html +++ b/tpl/configure.html @@ -29,6 +29,10 @@ + + Update: + + diff --git a/tpl/includes.html b/tpl/includes.html index 93cdfd5a..623e19ed 100644 --- a/tpl/includes.html +++ b/tpl/includes.html @@ -6,5 +6,5 @@ - -{if="is_file('inc/user.css')"}{/if} + +{if="is_file('inc/user.css')"}{/if} diff --git a/tpl/install.html b/tpl/install.html index df42bf6d..88eb540e 100644 --- a/tpl/install.html +++ b/tpl/install.html @@ -3,17 +3,20 @@ {include="includes"}{$timezone_js}
-

Shaarli

-It looks like it's the first time you run Shaarli. Please configure it:
-
- - - -{$timezone_html} - - -
Login:
Password:
Page title:
-
+

Shaarli

+ It looks like it's the first time you run Shaarli. Please configure it:
+
+ + + + {$timezone_html} + + + + +
Login:
Password:
Page title:
Update: +
+
{include="page.footer"} diff --git a/tpl/picwall.html b/tpl/picwall.html index d3cabb2d..ea1ef420 100644 --- a/tpl/picwall.html +++ b/tpl/picwall.html @@ -1,11 +1,7 @@ {include="includes"} -{if="empty($GLOBALS['disablejquery'])"} - - - -{/if} + @@ -20,12 +16,8 @@ {include="page.footer"} -{if="empty($GLOBALS['disablejquery'])"} -{/if} \ No newline at end of file diff --git a/tpl/picwall2.html b/tpl/picwall2.html deleted file mode 100644 index 44d08b0c..00000000 --- a/tpl/picwall2.html +++ /dev/null @@ -1,19 +0,0 @@ - - -{include="includes"} - - - - -{include="page.footer"} - - \ No newline at end of file diff --git a/tpl/tools.html b/tpl/tools.html index bf0539b1..e912f615 100644 --- a/tpl/tools.html +++ b/tpl/tools.html @@ -11,6 +11,7 @@ Import : Import Netscape html bookmarks (as exported from Firefox, Chrome, Opera, delicious...)

Export : Export Netscape html bookmarks (which can be imported in Firefox, Chrome, Opera, delicious...)

✚Shaare link ⇐ Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).
    Then click "✚Shaare link" button in any page you want to share.

+ ✚Add Note ⇐ Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).
    Then click "✚Add Note" button anytime to start composing a (default private) Note (text post) to your Shaarli.