", + + options: { + classes: {}, + disabled: false, + + // Callbacks + create: null + }, + + _createWidget: function( options, element ) { + element = $( element || this.defaultElement || this )[ 0 ]; + this.element = $( element ); + this.uuid = widgetUuid++; + this.eventNamespace = "." + this.widgetName + this.uuid; + + this.bindings = $(); + this.hoverable = $(); + this.focusable = $(); + this.classesElementLookup = {}; + + if ( element !== this ) { + $.data( element, this.widgetFullName, this ); + this._on( true, this.element, { + remove: function( event ) { + if ( event.target === element ) { + this.destroy(); + } + } + } ); + this.document = $( element.style ? + + // Element within the document + element.ownerDocument : + + // Element is window or document + element.document || element ); + this.window = $( this.document[ 0 ].defaultView || this.document[ 0 ].parentWindow ); + } + + this.options = $.widget.extend( {}, + this.options, + this._getCreateOptions(), + options ); + + this._create(); + + if ( this.options.disabled ) { + this._setOptionDisabled( this.options.disabled ); + } + + this._trigger( "create", null, this._getCreateEventData() ); + this._init(); + }, + + _getCreateOptions: function() { + return {}; + }, + + _getCreateEventData: $.noop, + + _create: $.noop, + + _init: $.noop, + + destroy: function() { + var that = this; + + this._destroy(); + $.each( this.classesElementLookup, function( key, value ) { + that._removeClass( value, key ); + } ); + + // We can probably remove the unbind calls in 2.0 + // all event bindings should go through this._on() + this.element + .off( this.eventNamespace ) + .removeData( this.widgetFullName ); + this.widget() + .off( this.eventNamespace ) + .removeAttr( "aria-disabled" ); + + // Clean up events and states + this.bindings.off( this.eventNamespace ); + }, + + _destroy: $.noop, + + widget: function() { + return this.element; + }, + + option: function( key, value ) { + var options = key; + var parts; + var curOption; + var i; + + if ( arguments.length === 0 ) { + + // Don't return a reference to the internal hash + return $.widget.extend( {}, this.options ); + } + + if ( typeof key === "string" ) { + + // Handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } } + options = {}; + parts = key.split( "." ); + key = parts.shift(); + if ( parts.length ) { + curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] ); + for ( i = 0; i < parts.length - 1; i++ ) { + curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {}; + curOption = curOption[ parts[ i ] ]; + } + key = parts.pop(); + if ( arguments.length === 1 ) { + return curOption[ key ] === undefined ? null : curOption[ key ]; + } + curOption[ key ] = value; + } else { + if ( arguments.length === 1 ) { + return this.options[ key ] === undefined ? null : this.options[ key ]; + } + options[ key ] = value; + } + } + + this._setOptions( options ); + + return this; + }, + + _setOptions: function( options ) { + var key; + + for ( key in options ) { + this._setOption( key, options[ key ] ); + } + + return this; + }, + + _setOption: function( key, value ) { + if ( key === "classes" ) { + this._setOptionClasses( value ); + } + + this.options[ key ] = value; + + if ( key === "disabled" ) { + this._setOptionDisabled( value ); + } + + return this; + }, + + _setOptionClasses: function( value ) { + var classKey, elements, currentElements; + + for ( classKey in value ) { + currentElements = this.classesElementLookup[ classKey ]; + if ( value[ classKey ] === this.options.classes[ classKey ] || + !currentElements || + !currentElements.length ) { + continue; + } + + // We are doing this to create a new jQuery object because the _removeClass() call + // on the next line is going to destroy the reference to the current elements being + // tracked. We need to save a copy of this collection so that we can add the new classes + // below. + elements = $( currentElements.get() ); + this._removeClass( currentElements, classKey ); + + // We don't use _addClass() here, because that uses this.options.classes + // for generating the string of classes. We want to use the value passed in from + // _setOption(), this is the new value of the classes option which was passed to + // _setOption(). We pass this value directly to _classes(). + elements.addClass( this._classes( { + element: elements, + keys: classKey, + classes: value, + add: true + } ) ); + } + }, + + _setOptionDisabled: function( value ) { + this._toggleClass( this.widget(), this.widgetFullName + "-disabled", null, !!value ); + + // If the widget is becoming disabled, then nothing is interactive + if ( value ) { + this._removeClass( this.hoverable, null, "ui-state-hover" ); + this._removeClass( this.focusable, null, "ui-state-focus" ); + } + }, + + enable: function() { + return this._setOptions( { disabled: false } ); + }, + + disable: function() { + return this._setOptions( { disabled: true } ); + }, + + _classes: function( options ) { + var full = []; + var that = this; + + options = $.extend( { + element: this.element, + classes: this.options.classes || {} + }, options ); + + function processClassString( classes, checkOption ) { + var current, i; + for ( i = 0; i < classes.length; i++ ) { + current = that.classesElementLookup[ classes[ i ] ] || $(); + if ( options.add ) { + current = $( $.unique( current.get().concat( options.element.get() ) ) ); + } else { + current = $( current.not( options.element ).get() ); + } + that.classesElementLookup[ classes[ i ] ] = current; + full.push( classes[ i ] ); + if ( checkOption && options.classes[ classes[ i ] ] ) { + full.push( options.classes[ classes[ i ] ] ); + } + } + } + + this._on( options.element, { + "remove": "_untrackClassesElement" + } ); + + if ( options.keys ) { + processClassString( options.keys.match( /\S+/g ) || [], true ); + } + if ( options.extra ) { + processClassString( options.extra.match( /\S+/g ) || [] ); + } + + return full.join( " " ); + }, + + _untrackClassesElement: function( event ) { + var that = this; + $.each( that.classesElementLookup, function( key, value ) { + if ( $.inArray( event.target, value ) !== -1 ) { + that.classesElementLookup[ key ] = $( value.not( event.target ).get() ); + } + } ); + }, + + _removeClass: function( element, keys, extra ) { + return this._toggleClass( element, keys, extra, false ); + }, + + _addClass: function( element, keys, extra ) { + return this._toggleClass( element, keys, extra, true ); + }, + + _toggleClass: function( element, keys, extra, add ) { + add = ( typeof add === "boolean" ) ? add : extra; + var shift = ( typeof element === "string" || element === null ), + options = { + extra: shift ? keys : extra, + keys: shift ? element : keys, + element: shift ? this.element : element, + add: add + }; + options.element.toggleClass( this._classes( options ), add ); + return this; + }, + + _on: function( suppressDisabledCheck, element, handlers ) { + var delegateElement; + var instance = this; + + // No suppressDisabledCheck flag, shuffle arguments + if ( typeof suppressDisabledCheck !== "boolean" ) { + handlers = element; + element = suppressDisabledCheck; + suppressDisabledCheck = false; + } + + // No element argument, shuffle and use this.element + if ( !handlers ) { + handlers = element; + element = this.element; + delegateElement = this.widget(); + } else { + element = delegateElement = $( element ); + this.bindings = this.bindings.add( element ); + } + + $.each( handlers, function( event, handler ) { + function handlerProxy() { + + // Allow widgets to customize the disabled handling + // - disabled as an array instead of boolean + // - disabled class as method for disabling individual parts + if ( !suppressDisabledCheck && + ( instance.options.disabled === true || + $( this ).hasClass( "ui-state-disabled" ) ) ) { + return; + } + return ( typeof handler === "string" ? instance[ handler ] : handler ) + .apply( instance, arguments ); + } + + // Copy the guid so direct unbinding works + if ( typeof handler !== "string" ) { + handlerProxy.guid = handler.guid = + handler.guid || handlerProxy.guid || $.guid++; + } + + var match = event.match( /^([\w:-]*)\s*(.*)$/ ); + var eventName = match[ 1 ] + instance.eventNamespace; + var selector = match[ 2 ]; + + if ( selector ) { + delegateElement.on( eventName, selector, handlerProxy ); + } else { + element.on( eventName, handlerProxy ); + } + } ); + }, + + _off: function( element, eventName ) { + eventName = ( eventName || "" ).split( " " ).join( this.eventNamespace + " " ) + + this.eventNamespace; + element.off( eventName ).off( eventName ); + + // Clear the stack to avoid memory leaks (#10056) + this.bindings = $( this.bindings.not( element ).get() ); + this.focusable = $( this.focusable.not( element ).get() ); + this.hoverable = $( this.hoverable.not( element ).get() ); + }, + + _delay: function( handler, delay ) { + function handlerProxy() { + return ( typeof handler === "string" ? instance[ handler ] : handler ) + .apply( instance, arguments ); + } + var instance = this; + return setTimeout( handlerProxy, delay || 0 ); + }, + + _hoverable: function( element ) { + this.hoverable = this.hoverable.add( element ); + this._on( element, { + mouseenter: function( event ) { + this._addClass( $( event.currentTarget ), null, "ui-state-hover" ); + }, + mouseleave: function( event ) { + this._removeClass( $( event.currentTarget ), null, "ui-state-hover" ); + } + } ); + }, + + _focusable: function( element ) { + this.focusable = this.focusable.add( element ); + this._on( element, { + focusin: function( event ) { + this._addClass( $( event.currentTarget ), null, "ui-state-focus" ); + }, + focusout: function( event ) { + this._removeClass( $( event.currentTarget ), null, "ui-state-focus" ); + } + } ); + }, + + _trigger: function( type, event, data ) { + var prop, orig; + var callback = this.options[ type ]; + + data = data || {}; + event = $.Event( event ); + event.type = ( type === this.widgetEventPrefix ? + type : + this.widgetEventPrefix + type ).toLowerCase(); + + // The original event may come from any element + // so we need to reset the target on the new event + event.target = this.element[ 0 ]; + + // Copy original event properties over to the new event + orig = event.originalEvent; + if ( orig ) { + for ( prop in orig ) { + if ( !( prop in event ) ) { + event[ prop ] = orig[ prop ]; + } + } + } + + this.element.trigger( event, data ); + return !( $.isFunction( callback ) && + callback.apply( this.element[ 0 ], [ event ].concat( data ) ) === false || + event.isDefaultPrevented() ); + } + }; + + $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) { + $.Widget.prototype[ "_" + method ] = function( element, options, callback ) { + if ( typeof options === "string" ) { + options = { effect: options }; + } + + var hasOptions; + var effectName = !options ? + method : + options === true || typeof options === "number" ? + defaultEffect : + options.effect || defaultEffect; + + options = options || {}; + if ( typeof options === "number" ) { + options = { duration: options }; + } + + hasOptions = !$.isEmptyObject( options ); + options.complete = callback; + + if ( options.delay ) { + element.delay( options.delay ); + } + + if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) { + element[ method ]( options ); + } else if ( effectName !== method && element[ effectName ] ) { + element[ effectName ]( options.duration, options.easing, callback ); + } else { + element.queue( function( next ) { + $( this )[ method ](); + if ( callback ) { + callback.call( element[ 0 ] ); + } + next(); + } ); + } + }; + } ); + + var widget = $.widget; - // Browser globals - factory( jQuery ); - } -}(function( $ ) { -/*! - * jQuery UI Widget 1.11.4 - * http://jqueryui.com - * - * Copyright jQuery Foundation and other contributors - * Released under the MIT license. - * http://jquery.org/license - * - * http://api.jqueryui.com/jQuery.widget/ - */ - - -var widget_uuid = 0, - widget_slice = Array.prototype.slice; - -$.cleanData = (function( orig ) { - return function( elems ) { - var events, elem, i; - for ( i = 0; (elem = elems[i]) != null; i++ ) { - try { - - // Only trigger remove when necessary to save time - events = $._data( elem, "events" ); - if ( events && events.remove ) { - $( elem ).triggerHandler( "remove" ); - } - - // http://bugs.jquery.com/ticket/8235 - } catch ( e ) {} - } - orig( elems ); - }; -})( $.cleanData ); - -$.widget = function( name, base, prototype ) { - var fullName, existingConstructor, constructor, basePrototype, - // proxiedPrototype allows the provided prototype to remain unmodified - // so that it can be used as a mixin for multiple widgets (#8876) - proxiedPrototype = {}, - namespace = name.split( "." )[ 0 ]; - - name = name.split( "." )[ 1 ]; - fullName = namespace + "-" + name; - - if ( !prototype ) { - prototype = base; - base = $.Widget; - } - - // create selector for plugin - $.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) { - return !!$.data( elem, fullName ); - }; - - $[ namespace ] = $[ namespace ] || {}; - existingConstructor = $[ namespace ][ name ]; - constructor = $[ namespace ][ name ] = function( options, element ) { - // allow instantiation without "new" keyword - if ( !this._createWidget ) { - return new constructor( options, element ); - } - - // allow instantiation without initializing for simple inheritance - // must use "new" keyword (the code above always passes args) - if ( arguments.length ) { - this._createWidget( options, element ); - } - }; - // extend with the existing constructor to carry over any static properties - $.extend( constructor, existingConstructor, { - version: prototype.version, - // copy the object used to create the prototype in case we need to - // redefine the widget later - _proto: $.extend( {}, prototype ), - // track widgets that inherit from this widget in case this widget is - // redefined after a widget inherits from it - _childConstructors: [] - }); - - basePrototype = new base(); - // we need to make the options hash a property directly on the new instance - // otherwise we'll modify the options hash on the prototype that we're - // inheriting from - basePrototype.options = $.widget.extend( {}, basePrototype.options ); - $.each( prototype, function( prop, value ) { - if ( !$.isFunction( value ) ) { - proxiedPrototype[ prop ] = value; - return; - } - proxiedPrototype[ prop ] = (function() { - var _super = function() { - return base.prototype[ prop ].apply( this, arguments ); - }, - _superApply = function( args ) { - return base.prototype[ prop ].apply( this, args ); - }; - return function() { - var __super = this._super, - __superApply = this._superApply, - returnValue; - - this._super = _super; - this._superApply = _superApply; - - returnValue = value.apply( this, arguments ); - - this._super = __super; - this._superApply = __superApply; - - return returnValue; - }; - })(); - }); - constructor.prototype = $.widget.extend( basePrototype, { - // TODO: remove support for widgetEventPrefix - // always use the name + a colon as the prefix, e.g., draggable:start - // don't prefix for widgets that aren't DOM-based - widgetEventPrefix: existingConstructor ? (basePrototype.widgetEventPrefix || name) : name - }, proxiedPrototype, { - constructor: constructor, - namespace: namespace, - widgetName: name, - widgetFullName: fullName - }); - - // If this widget is being redefined then we need to find all widgets that - // are inheriting from it and redefine all of them so that they inherit from - // the new version of this widget. We're essentially trying to replace one - // level in the prototype chain. - if ( existingConstructor ) { - $.each( existingConstructor._childConstructors, function( i, child ) { - var childPrototype = child.prototype; - - // redefine the child widget using the same prototype that was - // originally used, but inherit from the new version of the base - $.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto ); - }); - // remove the list of existing child constructors from the old constructor - // so the old child constructors can be garbage collected - delete existingConstructor._childConstructors; - } else { - base._childConstructors.push( constructor ); - } - - $.widget.bridge( name, constructor ); - - return constructor; -}; - -$.widget.extend = function( target ) { - var input = widget_slice.call( arguments, 1 ), - inputIndex = 0, - inputLength = input.length, - key, - value; - for ( ; inputIndex < inputLength; inputIndex++ ) { - for ( key in input[ inputIndex ] ) { - value = input[ inputIndex ][ key ]; - if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) { - // Clone objects - if ( $.isPlainObject( value ) ) { - target[ key ] = $.isPlainObject( target[ key ] ) ? - $.widget.extend( {}, target[ key ], value ) : - // Don't extend strings, arrays, etc. with objects - $.widget.extend( {}, value ); - // Copy everything else by reference - } else { - target[ key ] = value; - } - } - } - } - return target; -}; - -$.widget.bridge = function( name, object ) { - var fullName = object.prototype.widgetFullName || name; - $.fn[ name ] = function( options ) { - var isMethodCall = typeof options === "string", - args = widget_slice.call( arguments, 1 ), - returnValue = this; - - if ( isMethodCall ) { - this.each(function() { - var methodValue, - instance = $.data( this, fullName ); - if ( options === "instance" ) { - returnValue = instance; - return false; - } - if ( !instance ) { - return $.error( "cannot call methods on " + name + " prior to initialization; " + - "attempted to call method '" + options + "'" ); - } - if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) { - return $.error( "no such method '" + options + "' for " + name + " widget instance" ); - } - methodValue = instance[ options ].apply( instance, args ); - if ( methodValue !== instance && methodValue !== undefined ) { - returnValue = methodValue && methodValue.jquery ? - returnValue.pushStack( methodValue.get() ) : - methodValue; - return false; - } - }); - } else { - - // Allow multiple hashes to be passed on init - if ( args.length ) { - options = $.widget.extend.apply( null, [ options ].concat(args) ); - } - - this.each(function() { - var instance = $.data( this, fullName ); - if ( instance ) { - instance.option( options || {} ); - if ( instance._init ) { - instance._init(); - } - } else { - $.data( this, fullName, new object( options, this ) ); - } - }); - } - - return returnValue; - }; -}; - -$.Widget = function( /* options, element */ ) {}; -$.Widget._childConstructors = []; - -$.Widget.prototype = { - widgetName: "widget", - widgetEventPrefix: "", - defaultElement: "

jQuery File Upload Plugin Test

@@ -145,11 +145,11 @@ {% } %} - + - - - + + + - + -- cgit v1.2.3 From 26e20f99997b061f36c5698035a0b2a7747b4b1a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 22 Oct 2018 14:04:09 +0200 Subject: add summary to bbcode autocomplete list --- view/js/autocomplete.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 54eb03e13..034427fe7 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -358,8 +358,8 @@ function string2bb(element) { return; if(type=='bbcode') { - var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'map', 'nobb', 'list', 'checklist', 'ul', 'ol', 'dl', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer', 'observer.language','embed', 'highlight', 'url', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6']; - var open_elements = ['observer.baseurl', 'observer.address', 'observer.photo', 'observer.name', 'observer.webname', 'observer.url', '*', 'hr', ]; + var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'summary', 'map', 'nobb', 'list', 'checklist', 'ul', 'ol', 'dl', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer', 'observer.language','embed', 'highlight', 'url', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6']; + var open_elements = ['observer.baseurl', 'observer.address', 'observer.photo', 'observer.name', 'observer.webname', 'observer.url', '*', 'hr' ]; var elements = open_close_elements.concat(open_elements); } -- cgit v1.2.3 From 5c36eef0394b47455b66ad913d157bdd32f8004c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 22 Oct 2018 15:36:02 +0200 Subject: textcomplete: return up to 100 items and look for for matches in the entire string (not just the beginning) when suggesting emojis --- view/js/autocomplete.js | 40 +++++++++++++++++++++++++++------------ view/theme/redbasic/css/style.css | 6 ++++++ 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 034427fe7..aa580b163 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -195,12 +195,12 @@ function string2bb(element) { smilies = { - match: /(^|\s)(:[a-z_:]{2,})$/, + match: /(^|\s)(:[a-z0-9_:]{2,})$/, index: 2, cache: true, - search: function(term, callback) { $.getJSON('/smilies/json').done(function(data) { callback($.map(data, function(entry) { return entry.text.indexOf(term) === 0 ? entry : null; })); }); }, - //template: function(item) { return item.icon + item.text; }, + search: function(term, callback) { $.getJSON('/smilies/json').done(function(data) { callback($.map(data, function(entry) { return entry.text.indexOf(term.substr(1)) !== -1 ? entry : null; })); }); }, replace: function(item) { return "$1" + item.text + ' '; }, + context: function(text) { return text.toLowerCase(); }, template: smiley_format }; this.attr('autocomplete','off'); @@ -209,8 +209,12 @@ function string2bb(element) { $(this).each(function() { var editor = new Textarea(this); - var textcomplete = new Textcomplete(editor); - textcomplete.register([contacts,forums,smilies,tags], {className:'acpopup', zIndex:1020}); + var textcomplete = new Textcomplete(editor, { + dropdown: { + maxCount: 100 + } + }); + textcomplete.register([contacts,forums,smilies,tags]); }); @@ -264,8 +268,12 @@ function string2bb(element) { $(this).each(function() { var editor = new Textarea(this); - textcomplete = new Textcomplete(editor); - textcomplete.register([contacts,forums,tags], {className:'acpopup', maxCount:100, zIndex: 1020, appendTo:'nav'}); + textcomplete = new Textcomplete(editor, { + dropdown: { + maxCount: 100 + } + }); + textcomplete.register([contacts,forums,tags]); }); textcomplete.on('selected', function() { this.editor.el.form.submit(); }); @@ -299,8 +307,12 @@ function string2bb(element) { $(this).each(function() { var editor = new Textarea(this); - textcomplete = new Textcomplete(editor); - textcomplete.register([contacts], {className:'acpopup', zIndex:1020}); + textcomplete = new Textcomplete(editor, { + dropdown: { + maxCount: 100 + } + }); + textcomplete.register([contacts]); }); if(autosubmit) @@ -338,8 +350,12 @@ function string2bb(element) { $(this).each(function() { var editor = new Textarea(this); - textcomplete = new Textcomplete(editor); - textcomplete.register([names], {className:'acpopup', zIndex:1020}); + textcomplete = new Textcomplete(editor, { + dropdown: { + maxCount: 100 + } + }); + textcomplete.register([names]); }); if(autosubmit) @@ -420,7 +436,7 @@ function string2bb(element) { $(this).each(function() { var editor = new Textarea(this); var textcomplete = new Textcomplete(editor); - textcomplete.register([bbco], {className:'acpopup', zIndex:1020}); + textcomplete.register([bbco]); }); this.keypress(function(e){ diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4f0658477..489d71735 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1474,6 +1474,12 @@ blockquote { background-color: $item_colour; } +.textcomplete-dropdown { + max-height: 300px; + max-width: 250px; + overflow: auto; +} + .dropdown-item.active { color: #fff; background-color: #007bff; -- cgit v1.2.3 From 7ed197f46b189601ac043f4bfeab41204a43488b Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 22 Oct 2018 17:12:36 -0700 Subject: for whatever reason there were two of these --- library/jqupload/.gitignore | 3 - library/jqupload/.jshintrc | 81 -- library/jqupload/CONTRIBUTING.md | 42 - library/jqupload/Gruntfile.js | 37 - library/jqupload/README.md | 123 -- library/jqupload/angularjs.html | 211 --- library/jqupload/basic-plus.html | 226 ---- library/jqupload/basic.html | 136 -- library/jqupload/blueimp-file-upload.jquery.json | 50 - library/jqupload/bower.json | 85 -- library/jqupload/cors/postmessage.html | 75 -- library/jqupload/cors/result.html | 24 - library/jqupload/css/demo-ie8.css | 21 - library/jqupload/css/demo.css | 67 - .../jqupload/css/jquery.fileupload-noscript.css | 22 - .../jqupload/css/jquery.fileupload-ui-noscript.css | 17 - library/jqupload/css/jquery.fileupload-ui.css | 57 - library/jqupload/css/jquery.fileupload.css | 36 - library/jqupload/css/style.css | 15 - library/jqupload/img/loading.gif | Bin 3897 -> 0 bytes library/jqupload/img/progressbar.gif | Bin 3323 -> 0 bytes library/jqupload/index.html | 255 ---- library/jqupload/jquery-ui.html | 250 ---- library/jqupload/js/app.js | 101 -- .../js/cors/jquery.postmessage-transport.js | 117 -- library/jqupload/js/cors/jquery.xdr-transport.js | 86 -- library/jqupload/js/jquery.fileupload-angular.js | 428 ------ library/jqupload/js/jquery.fileupload-audio.js | 106 -- library/jqupload/js/jquery.fileupload-image.js | 309 ----- library/jqupload/js/jquery.fileupload-jquery-ui.js | 144 -- library/jqupload/js/jquery.fileupload-process.js | 172 --- library/jqupload/js/jquery.fileupload-ui.js | 701 ---------- library/jqupload/js/jquery.fileupload-validate.js | 119 -- library/jqupload/js/jquery.fileupload-video.js | 106 -- library/jqupload/js/jquery.fileupload.js | 1420 -------------------- library/jqupload/js/jquery.iframe-transport.js | 214 --- library/jqupload/js/main.js | 75 -- library/jqupload/js/vendor/jquery.ui.widget.js | 530 -------- library/jqupload/package.json | 54 - library/jqupload/server/gae-go/app.yaml | 12 - library/jqupload/server/gae-go/app/main.go | 296 ---- library/jqupload/server/gae-go/static/robots.txt | 2 - library/jqupload/server/gae-python/app.yaml | 16 - library/jqupload/server/gae-python/main.py | 170 --- .../jqupload/server/gae-python/static/robots.txt | 2 - library/jqupload/server/node/.gitignore | 2 - library/jqupload/server/node/package.json | 41 - .../jqupload/server/node/public/files/.gitignore | 2 - library/jqupload/server/node/server.js | 292 ---- library/jqupload/server/node/tmp/.gitignore | 0 library/jqupload/server/php/UploadHandler.php | 1329 ------------------ library/jqupload/server/php/files/.gitignore | 3 - library/jqupload/server/php/files/.htaccess | 18 - library/jqupload/server/php/index.php | 19 - library/jqupload/test/index.html | 166 --- library/jqupload/test/test.js | 1288 ------------------ 56 files changed, 10173 deletions(-) delete mode 100644 library/jqupload/.gitignore delete mode 100644 library/jqupload/.jshintrc delete mode 100644 library/jqupload/CONTRIBUTING.md delete mode 100644 library/jqupload/Gruntfile.js delete mode 100644 library/jqupload/README.md delete mode 100644 library/jqupload/angularjs.html delete mode 100644 library/jqupload/basic-plus.html delete mode 100644 library/jqupload/basic.html delete mode 100644 library/jqupload/blueimp-file-upload.jquery.json delete mode 100644 library/jqupload/bower.json delete mode 100644 library/jqupload/cors/postmessage.html delete mode 100644 library/jqupload/cors/result.html delete mode 100644 library/jqupload/css/demo-ie8.css delete mode 100644 library/jqupload/css/demo.css delete mode 100644 library/jqupload/css/jquery.fileupload-noscript.css delete mode 100644 library/jqupload/css/jquery.fileupload-ui-noscript.css delete mode 100644 library/jqupload/css/jquery.fileupload-ui.css delete mode 100644 library/jqupload/css/jquery.fileupload.css delete mode 100644 library/jqupload/css/style.css delete mode 100644 library/jqupload/img/loading.gif delete mode 100644 library/jqupload/img/progressbar.gif delete mode 100644 library/jqupload/index.html delete mode 100644 library/jqupload/jquery-ui.html delete mode 100644 library/jqupload/js/app.js delete mode 100644 library/jqupload/js/cors/jquery.postmessage-transport.js delete mode 100644 library/jqupload/js/cors/jquery.xdr-transport.js delete mode 100644 library/jqupload/js/jquery.fileupload-angular.js delete mode 100644 library/jqupload/js/jquery.fileupload-audio.js delete mode 100644 library/jqupload/js/jquery.fileupload-image.js delete mode 100755 library/jqupload/js/jquery.fileupload-jquery-ui.js delete mode 100644 library/jqupload/js/jquery.fileupload-process.js delete mode 100644 library/jqupload/js/jquery.fileupload-ui.js delete mode 100644 library/jqupload/js/jquery.fileupload-validate.js delete mode 100644 library/jqupload/js/jquery.fileupload-video.js delete mode 100644 library/jqupload/js/jquery.fileupload.js delete mode 100644 library/jqupload/js/jquery.iframe-transport.js delete mode 100644 library/jqupload/js/main.js delete mode 100644 library/jqupload/js/vendor/jquery.ui.widget.js delete mode 100644 library/jqupload/package.json delete mode 100644 library/jqupload/server/gae-go/app.yaml delete mode 100644 library/jqupload/server/gae-go/app/main.go delete mode 100644 library/jqupload/server/gae-go/static/robots.txt delete mode 100644 library/jqupload/server/gae-python/app.yaml delete mode 100644 library/jqupload/server/gae-python/main.py delete mode 100644 library/jqupload/server/gae-python/static/robots.txt delete mode 100644 library/jqupload/server/node/.gitignore delete mode 100644 library/jqupload/server/node/package.json delete mode 100644 library/jqupload/server/node/public/files/.gitignore delete mode 100755 library/jqupload/server/node/server.js delete mode 100644 library/jqupload/server/node/tmp/.gitignore delete mode 100644 library/jqupload/server/php/UploadHandler.php delete mode 100644 library/jqupload/server/php/files/.gitignore delete mode 100644 library/jqupload/server/php/files/.htaccess delete mode 100644 library/jqupload/server/php/index.php delete mode 100644 library/jqupload/test/index.html delete mode 100644 library/jqupload/test/test.js diff --git a/library/jqupload/.gitignore b/library/jqupload/.gitignore deleted file mode 100644 index 29a41a8c4..000000000 --- a/library/jqupload/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -.DS_Store -*.pyc -node_modules diff --git a/library/jqupload/.jshintrc b/library/jqupload/.jshintrc deleted file mode 100644 index 4ad82e664..000000000 --- a/library/jqupload/.jshintrc +++ /dev/null @@ -1,81 +0,0 @@ -{ - "bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.) - "camelcase" : true, // true: Identifiers must be in camelCase - "curly" : true, // true: Require {} for every new block or scope - "eqeqeq" : true, // true: Require triple equals (===) for comparison - "forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty() - "immed" : true, // true: Require immediate invocations to be wrapped in parens - // e.g. `(function () { } ());` - "indent" : 4, // {int} Number of spaces to use for indentation - "latedef" : true, // true: Require variables/functions to be defined before being used - "newcap" : true, // true: Require capitalization of all constructor functions e.g. `new F()` - "noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee` - "noempty" : true, // true: Prohibit use of empty blocks - "nonew" : true, // true: Prohibit use of constructors for side-effects (without assignment) - "plusplus" : false, // true: Prohibit use of `++` & `--` - "quotmark" : "single", // Quotation mark consistency: - // false : do nothing (default) - // true : ensure whatever is used is consistent - // "single" : require single quotes - // "double" : require double quotes - "undef" : true, // true: Require all non-global variables to be declared (prevents global leaks) - "unused" : true, // true: Require all defined variables be used - "strict" : true, // true: Requires all functions run in ES5 Strict Mode - "trailing" : true, // true: Prohibit trailing whitespaces - "maxparams" : false, // {int} Max number of formal params allowed per function - "maxdepth" : false, // {int} Max depth of nested blocks (within functions) - "maxstatements" : false, // {int} Max number statements per function - "maxcomplexity" : false, // {int} Max cyclomatic complexity per function - "maxlen" : false, // {int} Max number of characters per line - - // Relaxing - "asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons) - "boss" : false, // true: Tolerate assignments where comparisons would be expected - "debug" : false, // true: Allow debugger statements e.g. browser breakpoints. - "eqnull" : false, // true: Tolerate use of `== null` - "es5" : false, // true: Allow ES5 syntax (ex: getters and setters) - "esnext" : false, // true: Allow ES.next (ES6) syntax (ex: `const`) - "moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features) - // (ex: `for each`, multiple try/catch, function expression…) - "evil" : false, // true: Tolerate use of `eval` and `new Function()` - "expr" : false, // true: Tolerate `ExpressionStatement` as Programs - "funcscope" : false, // true: Tolerate defining variables inside control statements" - "globalstrict" : false, // true: Allow global "use strict" (also enables 'strict') - "iterator" : false, // true: Tolerate using the `__iterator__` property - "lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block - "laxbreak" : false, // true: Tolerate possibly unsafe line breakings - "laxcomma" : false, // true: Tolerate comma-first style coding - "loopfunc" : false, // true: Tolerate functions being defined in loops - "multistr" : false, // true: Tolerate multi-line strings - "proto" : false, // true: Tolerate using the `__proto__` property - "scripturl" : false, // true: Tolerate script-targeted URLs - "smarttabs" : false, // true: Tolerate mixed tabs/spaces when used for alignment - "shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;` - "sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation - "supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;` - "validthis" : false, // true: Tolerate using this in a non-constructor function - - // Environments - "browser" : false, // Web Browser (window, document, etc) - "couch" : false, // CouchDB - "devel" : false, // Development/debugging (alert, confirm, etc) - "dojo" : false, // Dojo Toolkit - "jquery" : false, // jQuery - "mootools" : false, // MooTools - "node" : false, // Node.js - "nonstandard" : false, // Widely adopted globals (escape, unescape, etc) - "prototypejs" : false, // Prototype and Scriptaculous - "rhino" : false, // Rhino - "worker" : false, // Web Workers - "wsh" : false, // Windows Scripting Host - "yui" : false, // Yahoo User Interface - - // Legacy - "nomen" : true, // true: Prohibit dangling `_` in variables - "onevar" : true, // true: Allow only one `var` statement per function - "passfail" : false, // true: Stop on first error - "white" : true, // true: Check against strict whitespace and indentation rules - - // Custom Globals - "globals" : {} // additional predefined global variables -} diff --git a/library/jqupload/CONTRIBUTING.md b/library/jqupload/CONTRIBUTING.md deleted file mode 100644 index 2326ad031..000000000 --- a/library/jqupload/CONTRIBUTING.md +++ /dev/null @@ -1,42 +0,0 @@ -# Issue Guidelines - -The issues tracker should only be used for **bugs** or **feature requests**. - -Please post **support requests** and **general discussions** about this project to the [support forum](https://groups.google.com/d/forum/jquery-fileupload). - -## Bugs - -Please follow these guidelines before reporting a bug: - -1. **Update to the latest version** — Check if you can reproduce the issue with the latest version from the `master` branch. - -2. **Use the GitHub issue search** — check if the issue has already been reported. If it has been, please comment on the existing issue. - -3. **Isolate the demonstrable problem** — Try to reproduce the problem with the [Demo](http://blueimp.github.io/jQuery-File-Upload/) or with a reduced test case that includes the least amount of code necessary to reproduce the problem. - -4. **Provide a means to reproduce the problem** — Please provide as much details as possible, e.g. server information, browser and operating system versions, steps to reproduce the problem. If possible, provide a link to your reduced test case, e.g. via [JSFiddle](http://jsfiddle.net/). - - -## Feature requests - -Please follow the bug guidelines above for feature requests, i.e. update to the latest version and search for exising issues before posting a new request. - -Generally, feature requests might be accepted if the implementation would benefit a broader use case or the project could be considered incomplete without that feature. - -If you need help integrating this project into another framework, please post your request to the [support forum](https://groups.google.com/d/forum/jquery-fileupload). - -## Pull requests - -[Pull requests](https://help.github.com/articles/using-pull-requests) are welcome and the preferred way of accepting code contributions. - -However, if you add a server-side upload handler implementation for another framework, please continue to maintain this version in your own fork without sending a pull request. You are welcome to add a link and possibly documentation about your implementation to the [Wiki](https://github.com/blueimp/jQuery-File-Upload/wiki). - -Please follow these guidelines before sending a pull request: - -1. Update your fork to the latest upstream version. - -2. Follow the coding conventions of the original repository. Changes to one of the JavaScript source files are required to pass the [JSLint](http://jslint.com/) validation tool. - -3. Keep your commits as atomar as possible, i.e. create a new commit for every single bug fix or feature added. - -4. Always add meaningfull commit messages. diff --git a/library/jqupload/Gruntfile.js b/library/jqupload/Gruntfile.js deleted file mode 100644 index dcdb5d57a..000000000 --- a/library/jqupload/Gruntfile.js +++ /dev/null @@ -1,37 +0,0 @@ -/* - * jQuery File Upload Gruntfile - * https://github.com/blueimp/jQuery-File-Upload - * - * Copyright 2013, Sebastian Tschan - * https://blueimp.net - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT - */ - -/*global module */ - -module.exports = function (grunt) { - 'use strict'; - - grunt.initConfig({ - jshint: { - options: { - jshintrc: '.jshintrc' - }, - all: [ - 'Gruntfile.js', - 'js/cors/*.js', - 'js/*.js', - 'server/node/server.js', - 'test/test.js' - ] - } - }); - - grunt.loadNpmTasks('grunt-contrib-jshint'); - grunt.loadNpmTasks('grunt-bump-build-git'); - grunt.registerTask('test', ['jshint']); - grunt.registerTask('default', ['test']); - -}; diff --git a/library/jqupload/README.md b/library/jqupload/README.md deleted file mode 100644 index 726e6b342..000000000 --- a/library/jqupload/README.md +++ /dev/null @@ -1,123 +0,0 @@ -# jQuery File Upload Plugin - -## Demo -[Demo File Upload](http://blueimp.github.io/jQuery-File-Upload/) - -## Description -File Upload widget with multiple file selection, drag&drop support, progress bars, validation and preview images, audio and video for jQuery. -Supports cross-domain, chunked and resumable file uploads and client-side image resizing. Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads. - -## Setup -* [How to setup the plugin on your website](https://github.com/blueimp/jQuery-File-Upload/wiki/Setup) -* [How to use only the basic plugin (minimal setup guide).](https://github.com/blueimp/jQuery-File-Upload/wiki/Basic-plugin) - -## Support - -* **[Support Forum](https://groups.google.com/d/forum/jquery-fileupload)** -**Support requests** and **general discussions** about the File Upload plugin can be posted to the official -[Support Forum](https://groups.google.com/d/forum/jquery-fileupload). -If your question is not directly related to the File Upload plugin, you might have a better chance to get a reply by posting to [Stack Overflow](http://stackoverflow.com/questions/tagged/blueimp+jquery+file-upload). - -* Bugs and Feature requests -**Bugs** and **Feature requests** can be reported using the [issues tracker](https://github.com/blueimp/jQuery-File-Upload/issues). -Please read the [issue guidelines](https://github.com/blueimp/jQuery-File-Upload/blob/master/CONTRIBUTING.md) before posting. - -## Features -* **Multiple file upload:** - Allows to select multiple files at once and upload them simultaneously. -* **Drag & Drop support:** - Allows to upload files by dragging them from your desktop or filemanager and dropping them on your browser window. -* **Upload progress bar:** - Shows a progress bar indicating the upload progress for individual files and for all uploads combined. -* **Cancelable uploads:** - Individual file uploads can be canceled to stop the upload progress. -* **Resumable uploads:** - Aborted uploads can be resumed with browsers supporting the Blob API. -* **Chunked uploads:** - Large files can be uploaded in smaller chunks with browsers supporting the Blob API. -* **Client-side image resizing:** - Images can be automatically resized on client-side with browsers supporting the required JS APIs. -* **Preview images, audio and video:** - A preview of image, audio and video files can be displayed before uploading with browsers supporting the required APIs. -* **No browser plugins (e.g. Adobe Flash) required:** - The implementation is based on open standards like HTML5 and JavaScript and requires no additional browser plugins. -* **Graceful fallback for legacy browsers:** - Uploads files via XMLHttpRequests if supported and uses iframes as fallback for legacy browsers. -* **HTML file upload form fallback:** - Allows progressive enhancement by using a standard HTML file upload form as widget element. -* **Cross-site file uploads:** - Supports uploading files to a different domain with cross-site XMLHttpRequests or iframe redirects. -* **Multiple plugin instances:** - Allows to use multiple plugin instances on the same webpage. -* **Customizable and extensible:** - Provides an API to set individual options and define callBack methods for various upload events. -* **Multipart and file contents stream uploads:** - Files can be uploaded as standard "multipart/form-data" or file contents stream (HTTP PUT file upload). -* **Compatible with any server-side application platform:** - Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads. - -## Requirements - -### Mandatory requirements -* [jQuery](http://jquery.com/) v. 1.6+ -* [jQuery UI widget factory](http://api.jqueryui.com/jQuery.widget/) v. 1.9+ (included) -* [jQuery Iframe Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/jquery.iframe-transport.js) (included) - -The jQuery UI widget factory is a requirement for the basic File Upload plugin, but very lightweight without any other dependencies from the jQuery UI suite. - -The jQuery Iframe Transport is required for [browsers without XHR file upload support](https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support). - -### Optional requirements -* [JavaScript Templates engine](https://github.com/blueimp/JavaScript-Templates) v. 2.5.3+ -* [JavaScript Load Image library](https://github.com/blueimp/JavaScript-Load-Image) v. 1.11.0+ -* [JavaScript Canvas to Blob polyfill](https://github.com/blueimp/JavaScript-Canvas-to-Blob) v. 2.1.0+ -* [blueimp Gallery](https://github.com/blueimp/Gallery) v. 2.12.0+ -* [Bootstrap CSS framework](http://getbootstrap.com/) v. 3.0.0+ -* [Glyphicons](http://glyphicons.com/) - -The JavaScript Templates engine is used to render the selected and uploaded files for the Basic Plus UI and jQuery UI versions. - -The JavaScript Load Image library and JavaScript Canvas to Blob polyfill are required for the image previews and resizing functionality. - -The blueimp Gallery is used to display the uploaded images in a lightbox. - -The user interface of all versions except the jQuery UI version is built with Twitter's [Bootstrap](http://getbootstrap.com/) framework and icons from [Glyphicons](http://glyphicons.com/). - -### Cross-domain requirements -[Cross-domain File Uploads](https://github.com/blueimp/jQuery-File-Upload/wiki/Cross-domain-uploads) using the [Iframe Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/jquery.iframe-transport.js) require a redirect back to the origin server to retrieve the upload results. The [example implementation](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/main.js) makes use of [result.html](https://github.com/blueimp/jQuery-File-Upload/blob/master/cors/result.html) as a static redirect page for the origin server. - -The repository also includes the [jQuery XDomainRequest Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/cors/jquery.xdr-transport.js), which enables limited cross-domain AJAX requests in Microsoft Internet Explorer 8 and 9 (IE 10 supports cross-domain XHR requests). -The XDomainRequest object allows GET and POST requests only and doesn't support file uploads. It is used on the [Demo](http://blueimp.github.io/jQuery-File-Upload/) to delete uploaded files from the cross-domain demo file upload service. - -## Browsers - -### Desktop browsers -The File Upload plugin is regularly tested with the latest browser versions and supports the following minimal versions: - -* Google Chrome -* Apple Safari 4.0+ -* Mozilla Firefox 3.0+ -* Opera 11.0+ -* Microsoft Internet Explorer 6.0+ - -### Mobile browsers -The File Upload plugin has been tested with and supports the following mobile browsers: - -* Apple Safari on iOS 6.0+ -* Google Chrome on iOS 6.0+ -* Google Chrome on Android 4.0+ -* Default Browser on Android 2.3+ -* Opera Mobile 12.0+ - -### Supported features -For a detailed overview of the features supported by each browser version please have a look at the [Extended browser support information](https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support). - -## License -Released under the [MIT license](http://www.opensource.org/licenses/MIT). - -## Donations -jQuery File Upload is free software, but you can donate to support the developer, Sebastian Tschan: - -Flattr: [![Flattr](https://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/thing/286433/jQuery-File-Upload-Plugin) - -PayPal: [![PayPal](https://www.paypalobjects.com/WEBSCR-640-20110429-1/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=PYWYSYP77KL54) diff --git a/library/jqupload/angularjs.html b/library/jqupload/angularjs.html deleted file mode 100644 index d578cfa57..000000000 --- a/library/jqupload/angularjs.html +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - -jQuery File Upload Demo - AngularJS version - - - - - - - - - - - - - - - - - - -

jQuery File Upload Demo

AngularJS version

-
-

-
File Upload widget with multiple file selection, drag&drop support, progress bars, validation and preview images, audio and video for AngularJS.
- Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
- Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.
-

-
- - - - - -

- - - - Add files... - - - - - - -

- -

- - - - - - - - -

- - - - -	- - - {{file.name}} - {{file.name}} - - {{file.name}} - - {{file.error}} -	- {{file.size \| formatFileSize}} - -	- - - -

- -
-

Demo Notes

The maximum file size for uploads in this demo is 5 MB (default file size is unlimited).
Only image files (JPG, GIF, PNG) are allowed in this demo (by default there is no file type restriction).
Uploaded files will be deleted automatically after 5 minutes (demo setting).
You can drag & drop files from your desktop on this webpage (see Browser support).
Please refer to the project website and documentation for more information.
Built with Twitter's Bootstrap CSS framework and Icons from Glyphicons.

- -

- ‹ - › - × - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/library/jqupload/basic-plus.html b/library/jqupload/basic-plus.html deleted file mode 100644 index dc90bd768..000000000 --- a/library/jqupload/basic-plus.html +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - -jQuery File Upload Demo - Basic Plus version - - - - - - - - - - - -

jQuery File Upload Demo

Basic Plus version

-
-

-
File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images, audio and video for jQuery.
- Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
- Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.
-

-
- - - - Add files... - - - -
-
- -

- -

-
-

Demo Notes

The maximum file size for uploads in this demo is 5 MB (default file size is unlimited).
Only image files (JPG, GIF, PNG) are allowed in this demo (by default there is no file type restriction).
Uploaded files will be deleted automatically after 5 minutes (demo setting).
You can drag & drop files from your desktop on this webpage (see Browser support).
Please refer to the project website and documentation for more information.
Built with Twitter's Bootstrap CSS framework and Icons from Glyphicons.

- - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/library/jqupload/basic.html b/library/jqupload/basic.html deleted file mode 100644 index ea5d0e66f..000000000 --- a/library/jqupload/basic.html +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - -jQuery File Upload Demo - Basic version - - - - - - - - - - - -

jQuery File Upload Demo

Basic version

-
-

-
File Upload widget with multiple file selection, drag&drop support and progress bar for jQuery.
- Supports cross-domain, chunked and resumable file uploads.
- Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.
-

-
- - - - Select files... - - - -
-
- -

- -

-
-

Demo Notes

The maximum file size for uploads in this demo is 5 MB (default file size is unlimited).
Only image files (JPG, GIF, PNG) are allowed in this demo (by default there is no file type restriction).
Uploaded files will be deleted automatically after 5 minutes (demo setting).
You can drag & drop files from your desktop on this webpage (see Browser support).
Please refer to the project website and documentation for more information.
Built with Twitter's Bootstrap CSS framework and Icons from Glyphicons.

- - - - - - - - - - - - diff --git a/library/jqupload/blueimp-file-upload.jquery.json b/library/jqupload/blueimp-file-upload.jquery.json deleted file mode 100644 index 8382fb4b9..000000000 --- a/library/jqupload/blueimp-file-upload.jquery.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "name": "blueimp-file-upload", - "version": "9.5.2", - "title": "jQuery File Upload", - "author": { - "name": "Sebastian Tschan", - "url": "https://blueimp.net" - }, - "licenses": [ - { - "type": "MIT", - "url": "http://www.opensource.org/licenses/MIT" - } - ], - "dependencies": { - "jquery": ">=1.6" - }, - "description": "File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.", - "keywords": [ - "jquery", - "file", - "upload", - "widget", - "multiple", - "selection", - "drag", - "drop", - "progress", - "preview", - "cross-domain", - "cross-site", - "chunk", - "resume", - "gae", - "go", - "python", - "php", - "bootstrap" - ], - "homepage": "https://github.com/blueimp/jQuery-File-Upload", - "docs": "https://github.com/blueimp/jQuery-File-Upload/wiki", - "demo": "http://blueimp.github.io/jQuery-File-Upload/", - "bugs": "https://github.com/blueimp/jQuery-File-Upload/issues", - "maintainers": [ - { - "name": "Sebastian Tschan", - "url": "https://blueimp.net" - } - ] -} diff --git a/library/jqupload/bower.json b/library/jqupload/bower.json deleted file mode 100644 index 54ba68f82..000000000 --- a/library/jqupload/bower.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "name": "blueimp-file-upload", - "version": "9.5.2", - "title": "jQuery File Upload", - "description": "File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.", - "keywords": [ - "jquery", - "file", - "upload", - "widget", - "multiple", - "selection", - "drag", - "drop", - "progress", - "preview", - "cross-domain", - "cross-site", - "chunk", - "resume", - "gae", - "go", - "python", - "php", - "bootstrap" - ], - "homepage": "https://github.com/blueimp/jQuery-File-Upload", - "author": { - "name": "Sebastian Tschan", - "url": "https://blueimp.net" - }, - "maintainers": [ - { - "name": "Sebastian Tschan", - "url": "https://blueimp.net" - } - ], - "repository": { - "type": "git", - "url": "git://github.com/blueimp/jQuery-File-Upload.git" - }, - "bugs": "https://github.com/blueimp/jQuery-File-Upload/issues", - "licenses": [ - { - "type": "MIT", - "url": "http://www.opensource.org/licenses/MIT" - } - ], - "dependencies": { - "jquery": ">=1.6", - "blueimp-tmpl": ">=2.5.3", - "blueimp-load-image": ">=1.11.0", - "blueimp-canvas-to-blob": ">=2.1.0" - }, - "main": [ - "css/jquery.fileupload.css", - "css/jquery.fileupload-ui.css", - "css/jquery.fileupload-noscript.css", - "css/jquery.fileupload-ui-noscript.css", - "js/cors/jquery.postmessage-transport.js", - "js/cors/jquery.xdr-transport.js", - "js/vendor/jquery.ui.widget.js", - "js/jquery.fileupload.js", - "js/jquery.fileupload-process.js", - "js/jquery.fileupload-validate.js", - "js/jquery.fileupload-image.js", - "js/jquery.fileupload-audio.js", - "js/jquery.fileupload-video.js", - "js/jquery.fileupload-ui.js", - "js/jquery.fileupload-jquery-ui.js", - "js/jquery.fileupload-angular.js", - "js/jquery.iframe-transport.js" - ], - "ignore": [ - "/*.*", - "/cors", - "css/demo-ie8.css", - "css/demo.css", - "css/style.css", - "js/app.js", - "js/main.js", - "server", - "test" - ] -} diff --git a/library/jqupload/cors/postmessage.html b/library/jqupload/cors/postmessage.html deleted file mode 100644 index 3d1448f08..000000000 --- a/library/jqupload/cors/postmessage.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - -jQuery File Upload Plugin postMessage API - - - - - - \ No newline at end of file diff --git a/library/jqupload/cors/result.html b/library/jqupload/cors/result.html deleted file mode 100644 index 225131495..000000000 --- a/library/jqupload/cors/result.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - -jQuery Iframe Transport Plugin Redirect Page - - - - - diff --git a/library/jqupload/css/demo-ie8.css b/library/jqupload/css/demo-ie8.css deleted file mode 100644 index 262493d08..000000000 --- a/library/jqupload/css/demo-ie8.css +++ /dev/null @@ -1,21 +0,0 @@ -@charset "UTF-8"; -/* - * jQuery File Upload Demo CSS Fixes for IE<9 1.0.0 - * https://github.com/blueimp/jQuery-File-Upload - * - * Copyright 2013, Sebastian Tschan - * https://blueimp.net - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT - */ - -.navigation { - list-style: none; - padding: 0; - margin: 1em 0; -} -.navigation li { - display: inline; - margin-right: 10px; -} diff --git a/library/jqupload/css/demo.css b/library/jqupload/css/demo.css deleted file mode 100644 index 2b4d43934..000000000 --- a/library/jqupload/css/demo.css +++ /dev/null @@ -1,67 +0,0 @@ -@charset "UTF-8"; -/* - * jQuery File Upload Demo CSS 1.1.0 - * https://github.com/blueimp/jQuery-File-Upload - * - * Copyright 2013, Sebastian Tschan - * https://blueimp.net - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT - */ - -body { - max-width: 750px; - margin: 0 auto; - padding: 1em; - font-family: "Lucida Grande", "Lucida Sans Unicode", Arial, sans-serif; - font-size: 1em; - line-height: 1.4em; - background: #222; - color: #fff; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -} -a { - color: orange; - text-decoration: none; -} -img { - border: 0; - vertical-align: middle; -} -h1 { - line-height: 1em; -} -blockquote { - padding: 0 0 0 15px; - margin: 0 0 20px; - border-left: 5px solid #eee; -} -table { - width: 100%; - margin: 10px 0; -} - -.fileupload-progress { - margin: 10px 0; -} -.fileupload-progress .progress-extended { - margin-top: 5px; -} -.error { - color: red; -} - -@media (min-width: 481px) { - .navigation { - list-style: none; - padding: 0; - } - .navigation li { - display: inline-block; - } - .navigation li:not(:first-child):before { - content: "| "; - } -} diff --git a/library/jqupload/css/jquery.fileupload-noscript.css b/library/jqupload/css/jquery.fileupload-noscript.css deleted file mode 100644 index 64d728fc3..000000000 --- a/library/jqupload/css/jquery.fileupload-noscript.css +++ /dev/null @@ -1,22 +0,0 @@ -@charset "UTF-8"; -/* - * jQuery File Upload Plugin NoScript CSS 1.2.0 - * https://github.com/blueimp/jQuery-File-Upload - * - * Copyright 2013, Sebastian Tschan - * https://blueimp.net - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT - */ - -.fileinput-button input { - position: static; - opacity: 1; - filter: none; - font-size: inherit; - direction: inherit; -} -.fileinput-button span { - display: none; -} diff --git a/library/jqupload/css/jquery.fileupload-ui-noscript.css b/library/jqupload/css/jquery.fileupload-ui-noscript.css deleted file mode 100644 index 87f110cdb..000000000 --- a/library/jqupload/css/jquery.fileupload-ui-noscript.css +++ /dev/null @@ -1,17 +0,0 @@ -@charset "UTF-8"; -/* - * jQuery File Upload UI Plugin NoScript CSS 8.8.5 - * https://github.com/blueimp/jQuery-File-Upload - * - * Copyright 2012, Sebastian Tschan - * https://blueimp.net - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT - */ - -.fileinput-button i, -.fileupload-buttonbar .delete, -.fileupload-buttonbar .toggle { - display: none; -} diff --git a/library/jqupload/css/jquery.fileupload-ui.css b/library/jqupload/css/jquery.fileupload-ui.css deleted file mode 100644 index 76fb376de..000000000 --- a/library/jqupload/css/jquery.fileupload-ui.css +++ /dev/null @@ -1,57 +0,0 @@ -@charset "UTF-8"; -/* - * jQuery File Upload UI Plugin CSS 9.0.0 - * https://github.com/blueimp/jQuery-File-Upload - * - * Copyright 2010, Sebastian Tschan - * https://blueimp.net - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT - */ - -.fileupload-buttonbar .btn, -.fileupload-buttonbar .toggle { - margin-bottom: 5px; -} -.progress-animated .progress-bar, -.progress-animated .bar { - background: url("../img/progressbar.gif") !important; - filter: none; -} -.fileupload-process { - float: right; - display: none; -} -.fileupload-processing .fileupload-process, -.files .processing .preview { - display: block; - width: 32px; - height: 32px; - background: url("../img/loading.gif") center no-repeat; - background-size: contain; -} -.files audio, -.files video { - max-width: 300px; -} - -@media (max-width: 767px) { - .fileupload-buttonbar .toggle, - .files .toggle, - .files .btn span { - display: none; - } - .files .name { - width: 80px; - word-wrap: break-word; - } - .files audio, - .files video { - max-width: 80px; - } - .files img, - .files canvas { - max-width: 100%; - } -} diff --git a/library/jqupload/css/jquery.fileupload.css b/library/jqupload/css/jquery.fileupload.css deleted file mode 100644 index fb6044d34..000000000 --- a/library/jqupload/css/jquery.fileupload.css +++ /dev/null @@ -1,36 +0,0 @@ -@charset "UTF-8"; -/* - * jQuery File Upload Plugin CSS 1.3.0 - * https://github.com/blueimp/jQuery-File-Upload - * - * Copyright 2013, Sebastian Tschan - * https://blueimp.net - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT - */ - -.fileinput-button { - position: relative; - overflow: hidden; -} -.fileinput-button input { - position: absolute; - top: 0; - right: 0; - margin: 0; - opacity: 0; - -ms-filter: 'alpha(opacity=0)'; - font-size: 200px; - direction: ltr; - cursor: pointer; -} - -/* Fixes for IE < 8 */ -@media screen\9 { - .fileinput-button input { - filter: alpha(opacity=0); - font-size: 100%; - height: 100%; - } -} diff --git a/library/jqupload/css/style.css b/library/jqupload/css/style.css deleted file mode 100644 index b2c60a6f1..000000000 --- a/library/jqupload/css/style.css +++ /dev/null @@ -1,15 +0,0 @@ -@charset "UTF-8"; -/* - * jQuery File Upload Plugin CSS Example 8.8.2 - * https://github.com/blueimp/jQuery-File-Upload - * - * Copyright 2013, Sebastian Tschan - * https://blueimp.net - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT - */ - -body { - padding-top: 60px; -} diff --git a/library/jqupload/img/loading.gif b/library/jqupload/img/loading.gif deleted file mode 100644 index 90f28cbdb..000000000 Binary files a/library/jqupload/img/loading.gif and /dev/null differ diff --git a/library/jqupload/img/progressbar.gif b/library/jqupload/img/progressbar.gif deleted file mode 100644 index fbcce6bc9..000000000 Binary files a/library/jqupload/img/progressbar.gif and /dev/null differ diff --git a/library/jqupload/index.html b/library/jqupload/index.html deleted file mode 100644 index a3a06aa9b..000000000 --- a/library/jqupload/index.html +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - -jQuery File Upload Demo - - - - - - - - - - - - - - - - - -

jQuery File Upload Demo

Basic Plus UI version

-
-

-
File Upload widget with multiple file selection, drag&drop support, progress bars, validation and preview images, audio and video for jQuery.
- Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
- Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.
-

-
- - -
-

Demo Notes

The maximum file size for uploads in this demo is 5 MB (default file size is unlimited).
Only image files (JPG, GIF, PNG) are allowed in this demo (by default there is no file type restriction).
Uploaded files will be deleted automatically after 5 minutes (demo setting).
You can drag & drop files from your desktop on this webpage (see Browser support).
Please refer to the project website and documentation for more information.
Built with Twitter's Bootstrap CSS framework and Icons from Glyphicons.

- -

- ‹ - › - × - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/library/jqupload/jquery-ui.html b/library/jqupload/jquery-ui.html deleted file mode 100644 index 993a4c815..000000000 --- a/library/jqupload/jquery-ui.html +++ /dev/null @@ -1,250 +0,0 @@ - - - - - - - -jQuery File Upload Demo - jQuery UI version - - - - - - - - - - - - - - - - - - - -

jQuery File Upload Demo

jQuery UI version

- - -

-
File Upload widget with multiple file selection, drag&drop support, progress bars, validation and preview images, audio and video for jQuery UI.
- Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
- Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.
-

- - -
-

Demo Notes

The maximum file size for uploads in this demo is 5 MB (default file size is unlimited).
Only image files (JPG, GIF, PNG) are allowed in this demo (by default there is no file type restriction).
Uploaded files will be deleted automatically after 5 minutes (demo setting).
You can drag & drop files from your desktop on this webpage (see Browser support).
Please refer to the project website and documentation for more information.
Built with jQuery UI.

- -

- ‹ - › - × - -

') - .text('Upload server currently unavailable - ' + - new Date()) - .appendTo('#fileupload'); - }); - } - } else { - // Load existing files: - $('#fileupload').addClass('fileupload-processing'); - $.ajax({ - // Uncomment the following to send cross-domain cookies: - //xhrFields: {withCredentials: true}, - url: $('#fileupload').fileupload('option', 'url'), - dataType: 'json', - context: $('#fileupload')[0] - }).always(function () { - $(this).removeClass('fileupload-processing'); - }).done(function (result) { - $(this).fileupload('option', 'done') - .call(this, $.Event('done'), {result: result}); - }); - } - -}); diff --git a/library/jqupload/js/vendor/jquery.ui.widget.js b/library/jqupload/js/vendor/jquery.ui.widget.js deleted file mode 100644 index 2d370893a..000000000 --- a/library/jqupload/js/vendor/jquery.ui.widget.js +++ /dev/null @@ -1,530 +0,0 @@ -/* - * jQuery UI Widget 1.10.3+amd - * https://github.com/blueimp/jQuery-File-Upload - * - * Copyright 2013 jQuery Foundation and other contributors - * Released under the MIT license. - * http://jquery.org/license - * - * http://api.jqueryui.com/jQuery.widget/ - */ - -(function (factory) { - if (typeof define === "function" && define.amd) { - // Register as an anonymous AMD module: - define(["jquery"], factory); - } else { - // Browser globals: - factory(jQuery); - } -}(function( $, undefined ) { - -var uuid = 0, - slice = Array.prototype.slice, - _cleanData = $.cleanData; -$.cleanData = function( elems ) { - for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) { - try { - $( elem ).triggerHandler( "remove" ); - // http://bugs.jquery.com/ticket/8235 - } catch( e ) {} - } - _cleanData( elems ); -}; - -$.widget = function( name, base, prototype ) { - var fullName, existingConstructor, constructor, basePrototype, - // proxiedPrototype allows the provided prototype to remain unmodified - // so that it can be used as a mixin for multiple widgets (#8876) - proxiedPrototype = {}, - namespace = name.split( "." )[ 0 ]; - - name = name.split( "." )[ 1 ]; - fullName = namespace + "-" + name; - - if ( !prototype ) { - prototype = base; - base = $.Widget; - } - - // create selector for plugin - $.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) { - return !!$.data( elem, fullName ); - }; - - $[ namespace ] = $[ namespace ] || {}; - existingConstructor = $[ namespace ][ name ]; - constructor = $[ namespace ][ name ] = function( options, element ) { - // allow instantiation without "new" keyword - if ( !this._createWidget ) { - return new constructor( options, element ); - } - - // allow instantiation without initializing for simple inheritance - // must use "new" keyword (the code above always passes args) - if ( arguments.length ) { - this._createWidget( options, element ); - } - }; - // extend with the existing constructor to carry over any static properties - $.extend( constructor, existingConstructor, { - version: prototype.version, - // copy the object used to create the prototype in case we need to - // redefine the widget later - _proto: $.extend( {}, prototype ), - // track widgets that inherit from this widget in case this widget is - // redefined after a widget inherits from it - _childConstructors: [] - }); - - basePrototype = new base(); - // we need to make the options hash a property directly on the new instance - // otherwise we'll modify the options hash on the prototype that we're - // inheriting from - basePrototype.options = $.widget.extend( {}, basePrototype.options ); - $.each( prototype, function( prop, value ) { - if ( !$.isFunction( value ) ) { - proxiedPrototype[ prop ] = value; - return; - } - proxiedPrototype[ prop ] = (function() { - var _super = function() { - return base.prototype[ prop ].apply( this, arguments ); - }, - _superApply = function( args ) { - return base.prototype[ prop ].apply( this, args ); - }; - return function() { - var __super = this._super, - __superApply = this._superApply, - returnValue; - - this._super = _super; - this._superApply = _superApply; - - returnValue = value.apply( this, arguments ); - - this._super = __super; - this._superApply = __superApply; - - return returnValue; - }; - })(); - }); - constructor.prototype = $.widget.extend( basePrototype, { - // TODO: remove support for widgetEventPrefix - // always use the name + a colon as the prefix, e.g., draggable:start - // don't prefix for widgets that aren't DOM-based - widgetEventPrefix: existingConstructor ? basePrototype.widgetEventPrefix : name - }, proxiedPrototype, { - constructor: constructor, - namespace: namespace, - widgetName: name, - widgetFullName: fullName - }); - - // If this widget is being redefined then we need to find all widgets that - // are inheriting from it and redefine all of them so that they inherit from - // the new version of this widget. We're essentially trying to replace one - // level in the prototype chain. - if ( existingConstructor ) { - $.each( existingConstructor._childConstructors, function( i, child ) { - var childPrototype = child.prototype; - - // redefine the child widget using the same prototype that was - // originally used, but inherit from the new version of the base - $.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto ); - }); - // remove the list of existing child constructors from the old constructor - // so the old child constructors can be garbage collected - delete existingConstructor._childConstructors; - } else { - base._childConstructors.push( constructor ); - } - - $.widget.bridge( name, constructor ); -}; - -$.widget.extend = function( target ) { - var input = slice.call( arguments, 1 ), - inputIndex = 0, - inputLength = input.length, - key, - value; - for ( ; inputIndex < inputLength; inputIndex++ ) { - for ( key in input[ inputIndex ] ) { - value = input[ inputIndex ][ key ]; - if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) { - // Clone objects - if ( $.isPlainObject( value ) ) { - target[ key ] = $.isPlainObject( target[ key ] ) ? - $.widget.extend( {}, target[ key ], value ) : - // Don't extend strings, arrays, etc. with objects - $.widget.extend( {}, value ); - // Copy everything else by reference - } else { - target[ key ] = value; - } - } - } - } - return target; -}; - -$.widget.bridge = function( name, object ) { - var fullName = object.prototype.widgetFullName || name; - $.fn[ name ] = function( options ) { - var isMethodCall = typeof options === "string", - args = slice.call( arguments, 1 ), - returnValue = this; - - // allow multiple hashes to be passed on init - options = !isMethodCall && args.length ? - $.widget.extend.apply( null, [ options ].concat(args) ) : - options; - - if ( isMethodCall ) { - this.each(function() { - var methodValue, - instance = $.data( this, fullName ); - if ( !instance ) { - return $.error( "cannot call methods on " + name + " prior to initialization; " + - "attempted to call method '" + options + "'" ); - } - if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) { - return $.error( "no such method '" + options + "' for " + name + " widget instance" ); - } - methodValue = instance[ options ].apply( instance, args ); - if ( methodValue !== instance && methodValue !== undefined ) { - returnValue = methodValue && methodValue.jquery ? - returnValue.pushStack( methodValue.get() ) : - methodValue; - return false; - } - }); - } else { - this.each(function() { - var instance = $.data( this, fullName ); - if ( instance ) { - instance.option( options || {} )._init(); - } else { - $.data( this, fullName, new object( options, this ) ); - } - }); - } - - return returnValue; - }; -}; - -$.Widget = function( /* options, element */ ) {}; -$.Widget._childConstructors = []; - -$.Widget.prototype = { - widgetName: "widget", - widgetEventPrefix: "", - defaultElement: "

", - options: { - disabled: false, - - // callbacks - create: null - }, - _createWidget: function( options, element ) { - element = $( element || this.defaultElement || this )[ 0 ]; - this.element = $( element ); - this.uuid = uuid++; - this.eventNamespace = "." + this.widgetName + this.uuid; - this.options = $.widget.extend( {}, - this.options, - this._getCreateOptions(), - options ); - - this.bindings = $(); - this.hoverable = $(); - this.focusable = $(); - - if ( element !== this ) { - $.data( element, this.widgetFullName, this ); - this._on( true, this.element, { - remove: function( event ) { - if ( event.target === element ) { - this.destroy(); - } - } - }); - this.document = $( element.style ? - // element within the document - element.ownerDocument : - // element is window or document - element.document || element ); - this.window = $( this.document[0].defaultView || this.document[0].parentWindow ); - } - - this._create(); - this._trigger( "create", null, this._getCreateEventData() ); - this._init(); - }, - _getCreateOptions: $.noop, - _getCreateEventData: $.noop, - _create: $.noop, - _init: $.noop, - - destroy: function() { - this._destroy(); - // we can probably remove the unbind calls in 2.0 - // all event bindings should go through this._on() - this.element - .unbind( this.eventNamespace ) - // 1.9 BC for #7810 - // TODO remove dual storage - .removeData( this.widgetName ) - .removeData( this.widgetFullName ) - // support: jquery <1.6.3 - // http://bugs.jquery.com/ticket/9413 - .removeData( $.camelCase( this.widgetFullName ) ); - this.widget() - .unbind( this.eventNamespace ) - .removeAttr( "aria-disabled" ) - .removeClass( - this.widgetFullName + "-disabled " + - "ui-state-disabled" ); - - // clean up events and states - this.bindings.unbind( this.eventNamespace ); - this.hoverable.removeClass( "ui-state-hover" ); - this.focusable.removeClass( "ui-state-focus" ); - }, - _destroy: $.noop, - - widget: function() { - return this.element; - }, - - option: function( key, value ) { - var options = key, - parts, - curOption, - i; - - if ( arguments.length === 0 ) { - // don't return a reference to the internal hash - return $.widget.extend( {}, this.options ); - } - - if ( typeof key === "string" ) { - // handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } } - options = {}; - parts = key.split( "." ); - key = parts.shift(); - if ( parts.length ) { - curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] ); - for ( i = 0; i < parts.length - 1; i++ ) { - curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {}; - curOption = curOption[ parts[ i ] ]; - } - key = parts.pop(); - if ( value === undefined ) { - return curOption[ key ] === undefined ? null : curOption[ key ]; - } - curOption[ key ] = value; - } else { - if ( value === undefined ) { - return this.options[ key ] === undefined ? null : this.options[ key ]; - } - options[ key ] = value; - } - } - - this._setOptions( options ); - - return this; - }, - _setOptions: function( options ) { - var key; - - for ( key in options ) { - this._setOption( key, options[ key ] ); - } - - return this; - }, - _setOption: function( key, value ) { - this.options[ key ] = value; - - if ( key === "disabled" ) { - this.widget() - .toggleClass( this.widgetFullName + "-disabled ui-state-disabled", !!value ) - .attr( "aria-disabled", value ); - this.hoverable.removeClass( "ui-state-hover" ); - this.focusable.removeClass( "ui-state-focus" ); - } - - return this; - }, - - enable: function() { - return this._setOption( "disabled", false ); - }, - disable: function() { - return this._setOption( "disabled", true ); - }, - - _on: function( suppressDisabledCheck, element, handlers ) { - var delegateElement, - instance = this; - - // no suppressDisabledCheck flag, shuffle arguments - if ( typeof suppressDisabledCheck !== "boolean" ) { - handlers = element; - element = suppressDisabledCheck; - suppressDisabledCheck = false; - } - - // no element argument, shuffle and use this.element - if ( !handlers ) { - handlers = element; - element = this.element; - delegateElement = this.widget(); - } else { - // accept selectors, DOM elements - element = delegateElement = $( element ); - this.bindings = this.bindings.add( element ); - } - - $.each( handlers, function( event, handler ) { - function handlerProxy() { - // allow widgets to customize the disabled handling - // - disabled as an array instead of boolean - // - disabled class as method for disabling individual parts - if ( !suppressDisabledCheck && - ( instance.options.disabled === true || - $( this ).hasClass( "ui-state-disabled" ) ) ) { - return; - } - return ( typeof handler === "string" ? instance[ handler ] : handler ) - .apply( instance, arguments ); - } - - // copy the guid so direct unbinding works - if ( typeof handler !== "string" ) { - handlerProxy.guid = handler.guid = - handler.guid || handlerProxy.guid || $.guid++; - } - - var match = event.match( /^(\w+)\s*(.*)$/ ), - eventName = match[1] + instance.eventNamespace, - selector = match[2]; - if ( selector ) { - delegateElement.delegate( selector, eventName, handlerProxy ); - } else { - element.bind( eventName, handlerProxy ); - } - }); - }, - - _off: function( element, eventName ) { - eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace; - element.unbind( eventName ).undelegate( eventName ); - }, - - _delay: function( handler, delay ) { - function handlerProxy() { - return ( typeof handler === "string" ? instance[ handler ] : handler ) - .apply( instance, arguments ); - } - var instance = this; - return setTimeout( handlerProxy, delay || 0 ); - }, - - _hoverable: function( element ) { - this.hoverable = this.hoverable.add( element ); - this._on( element, { - mouseenter: function( event ) { - $( event.currentTarget ).addClass( "ui-state-hover" ); - }, - mouseleave: function( event ) { - $( event.currentTarget ).removeClass( "ui-state-hover" ); - } - }); - }, - - _focusable: function( element ) { - this.focusable = this.focusable.add( element ); - this._on( element, { - focusin: function( event ) { - $( event.currentTarget ).addClass( "ui-state-focus" ); - }, - focusout: function( event ) { - $( event.currentTarget ).removeClass( "ui-state-focus" ); - } - }); - }, - - _trigger: function( type, event, data ) { - var prop, orig, - callback = this.options[ type ]; - - data = data || {}; - event = $.Event( event ); - event.type = ( type === this.widgetEventPrefix ? - type : - this.widgetEventPrefix + type ).toLowerCase(); - // the original event may come from any element - // so we need to reset the target on the new event - event.target = this.element[ 0 ]; - - // copy original event properties over to the new event - orig = event.originalEvent; - if ( orig ) { - for ( prop in orig ) { - if ( !( prop in event ) ) { - event[ prop ] = orig[ prop ]; - } - } - } - - this.element.trigger( event, data ); - return !( $.isFunction( callback ) && - callback.apply( this.element[0], [ event ].concat( data ) ) === false || - event.isDefaultPrevented() ); - } -}; - -$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) { - $.Widget.prototype[ "_" + method ] = function( element, options, callback ) { - if ( typeof options === "string" ) { - options = { effect: options }; - } - var hasOptions, - effectName = !options ? - method : - options === true || typeof options === "number" ? - defaultEffect : - options.effect || defaultEffect; - options = options || {}; - if ( typeof options === "number" ) { - options = { duration: options }; - } - hasOptions = !$.isEmptyObject( options ); - options.complete = callback; - if ( options.delay ) { - element.delay( options.delay ); - } - if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) { - element[ method ]( options ); - } else if ( effectName !== method && element[ effectName ] ) { - element[ effectName ]( options.duration, options.easing, callback ); - } else { - element.queue(function( next ) { - $( this )[ method ](); - if ( callback ) { - callback.call( element[ 0 ] ); - } - next(); - }); - } - }; -}); - -})); diff --git a/library/jqupload/package.json b/library/jqupload/package.json deleted file mode 100644 index 85852c35a..000000000 --- a/library/jqupload/package.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "name": "blueimp-file-upload", - "version": "9.5.2", - "title": "jQuery File Upload", - "description": "File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.", - "keywords": [ - "jquery", - "file", - "upload", - "widget", - "multiple", - "selection", - "drag", - "drop", - "progress", - "preview", - "cross-domain", - "cross-site", - "chunk", - "resume", - "gae", - "go", - "python", - "php", - "bootstrap" - ], - "homepage": "https://github.com/blueimp/jQuery-File-Upload", - "author": { - "name": "Sebastian Tschan", - "url": "https://blueimp.net" - }, - "maintainers": [ - { - "name": "Sebastian Tschan", - "url": "https://blueimp.net" - } - ], - "repository": { - "type": "git", - "url": "git://github.com/blueimp/jQuery-File-Upload.git" - }, - "bugs": "https://github.com/blueimp/jQuery-File-Upload/issues", - "licenses": [ - { - "type": "MIT", - "url": "http://www.opensource.org/licenses/MIT" - } - ], - "devDependencies": { - "grunt": "~0.4.2", - "grunt-bump-build-git": "~1.1.1", - "grunt-contrib-jshint": "~0.8.0" - } -} diff --git a/library/jqupload/server/gae-go/app.yaml b/library/jqupload/server/gae-go/app.yaml deleted file mode 100644 index 2d09daa56..000000000 --- a/library/jqupload/server/gae-go/app.yaml +++ /dev/null @@ -1,12 +0,0 @@ -application: jquery-file-upload -version: 2 -runtime: go -api_version: go1 - -handlers: -- url: /(favicon\.ico|robots\.txt) - static_files: static/\1 - upload: static/(.*) - expiration: '1d' -- url: /.* - script: _go_app diff --git a/library/jqupload/server/gae-go/app/main.go b/library/jqupload/server/gae-go/app/main.go deleted file mode 100644 index f995f73a8..000000000 --- a/library/jqupload/server/gae-go/app/main.go +++ /dev/null @@ -1,296 +0,0 @@ -/* - * jQuery File Upload Plugin GAE Go Example 3.1.1 - * https://github.com/blueimp/jQuery-File-Upload - * - * Copyright 2011, Sebastian Tschan - * https://blueimp.net - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT - */ - -package app - -import ( - "appengine" - "appengine/blobstore" - "appengine/image" - "appengine/taskqueue" - "bytes" - "encoding/json" - "fmt" - "io" - "log" - "mime/multipart" - "net/http" - "net/url" - "regexp" - "strings" - "time" -) - -const ( - WEBSITE = "http://blueimp.github.io/jQuery-File-Upload/" - MIN_FILE_SIZE = 1 // bytes - MAX_FILE_SIZE = 5000000 // bytes - IMAGE_TYPES = "image/(gif|p?jpeg|(x-)?png)" - ACCEPT_FILE_TYPES = IMAGE_TYPES - EXPIRATION_TIME = 300 // seconds - THUMBNAIL_PARAM = "=s80" -) - -var ( - imageTypes = regexp.MustCompile(IMAGE_TYPES) - acceptFileTypes = regexp.MustCompile(ACCEPT_FILE_TYPES) -) - -type FileInfo struct { - Key appengine.BlobKey `json:"-"` - Url string `json:"url,omitempty"` - ThumbnailUrl string `json:"thumbnailUrl,omitempty"` - Name string `json:"name"` - Type string `json:"type"` - Size int64 `json:"size"` - Error string `json:"error,omitempty"` - DeleteUrl string `json:"deleteUrl,omitempty"` - DeleteType string `json:"deleteType,omitempty"` -} - -func (fi *FileInfo) ValidateType() (valid bool) { - if acceptFileTypes.MatchString(fi.Type) { - return true - } - fi.Error = "Filetype not allowed" - return false -} - -func (fi *FileInfo) ValidateSize() (valid bool) { - if fi.Size < MIN_FILE_SIZE { - fi.Error = "File is too small" - } else if fi.Size > MAX_FILE_SIZE { - fi.Error = "File is too big" - } else { - return true - } - return false -} - -func (fi *FileInfo) CreateUrls(r *http.Request, c appengine.Context) { - u := &url.URL{ - Scheme: r.URL.Scheme, - Host: appengine.DefaultVersionHostname(c), - Path: "/", - } - uString := u.String() - fi.Url = uString + escape(string(fi.Key)) + "/" + - escape(string(fi.Name)) - fi.DeleteUrl = fi.Url + "?delete=true" - fi.DeleteType = "DELETE" - if imageTypes.MatchString(fi.Type) { - servingUrl, err := image.ServingURL( - c, - fi.Key, - &image.ServingURLOptions{ - Secure: strings.HasSuffix(u.Scheme, "s"), - Size: 0, - Crop: false, - }, - ) - check(err) - fi.ThumbnailUrl = servingUrl.String() + THUMBNAIL_PARAM - } -} - -func check(err error) { - if err != nil { - panic(err) - } -} - -func escape(s string) string { - return strings.Replace(url.QueryEscape(s), "+", "%20", -1) -} - -func delayedDelete(c appengine.Context, fi *FileInfo) { - if key := string(fi.Key); key != "" { - task := &taskqueue.Task{ - Path: "/" + escape(key) + "/-", - Method: "DELETE", - Delay: time.Duration(EXPIRATION_TIME) * time.Second, - } - taskqueue.Add(c, task, "") - } -} - -func handleUpload(r *http.Request, p *multipart.Part) (fi *FileInfo) { - fi = &FileInfo{ - Name: p.FileName(), - Type: p.Header.Get("Content-Type"), - } - if !fi.ValidateType() { - return - } - defer func() { - if rec := recover(); rec != nil { - log.Println(rec) - fi.Error = rec.(error).Error() - } - }() - lr := &io.LimitedReader{R: p, N: MAX_FILE_SIZE + 1} - context := appengine.NewContext(r) - w, err := blobstore.Create(context, fi.Type) - defer func() { - w.Close() - fi.Size = MAX_FILE_SIZE + 1 - lr.N - fi.Key, err = w.Key() - check(err) - if !fi.ValidateSize() { - err := blobstore.Delete(context, fi.Key) - check(err) - return - } - delayedDelete(context, fi) - fi.CreateUrls(r, context) - }() - check(err) - _, err = io.Copy(w, lr) - return -} - -func getFormValue(p *multipart.Part) string { - var b bytes.Buffer - io.CopyN(&b, p, int64(1<<20)) // Copy max: 1 MiB - return b.String() -} - -func handleUploads(r *http.Request) (fileInfos []*FileInfo) { - fileInfos = make([]*FileInfo, 0) - mr, err := r.MultipartReader() - check(err) - r.Form, err = url.ParseQuery(r.URL.RawQuery) - check(err) - part, err := mr.NextPart() - for err == nil { - if name := part.FormName(); name != "" { - if part.FileName() != "" { - fileInfos = append(fileInfos, handleUpload(r, part)) - } else { - r.Form[name] = append(r.Form[name], getFormValue(part)) - } - } - part, err = mr.NextPart() - } - return -} - -func get(w http.ResponseWriter, r *http.Request) { - if r.URL.Path == "/" { - http.Redirect(w, r, WEBSITE, http.StatusFound) - return - } - parts := strings.Split(r.URL.Path, "/") - if len(parts) == 3 { - if key := parts[1]; key != "" { - blobKey := appengine.BlobKey(key) - bi, err := blobstore.Stat(appengine.NewContext(r), blobKey) - if err == nil { - w.Header().Add("X-Content-Type-Options", "nosniff") - if !imageTypes.MatchString(bi.ContentType) { - w.Header().Add("Content-Type", "application/octet-stream") - w.Header().Add( - "Content-Disposition", - fmt.Sprintf("attachment; filename=\"%s\"", parts[2]), - ) - } - w.Header().Add( - "Cache-Control", - fmt.Sprintf("public,max-age=%d", EXPIRATION_TIME), - ) - blobstore.Send(w, blobKey) - return - } - } - } - http.Error(w, "404 Not Found", http.StatusNotFound) -} - -func post(w http.ResponseWriter, r *http.Request) { - result := make(map[string][]*FileInfo, 1) - result["files"] = handleUploads(r) - b, err := json.Marshal(result) - check(err) - if redirect := r.FormValue("redirect"); redirect != "" { - if strings.Contains(redirect, "%s") { - redirect = fmt.Sprintf( - redirect, - escape(string(b)), - ) - } - http.Redirect(w, r, redirect, http.StatusFound) - return - } - w.Header().Set("Cache-Control", "no-cache") - jsonType := "application/json" - if strings.Index(r.Header.Get("Accept"), jsonType) != -1 { - w.Header().Set("Content-Type", jsonType) - } - fmt.Fprintln(w, string(b)) -} - -func delete(w http.ResponseWriter, r *http.Request) { - parts := strings.Split(r.URL.Path, "/") - if len(parts) != 3 { - return - } - result := make(map[string]bool, 1) - if key := parts[1]; key != "" { - c := appengine.NewContext(r) - blobKey := appengine.BlobKey(key) - err := blobstore.Delete(c, blobKey) - check(err) - err = image.DeleteServingURL(c, blobKey) - check(err) - result[key] = true - } - jsonType := "application/json" - if strings.Index(r.Header.Get("Accept"), jsonType) != -1 { - w.Header().Set("Content-Type", jsonType) - } - b, err := json.Marshal(result) - check(err) - fmt.Fprintln(w, string(b)) -} - -func handle(w http.ResponseWriter, r *http.Request) { - params, err := url.ParseQuery(r.URL.RawQuery) - check(err) - w.Header().Add("Access-Control-Allow-Origin", "*") - w.Header().Add( - "Access-Control-Allow-Methods", - "OPTIONS, HEAD, GET, POST, PUT, DELETE", - ) - w.Header().Add( - "Access-Control-Allow-Headers", - "Content-Type, Content-Range, Content-Disposition", - ) - switch r.Method { - case "OPTIONS": - case "HEAD": - case "GET": - get(w, r) - case "POST": - if len(params["_method"]) > 0 && params["_method"][0] == "DELETE" { - delete(w, r) - } else { - post(w, r) - } - case "DELETE": - delete(w, r) - default: - http.Error(w, "501 Not Implemented", http.StatusNotImplemented) - } -} - -func init() { - http.HandleFunc("/", handle) -} diff --git a/library/jqupload/server/gae-go/static/robots.txt b/library/jqupload/server/gae-go/static/robots.txt deleted file mode 100644 index eb0536286..000000000 --- a/library/jqupload/server/gae-go/static/robots.txt +++ /dev/null @@ -1,2 +0,0 @@ -User-agent: * -Disallow: diff --git a/library/jqupload/server/gae-python/app.yaml b/library/jqupload/server/gae-python/app.yaml deleted file mode 100644 index 5fe123f59..000000000 --- a/library/jqupload/server/gae-python/app.yaml +++ /dev/null @@ -1,16 +0,0 @@ -application: jquery-file-upload -version: 1 -runtime: python27 -api_version: 1 -threadsafe: true - -builtins: -- deferred: on - -handlers: -- url: /(favicon\.ico|robots\.txt) - static_files: static/\1 - upload: static/(.*) - expiration: '1d' -- url: /.* - script: main.app diff --git a/library/jqupload/server/gae-python/main.py b/library/jqupload/server/gae-python/main.py deleted file mode 100644 index 37aa44e38..000000000 --- a/library/jqupload/server/gae-python/main.py +++ /dev/null @@ -1,170 +0,0 @@ -# -*- coding: utf-8 -*- -# -# jQuery File Upload Plugin GAE Python Example 2.1.1 -# https://github.com/blueimp/jQuery-File-Upload -# -# Copyright 2011, Sebastian Tschan -# https://blueimp.net -# -# Licensed under the MIT license: -# http://www.opensource.org/licenses/MIT -# - -from __future__ import with_statement -from google.appengine.api import files, images -from google.appengine.ext import blobstore, deferred -from google.appengine.ext.webapp import blobstore_handlers -import json -import re -import urllib -import webapp2 - -WEBSITE = 'http://blueimp.github.io/jQuery-File-Upload/' -MIN_FILE_SIZE = 1 # bytes -MAX_FILE_SIZE = 5000000 # bytes -IMAGE_TYPES = re.compile('image/(gif|p?jpeg|(x-)?png)') -ACCEPT_FILE_TYPES = IMAGE_TYPES -THUMBNAIL_MODIFICATOR = '=s80' # max width / height -EXPIRATION_TIME = 300 # seconds - - -def cleanup(blob_keys): - blobstore.delete(blob_keys) - - -class UploadHandler(webapp2.RequestHandler): - - def initialize(self, request, response): - super(UploadHandler, self).initialize(request, response) - self.response.headers['Access-Control-Allow-Origin'] = '*' - self.response.headers[ - 'Access-Control-Allow-Methods' - ] = 'OPTIONS, HEAD, GET, POST, PUT, DELETE' - self.response.headers[ - 'Access-Control-Allow-Headers' - ] = 'Content-Type, Content-Range, Content-Disposition' - - def validate(self, file): - if file['size'] < MIN_FILE_SIZE: - file['error'] = 'File is too small' - elif file['size'] > MAX_FILE_SIZE: - file['error'] = 'File is too big' - elif not ACCEPT_FILE_TYPES.match(file['type']): - file['error'] = 'Filetype not allowed' - else: - return True - return False - - def get_file_size(self, file): - file.seek(0, 2) # Seek to the end of the file - size = file.tell() # Get the position of EOF - file.seek(0) # Reset the file position to the beginning - return size - - def write_blob(self, data, info): - blob = files.blobstore.create( - mime_type=info['type'], - _blobinfo_uploaded_filename=info['name'] - ) - with files.open(blob, 'a') as f: - f.write(data) - files.finalize(blob) - return files.blobstore.get_blob_key(blob) - - def handle_upload(self): - results = [] - blob_keys = [] - for name, fieldStorage in self.request.POST.items(): - if type(fieldStorage) is unicode: - continue - result = {} - result['name'] = re.sub( - r'^.*\\', - '', - fieldStorage.filename - ) - result['type'] = fieldStorage.type - result['size'] = self.get_file_size(fieldStorage.file) - if self.validate(result): - blob_key = str( - self.write_blob(fieldStorage.value, result) - ) - blob_keys.append(blob_key) - result['deleteType'] = 'DELETE' - result['deleteUrl'] = self.request.host_url +\ - '/?key=' + urllib.quote(blob_key, '') - if (IMAGE_TYPES.match(result['type'])): - try: - result['url'] = images.get_serving_url( - blob_key, - secure_url=self.request.host_url.startswith( - 'https' - ) - ) - result['thumbnailUrl'] = result['url'] +\ - THUMBNAIL_MODIFICATOR - except: # Could not get an image serving url - pass - if not 'url' in result: - result['url'] = self.request.host_url +\ - '/' + blob_key + '/' + urllib.quote( - result['name'].encode('utf-8'), '') - results.append(result) - deferred.defer( - cleanup, - blob_keys, - _countdown=EXPIRATION_TIME - ) - return results - - def options(self): - pass - - def head(self): - pass - - def get(self): - self.redirect(WEBSITE) - - def post(self): - if (self.request.get('_method') == 'DELETE'): - return self.delete() - result = {'files': self.handle_upload()} - s = json.dumps(result, separators=(',', ':')) - redirect = self.request.get('redirect') - if redirect: - return self.redirect(str( - redirect.replace('%s', urllib.quote(s, ''), 1) - )) - if 'application/json' in self.request.headers.get('Accept'): - self.response.headers['Content-Type'] = 'application/json' - self.response.write(s) - - def delete(self): - key = self.request.get('key') or '' - blobstore.delete(key) - s = json.dumps({key: True}, separators=(',', ':')) - if 'application/json' in self.request.headers.get('Accept'): - self.response.headers['Content-Type'] = 'application/json' - self.response.write(s) - - -class DownloadHandler(blobstore_handlers.BlobstoreDownloadHandler): - def get(self, key, filename): - if not blobstore.get(key): - self.error(404) - else: - # Prevent browsers from MIME-sniffing the content-type: - self.response.headers['X-Content-Type-Options'] = 'nosniff' - # Cache for the expiration time: - self.response.headers['Cache-Control'] = 'public,max-age=%d' % EXPIRATION_TIME - # Send the file forcing a download dialog: - self.send_blob(key, save_as=filename, content_type='application/octet-stream') - -app = webapp2.WSGIApplication( - [ - ('/', UploadHandler), - ('/([^/]+)/([^/]+)', DownloadHandler) - ], - debug=True -) diff --git a/library/jqupload/server/gae-python/static/robots.txt b/library/jqupload/server/gae-python/static/robots.txt deleted file mode 100644 index eb0536286..000000000 --- a/library/jqupload/server/gae-python/static/robots.txt +++ /dev/null @@ -1,2 +0,0 @@ -User-agent: * -Disallow: diff --git a/library/jqupload/server/node/.gitignore b/library/jqupload/server/node/.gitignore deleted file mode 100644 index 9daa8247d..000000000 --- a/library/jqupload/server/node/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.DS_Store -node_modules diff --git a/library/jqupload/server/node/package.json b/library/jqupload/server/node/package.json deleted file mode 100644 index dd38c50ca..000000000 --- a/library/jqupload/server/node/package.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "blueimp-file-upload-node", - "version": "2.1.0", - "title": "jQuery File Upload Node.js example", - "description": "Node.js implementation example of a file upload handler for jQuery File Upload.", - "keywords": [ - "file", - "upload", - "cross-domain", - "cross-site", - "node" - ], - "homepage": "https://github.com/blueimp/jQuery-File-Upload", - "author": { - "name": "Sebastian Tschan", - "url": "https://blueimp.net" - }, - "maintainers": [ - { - "name": "Sebastian Tschan", - "url": "https://blueimp.net" - } - ], - "repository": { - "type": "git", - "url": "git://github.com/blueimp/jQuery-File-Upload.git" - }, - "bugs": "https://github.com/blueimp/jQuery-File-Upload/issues", - "licenses": [ - { - "type": "MIT", - "url": "http://www.opensource.org/licenses/MIT" - } - ], - "dependencies": { - "formidable": ">=1.0.11", - "node-static": ">=0.6.5", - "imagemagick": ">=0.1.3" - }, - "main": "server.js" -} diff --git a/library/jqupload/server/node/public/files/.gitignore b/library/jqupload/server/node/public/files/.gitignore deleted file mode 100644 index d6b7ef32c..000000000 --- a/library/jqupload/server/node/public/files/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/library/jqupload/server/node/server.js b/library/jqupload/server/node/server.js deleted file mode 100755 index e489772b5..000000000 --- a/library/jqupload/server/node/server.js +++ /dev/null @@ -1,292 +0,0 @@ -#!/usr/bin/nodejs -/* - * jQuery File Upload Plugin Node.js Example 2.1.1 - * https://github.com/blueimp/jQuery-File-Upload - * - * Copyright 2012, Sebastian Tschan - * https://blueimp.net - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT - */ - -/* jshint nomen:false */ -/* global require, __dirname, unescape, console */ - -(function (port) { - 'use strict'; - var path = require('path'), - fs = require('fs'), - // Since Node 0.8, .existsSync() moved from path to fs: - _existsSync = fs.existsSync || path.existsSync, - formidable = require('formidable'), - nodeStatic = require('node-static'), - imageMagick = require('imagemagick'), - options = { - tmpDir: __dirname + '/tmp', - publicDir: __dirname + '/public', - uploadDir: __dirname + '/public/files', - uploadUrl: '/files/', - maxPostSize: 11000000000, // 11 GB - minFileSize: 1, - maxFileSize: 10000000000, // 10 GB - acceptFileTypes: /.+/i, - // Files not matched by this regular expression force a download dialog, - // to prevent executing any scripts in the context of the service domain: - inlineFileTypes: /\.(gif|jpe?g|png)$/i, - imageTypes: /\.(gif|jpe?g|png)$/i, - imageVersions: { - 'thumbnail': { - width: 80, - height: 80 - } - }, - accessControl: { - allowOrigin: '*', - allowMethods: 'OPTIONS, HEAD, GET, POST, PUT, DELETE', - allowHeaders: 'Content-Type, Content-Range, Content-Disposition' - }, - /* Uncomment and edit this section to provide the service via HTTPS: - ssl: { - key: fs.readFileSync('/Applications/XAMPP/etc/ssl.key/server.key'), - cert: fs.readFileSync('/Applications/XAMPP/etc/ssl.crt/server.crt') - }, - */ - nodeStatic: { - cache: 3600 // seconds to cache served files - } - }, - utf8encode = function (str) { - return unescape(encodeURIComponent(str)); - }, - fileServer = new nodeStatic.Server(options.publicDir, options.nodeStatic), - nameCountRegexp = /(?:(?: $([\d]+)$)?(\.[^.]+))?$/, - nameCountFunc = function (s, index, ext) { - return ' (' + ((parseInt(index, 10) || 0) + 1) + ')' + (ext || ''); - }, - FileInfo = function (file) { - this.name = file.name; - this.size = file.size; - this.type = file.type; - this.deleteType = 'DELETE'; - }, - UploadHandler = function (req, res, callback) { - this.req = req; - this.res = res; - this.callback = callback; - }, - serve = function (req, res) { - res.setHeader( - 'Access-Control-Allow-Origin', - options.accessControl.allowOrigin - ); - res.setHeader( - 'Access-Control-Allow-Methods', - options.accessControl.allowMethods - ); - res.setHeader( - 'Access-Control-Allow-Headers', - options.accessControl.allowHeaders - ); - var handleResult = function (result, redirect) { - if (redirect) { - res.writeHead(302, { - 'Location': redirect.replace( - /%s/, - encodeURIComponent(JSON.stringify(result)) - ) - }); - res.end(); - } else { - res.writeHead(200, { - 'Content-Type': req.headers.accept - .indexOf('application/json') !== -1 ? - 'application/json' : 'text/plain' - }); - res.end(JSON.stringify(result)); - } - }, - setNoCacheHeaders = function () { - res.setHeader('Pragma', 'no-cache'); - res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate'); - res.setHeader('Content-Disposition', 'inline; filename="files.json"'); - }, - handler = new UploadHandler(req, res, handleResult); - switch (req.method) { - case 'OPTIONS': - res.end(); - break; - case 'HEAD': - case 'GET': - if (req.url === '/') { - setNoCacheHeaders(); - if (req.method === 'GET') { - handler.get(); - } else { - res.end(); - } - } else { - fileServer.serve(req, res); - } - break; - case 'POST': - setNoCacheHeaders(); - handler.post(); - break; - case 'DELETE': - handler.destroy(); - break; - default: - res.statusCode = 405; - res.end(); - } - }; - fileServer.respond = function (pathname, status, _headers, files, stat, req, res, finish) { - // Prevent browsers from MIME-sniffing the content-type: - _headers['X-Content-Type-Options'] = 'nosniff'; - if (!options.inlineFileTypes.test(files[0])) { - // Force a download dialog for unsafe file extensions: - _headers['Content-Type'] = 'application/octet-stream'; - _headers['Content-Disposition'] = 'attachment; filename="' + - utf8encode(path.basename(files[0])) + '"'; - } - nodeStatic.Server.prototype.respond - .call(this, pathname, status, _headers, files, stat, req, res, finish); - }; - FileInfo.prototype.validate = function () { - if (options.minFileSize && options.minFileSize > this.size) { - this.error = 'File is too small'; - } else if (options.maxFileSize && options.maxFileSize < this.size) { - this.error = 'File is too big'; - } else if (!options.acceptFileTypes.test(this.name)) { - this.error = 'Filetype not allowed'; - } - return !this.error; - }; - FileInfo.prototype.safeName = function () { - // Prevent directory traversal and creating hidden system files: - this.name = path.basename(this.name).replace(/^\.+/, ''); - // Prevent overwriting existing files: - while (_existsSync(options.uploadDir + '/' + this.name)) { - this.name = this.name.replace(nameCountRegexp, nameCountFunc); - } - }; - FileInfo.prototype.initUrls = function (req) { - if (!this.error) { - var that = this, - baseUrl = (options.ssl ? 'https:' : 'http:') + - '//' + req.headers.host + options.uploadUrl; - this.url = this.deleteUrl = baseUrl + encodeURIComponent(this.name); - Object.keys(options.imageVersions).forEach(function (version) { - if (_existsSync( - options.uploadDir + '/' + version + '/' + that.name - )) { - that[version + 'Url'] = baseUrl + version + '/' + - encodeURIComponent(that.name); - } - }); - } - }; - UploadHandler.prototype.get = function () { - var handler = this, - files = []; - fs.readdir(options.uploadDir, function (err, list) { - list.forEach(function (name) { - var stats = fs.statSync(options.uploadDir + '/' + name), - fileInfo; - if (stats.isFile() && name[0] !== '.') { - fileInfo = new FileInfo({ - name: name, - size: stats.size - }); - fileInfo.initUrls(handler.req); - files.push(fileInfo); - } - }); - handler.callback({files: files}); - }); - }; - UploadHandler.prototype.post = function () { - var handler = this, - form = new formidable.IncomingForm(), - tmpFiles = [], - files = [], - map = {}, - counter = 1, - redirect, - finish = function () { - counter -= 1; - if (!counter) { - files.forEach(function (fileInfo) { - fileInfo.initUrls(handler.req); - }); - handler.callback({files: files}, redirect); - } - }; - form.uploadDir = options.tmpDir; - form.on('fileBegin', function (name, file) { - tmpFiles.push(file.path); - var fileInfo = new FileInfo(file, handler.req, true); - fileInfo.safeName(); - map[path.basename(file.path)] = fileInfo; - files.push(fileInfo); - }).on('field', function (name, value) { - if (name === 'redirect') { - redirect = value; - } - }).on('file', function (name, file) { - var fileInfo = map[path.basename(file.path)]; - fileInfo.size = file.size; - if (!fileInfo.validate()) { - fs.unlink(file.path); - return; - } - fs.renameSync(file.path, options.uploadDir + '/' + fileInfo.name); - if (options.imageTypes.test(fileInfo.name)) { - Object.keys(options.imageVersions).forEach(function (version) { - counter += 1; - var opts = options.imageVersions[version]; - imageMagick.resize({ - width: opts.width, - height: opts.height, - srcPath: options.uploadDir + '/' + fileInfo.name, - dstPath: options.uploadDir + '/' + version + '/' + - fileInfo.name - }, finish); - }); - } - }).on('aborted', function () { - tmpFiles.forEach(function (file) { - fs.unlink(file); - }); - }).on('error', function (e) { - console.log(e); - }).on('progress', function (bytesReceived) { - if (bytesReceived > options.maxPostSize) { - handler.req.connection.destroy(); - } - }).on('end', finish).parse(handler.req); - }; - UploadHandler.prototype.destroy = function () { - var handler = this, - fileName; - if (handler.req.url.slice(0, options.uploadUrl.length) === options.uploadUrl) { - fileName = path.basename(decodeURIComponent(handler.req.url)); - if (fileName[0] !== '.') { - fs.unlink(options.uploadDir + '/' + fileName, function (ex) { - Object.keys(options.imageVersions).forEach(function (version) { - fs.unlink(options.uploadDir + '/' + version + '/' + fileName); - }); - handler.callback({success: !ex}); - }); - return; - } - } - handler.callback({success: false}); - }; - if (options.ssl) { - require('https').createServer(options.ssl, serve).listen(port); - } else { - require('http').createServer(serve).listen(port); - } -}(8888)); diff --git a/library/jqupload/server/node/tmp/.gitignore b/library/jqupload/server/node/tmp/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/library/jqupload/server/php/UploadHandler.php b/library/jqupload/server/php/UploadHandler.php deleted file mode 100644 index 66545b12a..000000000 --- a/library/jqupload/server/php/UploadHandler.php +++ /dev/null @@ -1,1329 +0,0 @@ - 'The uploaded file exceeds the upload_max_filesize directive in php.ini', - 2 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form', - 3 => 'The uploaded file was only partially uploaded', - 4 => 'No file was uploaded', - 6 => 'Missing a temporary folder', - 7 => 'Failed to write file to disk', - 8 => 'A PHP extension stopped the file upload', - 'post_max_size' => 'The uploaded file exceeds the post_max_size directive in php.ini', - 'max_file_size' => 'File is too big', - 'min_file_size' => 'File is too small', - 'accept_file_types' => 'Filetype not allowed', - 'max_number_of_files' => 'Maximum number of files exceeded', - 'max_width' => 'Image exceeds maximum width', - 'min_width' => 'Image requires a minimum width', - 'max_height' => 'Image exceeds maximum height', - 'min_height' => 'Image requires a minimum height', - 'abort' => 'File upload aborted', - 'image_resize' => 'Failed to resize image' - ); - - protected $image_objects = array(); - - function __construct($options = null, $initialize = true, $error_messages = null) { - $this->options = array( - 'script_url' => $this->get_full_url().'/', - 'upload_dir' => dirname($this->get_server_var('SCRIPT_FILENAME')).'/files/', - 'upload_url' => $this->get_full_url().'/files/', - 'user_dirs' => false, - 'mkdir_mode' => 0755, - 'param_name' => 'files', - // Set the following option to 'POST', if your server does not support - // DELETE requests. This is a parameter sent to the client: - 'delete_type' => 'DELETE', - 'access_control_allow_origin' => '*', - 'access_control_allow_credentials' => false, - 'access_control_allow_methods' => array( - 'OPTIONS', - 'HEAD', - 'GET', - 'POST', - 'PUT', - 'PATCH', - 'DELETE' - ), - 'access_control_allow_headers' => array( - 'Content-Type', - 'Content-Range', - 'Content-Disposition' - ), - // Enable to provide file downloads via GET requests to the PHP script: - // 1. Set to 1 to download files via readfile method through PHP - // 2. Set to 2 to send a X-Sendfile header for lighttpd/Apache - // 3. Set to 3 to send a X-Accel-Redirect header for nginx - // If set to 2 or 3, adjust the upload_url option to the base path of - // the redirect parameter, e.g. '/files/'. - 'download_via_php' => false, - // Read files in chunks to avoid memory limits when download_via_php - // is enabled, set to 0 to disable chunked reading of files: - 'readfile_chunk_size' => 10 * 1024 * 1024, // 10 MiB - // Defines which files can be displayed inline when downloaded: - 'inline_file_types' => '/\.(gif|jpe?g|png)$/i', - // Defines which files (based on their names) are accepted for upload: - 'accept_file_types' => '/.+$/i', - // The php.ini settings upload_max_filesize and post_max_size - // take precedence over the following max_file_size setting: - 'max_file_size' => null, - 'min_file_size' => 1, - // The maximum number of files for the upload directory: - 'max_number_of_files' => null, - // Defines which files are handled as image files: - 'image_file_types' => '/\.(gif|jpe?g|png)$/i', - // Image resolution restrictions: - 'max_width' => null, - 'max_height' => null, - 'min_width' => 1, - 'min_height' => 1, - // Set the following option to false to enable resumable uploads: - 'discard_aborted_uploads' => true, - // Set to 0 to use the GD library to scale and orient images, - // set to 1 to use imagick (if installed, falls back to GD), - // set to 2 to use the ImageMagick convert binary directly: - 'image_library' => 1, - // Uncomment the following to define an array of resource limits - // for imagick: - /* - 'imagick_resource_limits' => array( - imagick::RESOURCETYPE_MAP => 32, - imagick::RESOURCETYPE_MEMORY => 32 - ), - */ - // Command or path for to the ImageMagick convert binary: - 'convert_bin' => 'convert', - // Uncomment the following to add parameters in front of each - // ImageMagick convert call (the limit constraints seem only - // to have an effect if put in front): - /* - 'convert_params' => '-limit memory 32MiB -limit map 32MiB', - */ - // Command or path for to the ImageMagick identify binary: - 'identify_bin' => 'identify', - 'image_versions' => array( - // The empty image version key defines options for the original image: - '' => array( - // Automatically rotate images based on EXIF meta data: - 'auto_orient' => true - ), - // Uncomment the following to create medium sized images: - /* - 'medium' => array( - 'max_width' => 800, - 'max_height' => 600 - ), - */ - 'thumbnail' => array( - // Uncomment the following to use a defined directory for the thumbnails - // instead of a subdirectory based on the version identifier. - // Make sure that this directory doesn't allow execution of files if you - // don't pose any restrictions on the type of uploaded files, e.g. by - // copying the .htaccess file from the files directory for Apache: - //'upload_dir' => dirname($this->get_server_var('SCRIPT_FILENAME')).'/thumb/', - //'upload_url' => $this->get_full_url().'/thumb/', - // Uncomment the following to force the max - // dimensions and e.g. create square thumbnails: - //'crop' => true, - 'max_width' => 80, - 'max_height' => 80 - ) - ) - ); - if ($options) { - $this->options = $options + $this->options; - } - if ($error_messages) { - $this->error_messages = $error_messages + $this->error_messages; - } - if ($initialize) { - $this->initialize(); - } - } - - protected function initialize() { - switch ($this->get_server_var('REQUEST_METHOD')) { - case 'OPTIONS': - case 'HEAD': - $this->head(); - break; - case 'GET': - $this->get(); - break; - case 'PATCH': - case 'PUT': - case 'POST': - $this->post(); - break; - case 'DELETE': - $this->delete(); - break; - default: - $this->header('HTTP/1.1 405 Method Not Allowed'); - } - } - - protected function get_full_url() { - $https = !empty($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'on') === 0; - return - ($https ? 'https://' : 'http://'). - (!empty($_SERVER['REMOTE_USER']) ? $_SERVER['REMOTE_USER'].'@' : ''). - (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : ($_SERVER['SERVER_NAME']. - ($https && $_SERVER['SERVER_PORT'] === 443 || - $_SERVER['SERVER_PORT'] === 80 ? '' : ':'.$_SERVER['SERVER_PORT']))). - substr($_SERVER['SCRIPT_NAME'],0, strrpos($_SERVER['SCRIPT_NAME'], '/')); - } - - protected function get_user_id() { - @session_start(); - return session_id(); - } - - protected function get_user_path() { - if ($this->options['user_dirs']) { - return $this->get_user_id().'/'; - } - return ''; - } - - protected function get_upload_path($file_name = null, $version = null) { - $file_name = $file_name ? $file_name : ''; - if (empty($version)) { - $version_path = ''; - } else { - $version_dir = @$this->options['image_versions'][$version]['upload_dir']; - if ($version_dir) { - return $version_dir.$this->get_user_path().$file_name; - } - $version_path = $version.'/'; - } - return $this->options['upload_dir'].$this->get_user_path() - .$version_path.$file_name; - } - - protected function get_query_separator($url) { - return strpos($url, '?') === false ? '?' : '&'; - } - - protected function get_download_url($file_name, $version = null, $direct = false) { - if (!$direct && $this->options['download_via_php']) { - $url = $this->options['script_url'] - .$this->get_query_separator($this->options['script_url']) - .$this->get_singular_param_name() - .'='.rawurlencode($file_name); - if ($version) { - $url .= '&version='.rawurlencode($version); - } - return $url.'&download=1'; - } - if (empty($version)) { - $version_path = ''; - } else { - $version_url = @$this->options['image_versions'][$version]['upload_url']; - if ($version_url) { - return $version_url.$this->get_user_path().rawurlencode($file_name); - } - $version_path = rawurlencode($version).'/'; - } - return $this->options['upload_url'].$this->get_user_path() - .$version_path.rawurlencode($file_name); - } - - protected function set_additional_file_properties($file) { - $file->deleteUrl = $this->options['script_url'] - .$this->get_query_separator($this->options['script_url']) - .$this->get_singular_param_name() - .'='.rawurlencode($file->name); - $file->deleteType = $this->options['delete_type']; - if ($file->deleteType !== 'DELETE') { - $file->deleteUrl .= '&_method=DELETE'; - } - if ($this->options['access_control_allow_credentials']) { - $file->deleteWithCredentials = true; - } - } - - // Fix for overflowing signed 32 bit integers, - // works for sizes up to 2^32-1 bytes (4 GiB - 1): - protected function fix_integer_overflow($size) { - if ($size < 0) { - $size += 2.0 * (PHP_INT_MAX + 1); - } - return $size; - } - - protected function get_file_size($file_path, $clear_stat_cache = false) { - if ($clear_stat_cache) { - if (version_compare(PHP_VERSION, '5.3.0') >= 0) { - clearstatcache(true, $file_path); - } else { - clearstatcache(); - } - } - return $this->fix_integer_overflow(filesize($file_path)); - } - - protected function is_valid_file_object($file_name) { - $file_path = $this->get_upload_path($file_name); - if (is_file($file_path) && $file_name[0] !== '.') { - return true; - } - return false; - } - - protected function get_file_object($file_name) { - if ($this->is_valid_file_object($file_name)) { - $file = new stdClass(); - $file->name = $file_name; - $file->size = $this->get_file_size( - $this->get_upload_path($file_name) - ); - $file->url = $this->get_download_url($file->name); - foreach($this->options['image_versions'] as $version => $options) { - if (!empty($version)) { - if (is_file($this->get_upload_path($file_name, $version))) { - $file->{$version.'Url'} = $this->get_download_url( - $file->name, - $version - ); - } - } - } - $this->set_additional_file_properties($file); - return $file; - } - return null; - } - - protected function get_file_objects($iteration_method = 'get_file_object') { - $upload_dir = $this->get_upload_path(); - if (!is_dir($upload_dir)) { - return array(); - } - return array_values(array_filter(array_map( - array($this, $iteration_method), - scandir($upload_dir) - ))); - } - - protected function count_file_objects() { - return count($this->get_file_objects('is_valid_file_object')); - } - - protected function get_error_message($error) { - return array_key_exists($error, $this->error_messages) ? - $this->error_messages[$error] : $error; - } - - function get_config_bytes($val) { - $val = trim($val); - $last = strtolower($val[strlen($val)-1]); - switch($last) { - case 'g': - $val *= 1024; - case 'm': - $val *= 1024; - case 'k': - $val *= 1024; - } - return $this->fix_integer_overflow($val); - } - - protected function validate($uploaded_file, $file, $error, $index) { - if ($error) { - $file->error = $this->get_error_message($error); - return false; - } - $content_length = $this->fix_integer_overflow(intval( - $this->get_server_var('CONTENT_LENGTH') - )); - $post_max_size = $this->get_config_bytes(ini_get('post_max_size')); - if ($post_max_size && ($content_length > $post_max_size)) { - $file->error = $this->get_error_message('post_max_size'); - return false; - } - if (!preg_match($this->options['accept_file_types'], $file->name)) { - $file->error = $this->get_error_message('accept_file_types'); - return false; - } - if ($uploaded_file && is_uploaded_file($uploaded_file)) { - $file_size = $this->get_file_size($uploaded_file); - } else { - $file_size = $content_length; - } - if ($this->options['max_file_size'] && ( - $file_size > $this->options['max_file_size'] || - $file->size > $this->options['max_file_size']) - ) { - $file->error = $this->get_error_message('max_file_size'); - return false; - } - if ($this->options['min_file_size'] && - $file_size < $this->options['min_file_size']) { - $file->error = $this->get_error_message('min_file_size'); - return false; - } - if (is_int($this->options['max_number_of_files']) && ( - $this->count_file_objects() >= $this->options['max_number_of_files']) - ) { - $file->error = $this->get_error_message('max_number_of_files'); - return false; - } - $max_width = @$this->options['max_width']; - $max_height = @$this->options['max_height']; - $min_width = @$this->options['min_width']; - $min_height = @$this->options['min_height']; - if (($max_width || $max_height || $min_width || $min_height)) { - list($img_width, $img_height) = $this->get_image_size($uploaded_file); - } - if (!empty($img_width)) { - if ($max_width && $img_width > $max_width) { - $file->error = $this->get_error_message('max_width'); - return false; - } - if ($max_height && $img_height > $max_height) { - $file->error = $this->get_error_message('max_height'); - return false; - } - if ($min_width && $img_width < $min_width) { - $file->error = $this->get_error_message('min_width'); - return false; - } - if ($min_height && $img_height < $min_height) { - $file->error = $this->get_error_message('min_height'); - return false; - } - } - return true; - } - - protected function upcount_name_callback($matches) { - $index = isset($matches[1]) ? intval($matches[1]) + 1 : 1; - $ext = isset($matches[2]) ? $matches[2] : ''; - return ' ('.$index.')'.$ext; - } - - protected function upcount_name($name) { - return preg_replace_callback( - '/(?:(?: $([\d]+)$)?(\.[^.]+))?$/', - array($this, 'upcount_name_callback'), - $name, - 1 - ); - } - - protected function get_unique_filename($file_path, $name, $size, $type, $error, - $index, $content_range) { - while(is_dir($this->get_upload_path($name))) { - $name = $this->upcount_name($name); - } - // Keep an existing filename if this is part of a chunked upload: - $uploaded_bytes = $this->fix_integer_overflow(intval($content_range[1])); - while(is_file($this->get_upload_path($name))) { - if ($uploaded_bytes === $this->get_file_size( - $this->get_upload_path($name))) { - break; - } - $name = $this->upcount_name($name); - } - return $name; - } - - protected function trim_file_name($file_path, $name, $size, $type, $error, - $index, $content_range) { - // Remove path information and dots around the filename, to prevent uploading - // into different directories or replacing hidden system files. - // Also remove control characters and spaces (\x00..\x20) around the filename: - $name = trim(basename(stripslashes($name)), ".\x00..\x20"); - // Use a timestamp for empty filenames: - if (!$name) { - $name = str_replace('.', '-', microtime(true)); - } - // Add missing file extension for known image types: - if (strpos($name, '.') === false && - preg_match('/^image\/(gif|jpe?g|png)/', $type, $matches)) { - $name .= '.'.$matches[1]; - } - if (function_exists('exif_imagetype')) { - switch(@exif_imagetype($file_path)){ - case IMAGETYPE_JPEG: - $extensions = array('jpg', 'jpeg'); - break; - case IMAGETYPE_PNG: - $extensions = array('png'); - break; - case IMAGETYPE_GIF: - $extensions = array('gif'); - break; - } - // Adjust incorrect image file extensions: - if (!empty($extensions)) { - $parts = explode('.', $name); - $extIndex = count($parts) - 1; - $ext = strtolower(@$parts[$extIndex]); - if (!in_array($ext, $extensions)) { - $parts[$extIndex] = $extensions[0]; - $name = implode('.', $parts); - } - } - } - return $name; - } - - protected function get_file_name($file_path, $name, $size, $type, $error, - $index, $content_range) { - return $this->get_unique_filename( - $file_path, - $this->trim_file_name($file_path, $name, $size, $type, $error, - $index, $content_range), - $size, - $type, - $error, - $index, - $content_range - ); - } - - protected function handle_form_data($file, $index) { - // Handle form data, e.g. $_REQUEST['description'][$index] - } - - protected function get_scaled_image_file_paths($file_name, $version) { - $file_path = $this->get_upload_path($file_name); - if (!empty($version)) { - $version_dir = $this->get_upload_path(null, $version); - if (!is_dir($version_dir)) { - mkdir($version_dir, $this->options['mkdir_mode'], true); - } - $new_file_path = $version_dir.'/'.$file_name; - } else { - $new_file_path = $file_path; - } - return array($file_path, $new_file_path); - } - - protected function gd_get_image_object($file_path, $func, $no_cache = false) { - if (empty($this->image_objects[$file_path]) || $no_cache) { - $this->gd_destroy_image_object($file_path); - $this->image_objects[$file_path] = $func($file_path); - } - return $this->image_objects[$file_path]; - } - - protected function gd_set_image_object($file_path, $image) { - $this->gd_destroy_image_object($file_path); - $this->image_objects[$file_path] = $image; - } - - protected function gd_destroy_image_object($file_path) { - $image = @$this->image_objects[$file_path]; - return $image && imagedestroy($image); - } - - protected function gd_imageflip($image, $mode) { - if (function_exists('imageflip')) { - return imageflip($image, $mode); - } - $new_width = $src_width = imagesx($image); - $new_height = $src_height = imagesy($image); - $new_img = imagecreatetruecolor($new_width, $new_height); - $src_x = 0; - $src_y = 0; - switch ($mode) { - case '1': // flip on the horizontal axis - $src_y = $new_height - 1; - $src_height = -$new_height; - break; - case '2': // flip on the vertical axis - $src_x = $new_width - 1; - $src_width = -$new_width; - break; - case '3': // flip on both axes - $src_y = $new_height - 1; - $src_height = -$new_height; - $src_x = $new_width - 1; - $src_width = -$new_width; - break; - default: - return $image; - } - imagecopyresampled( - $new_img, - $image, - 0, - 0, - $src_x, - $src_y, - $new_width, - $new_height, - $src_width, - $src_height - ); - return $new_img; - } - - protected function gd_orient_image($file_path, $src_img) { - if (!function_exists('exif_read_data')) { - return false; - } - $exif = @exif_read_data($file_path); - if ($exif === false) { - return false; - } - $orientation = intval(@$exif['Orientation']); - if ($orientation < 2 || $orientation > 8) { - return false; - } - switch ($orientation) { - case 2: - $new_img = $this->gd_imageflip( - $src_img, - defined('IMG_FLIP_VERTICAL') ? IMG_FLIP_VERTICAL : 2 - ); - break; - case 3: - $new_img = imagerotate($src_img, 180, 0); - break; - case 4: - $new_img = $this->gd_imageflip( - $src_img, - defined('IMG_FLIP_HORIZONTAL') ? IMG_FLIP_HORIZONTAL : 1 - ); - break; - case 5: - $tmp_img = $this->gd_imageflip( - $src_img, - defined('IMG_FLIP_HORIZONTAL') ? IMG_FLIP_HORIZONTAL : 1 - ); - $new_img = imagerotate($tmp_img, 270, 0); - imagedestroy($tmp_img); - break; - case 6: - $new_img = imagerotate($src_img, 270, 0); - break; - case 7: - $tmp_img = $this->gd_imageflip( - $src_img, - defined('IMG_FLIP_VERTICAL') ? IMG_FLIP_VERTICAL : 2 - ); - $new_img = imagerotate($tmp_img, 270, 0); - imagedestroy($tmp_img); - break; - case 8: - $new_img = imagerotate($src_img, 90, 0); - break; - default: - return false; - } - $this->gd_set_image_object($file_path, $new_img); - return true; - } - - protected function gd_create_scaled_image($file_name, $version, $options) { - if (!function_exists('imagecreatetruecolor')) { - error_log('Function not found: imagecreatetruecolor'); - return false; - } - list($file_path, $new_file_path) = - $this->get_scaled_image_file_paths($file_name, $version); - $type = strtolower(substr(strrchr($file_name, '.'), 1)); - switch ($type) { - case 'jpg': - case 'jpeg': - $src_func = 'imagecreatefromjpeg'; - $write_func = 'imagejpeg'; - $image_quality = isset($options['jpeg_quality']) ? - $options['jpeg_quality'] : 75; - break; - case 'gif': - $src_func = 'imagecreatefromgif'; - $write_func = 'imagegif'; - $image_quality = null; - break; - case 'png': - $src_func = 'imagecreatefrompng'; - $write_func = 'imagepng'; - $image_quality = isset($options['png_quality']) ? - $options['png_quality'] : 9; - break; - default: - return false; - } - $src_img = $this->gd_get_image_object( - $file_path, - $src_func, - !empty($options['no_cache']) - ); - $image_oriented = false; - if (!empty($options['auto_orient']) && $this->gd_orient_image( - $file_path, - $src_img - )) { - $image_oriented = true; - $src_img = $this->gd_get_image_object( - $file_path, - $src_func - ); - } - $max_width = $img_width = imagesx($src_img); - $max_height = $img_height = imagesy($src_img); - if (!empty($options['max_width'])) { - $max_width = $options['max_width']; - } - if (!empty($options['max_height'])) { - $max_height = $options['max_height']; - } - $scale = min( - $max_width / $img_width, - $max_height / $img_height - ); - if ($scale >= 1) { - if ($image_oriented) { - return $write_func($src_img, $new_file_path, $image_quality); - } - if ($file_path !== $new_file_path) { - return copy($file_path, $new_file_path); - } - return true; - } - if (empty($options['crop'])) { - $new_width = $img_width * $scale; - $new_height = $img_height * $scale; - $dst_x = 0; - $dst_y = 0; - $new_img = imagecreatetruecolor($new_width, $new_height); - } else { - if (($img_width / $img_height) >= ($max_width / $max_height)) { - $new_width = $img_width / ($img_height / $max_height); - $new_height = $max_height; - } else { - $new_width = $max_width; - $new_height = $img_height / ($img_width / $max_width); - } - $dst_x = 0 - ($new_width - $max_width) / 2; - $dst_y = 0 - ($new_height - $max_height) / 2; - $new_img = imagecreatetruecolor($max_width, $max_height); - } - // Handle transparency in GIF and PNG images: - switch ($type) { - case 'gif': - case 'png': - imagecolortransparent($new_img, imagecolorallocate($new_img, 0, 0, 0)); - case 'png': - imagealphablending($new_img, false); - imagesavealpha($new_img, true); - break; - } - $success = imagecopyresampled( - $new_img, - $src_img, - $dst_x, - $dst_y, - 0, - 0, - $new_width, - $new_height, - $img_width, - $img_height - ) && $write_func($new_img, $new_file_path, $image_quality); - $this->gd_set_image_object($file_path, $new_img); - return $success; - } - - protected function imagick_get_image_object($file_path, $no_cache = false) { - if (empty($this->image_objects[$file_path]) || $no_cache) { - $this->imagick_destroy_image_object($file_path); - $image = new Imagick(); - if (!empty($this->options['imagick_resource_limits'])) { - foreach ($this->options['imagick_resource_limits'] as $type => $limit) { - $image->setResourceLimit($type, $limit); - } - } - $image->readImage($file_path); - $this->image_objects[$file_path] = $image; - } - return $this->image_objects[$file_path]; - } - - protected function imagick_set_image_object($file_path, $image) { - $this->imagick_destroy_image_object($file_path); - $this->image_objects[$file_path] = $image; - } - - protected function imagick_destroy_image_object($file_path) { - $image = @$this->image_objects[$file_path]; - return $image && $image->destroy(); - } - - protected function imagick_orient_image($image) { - $orientation = $image->getImageOrientation(); - $background = new ImagickPixel('none'); - switch ($orientation) { - case imagick::ORIENTATION_TOPRIGHT: // 2 - $image->flopImage(); // horizontal flop around y-axis - break; - case imagick::ORIENTATION_BOTTOMRIGHT: // 3 - $image->rotateImage($background, 180); - break; - case imagick::ORIENTATION_BOTTOMLEFT: // 4 - $image->flipImage(); // vertical flip around x-axis - break; - case imagick::ORIENTATION_LEFTTOP: // 5 - $image->flopImage(); // horizontal flop around y-axis - $image->rotateImage($background, 270); - break; - case imagick::ORIENTATION_RIGHTTOP: // 6 - $image->rotateImage($background, 90); - break; - case imagick::ORIENTATION_RIGHTBOTTOM: // 7 - $image->flipImage(); // vertical flip around x-axis - $image->rotateImage($background, 270); - break; - case imagick::ORIENTATION_LEFTBOTTOM: // 8 - $image->rotateImage($background, 270); - break; - default: - return false; - } - $image->setImageOrientation(imagick::ORIENTATION_TOPLEFT); // 1 - return true; - } - - protected function imagick_create_scaled_image($file_name, $version, $options) { - list($file_path, $new_file_path) = - $this->get_scaled_image_file_paths($file_name, $version); - $image = $this->imagick_get_image_object( - $file_path, - !empty($options['no_cache']) - ); - if ($image->getImageFormat() === 'GIF') { - // Handle animated GIFs: - $images = $image->coalesceImages(); - foreach ($images as $frame) { - $image = $frame; - $this->imagick_set_image_object($file_name, $image); - break; - } - } - $image_oriented = false; - if (!empty($options['auto_orient'])) { - $image_oriented = $this->imagick_orient_image($image); - } - $new_width = $max_width = $img_width = $image->getImageWidth(); - $new_height = $max_height = $img_height = $image->getImageHeight(); - if (!empty($options['max_width'])) { - $new_width = $max_width = $options['max_width']; - } - if (!empty($options['max_height'])) { - $new_height = $max_height = $options['max_height']; - } - if (!($image_oriented || $max_width < $img_width || $max_height < $img_height)) { - if ($file_path !== $new_file_path) { - return copy($file_path, $new_file_path); - } - return true; - } - $crop = !empty($options['crop']); - if ($crop) { - $x = 0; - $y = 0; - if (($img_width / $img_height) >= ($max_width / $max_height)) { - $new_width = 0; // Enables proportional scaling based on max_height - $x = ($img_width / ($img_height / $max_height) - $max_width) / 2; - } else { - $new_height = 0; // Enables proportional scaling based on max_width - $y = ($img_height / ($img_width / $max_width) - $max_height) / 2; - } - } - $success = $image->resizeImage( - $new_width, - $new_height, - isset($options['filter']) ? $options['filter'] : imagick::FILTER_LANCZOS, - isset($options['blur']) ? $options['blur'] : 1, - $new_width && $new_height // fit image into constraints if not to be cropped - ); - if ($success && $crop) { - $success = $image->cropImage( - $max_width, - $max_height, - $x, - $y - ); - if ($success) { - $success = $image->setImagePage($max_width, $max_height, 0, 0); - } - } - $type = strtolower(substr(strrchr($file_name, '.'), 1)); - switch ($type) { - case 'jpg': - case 'jpeg': - if (!empty($options['jpeg_quality'])) { - $image->setImageCompression(Imagick::COMPRESSION_JPEG); - $image->setImageCompressionQuality($options['jpeg_quality']); - } - break; - } - if (!empty($options['strip'])) { - $image->stripImage(); - } - return $success && $image->writeImage($new_file_path); - } - - protected function imagemagick_create_scaled_image($file_name, $version, $options) { - list($file_path, $new_file_path) = - $this->get_scaled_image_file_paths($file_name, $version); - $resize = @$options['max_width'] - .(empty($options['max_height']) ? '' : 'x'.$options['max_height']); - if (!$resize && empty($options['auto_orient'])) { - if ($file_path !== $new_file_path) { - return copy($file_path, $new_file_path); - } - return true; - } - $cmd = $this->options['convert_bin']; - if (!empty($this->options['convert_params'])) { - $cmd .= ' '.$this->options['convert_params']; - } - $cmd .= ' '.escapeshellarg($file_path); - if (!empty($options['auto_orient'])) { - $cmd .= ' -auto-orient'; - } - if ($resize) { - // Handle animated GIFs: - $cmd .= ' -coalesce'; - if (empty($options['crop'])) { - $cmd .= ' -resize '.escapeshellarg($resize.'>'); - } else { - $cmd .= ' -resize '.escapeshellarg($resize.'^'); - $cmd .= ' -gravity center'; - $cmd .= ' -crop '.escapeshellarg($resize.'+0+0'); - } - // Make sure the page dimensions are correct (fixes offsets of animated GIFs): - $cmd .= ' +repage'; - } - if (!empty($options['convert_params'])) { - $cmd .= ' '.$options['convert_params']; - } - $cmd .= ' '.escapeshellarg($new_file_path); - exec($cmd, $output, $error); - if ($error) { - error_log(implode('\n', $output)); - return false; - } - return true; - } - - protected function get_image_size($file_path) { - if ($this->options['image_library']) { - if (extension_loaded('imagick')) { - $image = new Imagick(); - try { - if (@$image->pingImage($file_path)) { - $dimensions = array($image->getImageWidth(), $image->getImageHeight()); - $image->destroy(); - return $dimensions; - } - return false; - } catch (Exception $e) { - error_log($e->getMessage()); - } - } - if ($this->options['image_library'] === 2) { - $cmd = $this->options['identify_bin']; - $cmd .= ' -ping '.escapeshellarg($file_path); - exec($cmd, $output, $error); - if (!$error && !empty($output)) { - // image.jpg JPEG 1920x1080 1920x1080+0+0 8-bit sRGB 465KB 0.000u 0:00.000 - $infos = preg_split('/\s+/', $output[0]); - $dimensions = preg_split('/x/', $infos[2]); - return $dimensions; - } - return false; - } - } - if (!function_exists('getimagesize')) { - error_log('Function not found: getimagesize'); - return false; - } - return @getimagesize($file_path); - } - - protected function create_scaled_image($file_name, $version, $options) { - if ($this->options['image_library'] === 2) { - return $this->imagemagick_create_scaled_image($file_name, $version, $options); - } - if ($this->options['image_library'] && extension_loaded('imagick')) { - return $this->imagick_create_scaled_image($file_name, $version, $options); - } - return $this->gd_create_scaled_image($file_name, $version, $options); - } - - protected function destroy_image_object($file_path) { - if ($this->options['image_library'] && extension_loaded('imagick')) { - return $this->imagick_destroy_image_object($file_path); - } - } - - protected function is_valid_image_file($file_path) { - if (!preg_match($this->options['image_file_types'], $file_path)) { - return false; - } - if (function_exists('exif_imagetype')) { - return @exif_imagetype($file_path); - } - $image_info = $this->get_image_size($file_path); - return $image_info && $image_info[0] && $image_info[1]; - } - - protected function handle_image_file($file_path, $file) { - $failed_versions = array(); - foreach($this->options['image_versions'] as $version => $options) { - if ($this->create_scaled_image($file->name, $version, $options)) { - if (!empty($version)) { - $file->{$version.'Url'} = $this->get_download_url( - $file->name, - $version - ); - } else { - $file->size = $this->get_file_size($file_path, true); - } - } else { - $failed_versions[] = $version ? $version : 'original'; - } - } - if (count($failed_versions)) { - $file->error = $this->get_error_message('image_resize') - .' ('.implode($failed_versions,', ').')'; - } - // Free memory: - $this->destroy_image_object($file_path); - } - - protected function handle_file_upload($uploaded_file, $name, $size, $type, $error, - $index = null, $content_range = null) { - $file = new stdClass(); - $file->name = $this->get_file_name($uploaded_file, $name, $size, $type, $error, - $index, $content_range); - $file->size = $this->fix_integer_overflow(intval($size)); - $file->type = $type; - if ($this->validate($uploaded_file, $file, $error, $index)) { - $this->handle_form_data($file, $index); - $upload_dir = $this->get_upload_path(); - if (!is_dir($upload_dir)) { - mkdir($upload_dir, $this->options['mkdir_mode'], true); - } - $file_path = $this->get_upload_path($file->name); - $append_file = $content_range && is_file($file_path) && - $file->size > $this->get_file_size($file_path); - if ($uploaded_file && is_uploaded_file($uploaded_file)) { - // multipart/formdata uploads (POST method uploads) - if ($append_file) { - file_put_contents( - $file_path, - fopen($uploaded_file, 'r'), - FILE_APPEND - ); - } else { - move_uploaded_file($uploaded_file, $file_path); - } - } else { - // Non-multipart uploads (PUT method support) - file_put_contents( - $file_path, - fopen('php://input', 'r'), - $append_file ? FILE_APPEND : 0 - ); - } - $file_size = $this->get_file_size($file_path, $append_file); - if ($file_size === $file->size) { - $file->url = $this->get_download_url($file->name); - if ($this->is_valid_image_file($file_path)) { - $this->handle_image_file($file_path, $file); - } - } else { - $file->size = $file_size; - if (!$content_range && $this->options['discard_aborted_uploads']) { - unlink($file_path); - $file->error = $this->get_error_message('abort'); - } - } - $this->set_additional_file_properties($file); - } - return $file; - } - - protected function readfile($file_path) { - $file_size = $this->get_file_size($file_path); - $chunk_size = $this->options['readfile_chunk_size']; - if ($chunk_size && $file_size > $chunk_size) { - $handle = fopen($file_path, 'rb'); - while (!feof($handle)) { - echo fread($handle, $chunk_size); - ob_flush(); - flush(); - } - fclose($handle); - return $file_size; - } - return readfile($file_path); - } - - protected function body($str) { - echo $str; - } - - protected function header($str) { - header($str); - } - - protected function get_server_var($id) { - return isset($_SERVER[$id]) ? $_SERVER[$id] : ''; - } - - protected function generate_response($content, $print_response = true) { - if ($print_response) { - $json = json_encode($content); - $redirect = isset($_REQUEST['redirect']) ? - stripslashes($_REQUEST['redirect']) : null; - if ($redirect) { - $this->header('Location: '.sprintf($redirect, rawurlencode($json))); - return; - } - $this->head(); - if ($this->get_server_var('HTTP_CONTENT_RANGE')) { - $files = isset($content[$this->options['param_name']]) ? - $content[$this->options['param_name']] : null; - if ($files && is_array($files) && is_object($files[0]) && $files[0]->size) { - $this->header('Range: 0-'.( - $this->fix_integer_overflow(intval($files[0]->size)) - 1 - )); - } - } - $this->body($json); - } - return $content; - } - - protected function get_version_param() { - return isset($_GET['version']) ? basename(stripslashes($_GET['version'])) : null; - } - - protected function get_singular_param_name() { - return substr($this->options['param_name'], 0, -1); - } - - protected function get_file_name_param() { - $name = $this->get_singular_param_name(); - return isset($_GET[$name]) ? basename(stripslashes($_GET[$name])) : null; - } - - protected function get_file_names_params() { - $params = isset($_GET[$this->options['param_name']]) ? - $_GET[$this->options['param_name']] : array(); - foreach ($params as $key => $value) { - $params[$key] = basename(stripslashes($value)); - } - return $params; - } - - protected function get_file_type($file_path) { - switch (strtolower(pathinfo($file_path, PATHINFO_EXTENSION))) { - case 'jpeg': - case 'jpg': - return 'image/jpeg'; - case 'png': - return 'image/png'; - case 'gif': - return 'image/gif'; - default: - return ''; - } - } - - protected function download() { - switch ($this->options['download_via_php']) { - case 1: - $redirect_header = null; - break; - case 2: - $redirect_header = 'X-Sendfile'; - break; - case 3: - $redirect_header = 'X-Accel-Redirect'; - break; - default: - return $this->header('HTTP/1.1 403 Forbidden'); - } - $file_name = $this->get_file_name_param(); - if (!$this->is_valid_file_object($file_name)) { - return $this->header('HTTP/1.1 404 Not Found'); - } - if ($redirect_header) { - return $this->header( - $redirect_header.': '.$this->get_download_url( - $file_name, - $this->get_version_param(), - true - ) - ); - } - $file_path = $this->get_upload_path($file_name, $this->get_version_param()); - // Prevent browsers from MIME-sniffing the content-type: - $this->header('X-Content-Type-Options: nosniff'); - if (!preg_match($this->options['inline_file_types'], $file_name)) { - $this->header('Content-Type: application/octet-stream'); - $this->header('Content-Disposition: attachment; filename="'.$file_name.'"'); - } else { - $this->header('Content-Type: '.$this->get_file_type($file_path)); - $this->header('Content-Disposition: inline; filename="'.$file_name.'"'); - } - $this->header('Content-Length: '.$this->get_file_size($file_path)); - $this->header('Last-Modified: '.gmdate('D, d M Y H:i:s T', filemtime($file_path))); - $this->readfile($file_path); - } - - protected function send_content_type_header() { - $this->header('Vary: Accept'); - if (strpos($this->get_server_var('HTTP_ACCEPT'), 'application/json') !== false) { - $this->header('Content-type: application/json'); - } else { - $this->header('Content-type: text/plain'); - } - } - - protected function send_access_control_headers() { - $this->header('Access-Control-Allow-Origin: '.$this->options['access_control_allow_origin']); - $this->header('Access-Control-Allow-Credentials: ' - .($this->options['access_control_allow_credentials'] ? 'true' : 'false')); - $this->header('Access-Control-Allow-Methods: ' - .implode(', ', $this->options['access_control_allow_methods'])); - $this->header('Access-Control-Allow-Headers: ' - .implode(', ', $this->options['access_control_allow_headers'])); - } - - public function head() { - $this->header('Pragma: no-cache'); - $this->header('Cache-Control: no-store, no-cache, must-revalidate'); - $this->header('Content-Disposition: inline; filename="files.json"'); - // Prevent Internet Explorer from MIME-sniffing the content-type: - $this->header('X-Content-Type-Options: nosniff'); - if ($this->options['access_control_allow_origin']) { - $this->send_access_control_headers(); - } - $this->send_content_type_header(); - } - - public function get($print_response = true) { - if ($print_response && isset($_GET['download'])) { - return $this->download(); - } - $file_name = $this->get_file_name_param(); - if ($file_name) { - $response = array( - $this->get_singular_param_name() => $this->get_file_object($file_name) - ); - } else { - $response = array( - $this->options['param_name'] => $this->get_file_objects() - ); - } - return $this->generate_response($response, $print_response); - } - - public function post($print_response = true) { - if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') { - return $this->delete($print_response); - } - $upload = isset($_FILES[$this->options['param_name']]) ? - $_FILES[$this->options['param_name']] : null; - // Parse the Content-Disposition header, if available: - $file_name = $this->get_server_var('HTTP_CONTENT_DISPOSITION') ? - rawurldecode(preg_replace( - '/(^[^"]+")|("$)/', - '', - $this->get_server_var('HTTP_CONTENT_DISPOSITION') - )) : null; - // Parse the Content-Range header, which has the following form: - // Content-Range: bytes 0-524287/2000000 - $content_range = $this->get_server_var('HTTP_CONTENT_RANGE') ? - preg_split('/[^0-9]+/', $this->get_server_var('HTTP_CONTENT_RANGE')) : null; - $size = $content_range ? $content_range[3] : null; - $files = array(); - if ($upload && is_array($upload['tmp_name'])) { - // param_name is an array identifier like "files[]", - // $_FILES is a multi-dimensional array: - foreach ($upload['tmp_name'] as $index => $value) { - $files[] = $this->handle_file_upload( - $upload['tmp_name'][$index], - $file_name ? $file_name : $upload['name'][$index], - $size ? $size : $upload['size'][$index], - $upload['type'][$index], - $upload['error'][$index], - $index, - $content_range - ); - } - } else { - // param_name is a single object identifier like "file", - // $_FILES is a one-dimensional array: - $files[] = $this->handle_file_upload( - isset($upload['tmp_name']) ? $upload['tmp_name'] : null, - $file_name ? $file_name : (isset($upload['name']) ? - $upload['name'] : null), - $size ? $size : (isset($upload['size']) ? - $upload['size'] : $this->get_server_var('CONTENT_LENGTH')), - isset($upload['type']) ? - $upload['type'] : $this->get_server_var('CONTENT_TYPE'), - isset($upload['error']) ? $upload['error'] : null, - null, - $content_range - ); - } - return $this->generate_response( - array($this->options['param_name'] => $files), - $print_response - ); - } - - public function delete($print_response = true) { - $file_names = $this->get_file_names_params(); - if (empty($file_names)) { - $file_names = array($this->get_file_name_param()); - } - $response = array(); - foreach($file_names as $file_name) { - $file_path = $this->get_upload_path($file_name); - $success = is_file($file_path) && $file_name[0] !== '.' && unlink($file_path); - if ($success) { - foreach($this->options['image_versions'] as $version => $options) { - if (!empty($version)) { - $file = $this->get_upload_path($file_name, $version); - if (is_file($file)) { - unlink($file); - } - } - } - } - $response[$file_name] = $success; - } - return $this->generate_response($response, $print_response); - } - -} diff --git a/library/jqupload/server/php/files/.gitignore b/library/jqupload/server/php/files/.gitignore deleted file mode 100644 index e24a60fae..000000000 --- a/library/jqupload/server/php/files/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -* -!.gitignore -!.htaccess diff --git a/library/jqupload/server/php/files/.htaccess b/library/jqupload/server/php/files/.htaccess deleted file mode 100644 index 56689f0bb..000000000 --- a/library/jqupload/server/php/files/.htaccess +++ /dev/null @@ -1,18 +0,0 @@ -# The following directives force the content-type application/octet-stream -# and force browsers to display a download dialog for non-image files. -# This prevents the execution of script files in the context of the website: -ForceType application/octet-stream -Header set Content-Disposition attachment - - ForceType none - Header unset Content-Disposition - - -# The following directive prevents browsers from MIME-sniffing the content-type. -# This is an important complement to the ForceType directive above: -Header set X-Content-Type-Options nosniff - -# Uncomment the following lines to prevent unauthorized download of files: -#AuthName "Authorization required" -#AuthType Basic -#require valid-user diff --git a/library/jqupload/server/php/index.php b/library/jqupload/server/php/index.php deleted file mode 100644 index be29bf479..000000000 --- a/library/jqupload/server/php/index.php +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - -jQuery File Upload Plugin Test - - - - -

jQuery File Upload Plugin Test

- - -

- - - - - - - - - - - - - - - - - - - - - - - diff --git a/library/jqupload/test/test.js b/library/jqupload/test/test.js deleted file mode 100644 index 72d08d99e..000000000 --- a/library/jqupload/test/test.js +++ /dev/null @@ -1,1288 +0,0 @@ -/* - * jQuery File Upload Plugin Test 9.4.0 - * https://github.com/blueimp/jQuery-File-Upload - * - * Copyright 2010, Sebastian Tschan - * https://blueimp.net - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT - */ - -/* global $, QUnit, window, document, expect, module, test, asyncTest, start, ok, strictEqual, notStrictEqual */ - -$(function () { - // jshint nomen:false - 'use strict'; - - QUnit.done = function () { - // Delete all uploaded files: - var url = $('#fileupload').prop('action'); - $.getJSON(url, function (result) { - $.each(result.files, function (index, file) { - $.ajax({ - url: url + '?file=' + encodeURIComponent(file.name), - type: 'DELETE' - }); - }); - }); - }; - - var lifecycle = { - setup: function () { - // Set the .fileupload method to the basic widget method: - $.widget('blueimp.fileupload', window.testBasicWidget, {}); - }, - teardown: function () { - // Remove all remaining event listeners: - $(document).unbind(); - } - }, - lifecycleUI = { - setup: function () { - // Set the .fileupload method to the UI widget method: - $.widget('blueimp.fileupload', window.testUIWidget, {}); - }, - teardown: function () { - // Remove all remaining event listeners: - $(document).unbind(); - } - }; - - module('Initialization', lifecycle); - - test('Widget initialization', function () { - var fu = $('#fileupload').fileupload(); - ok(fu.data('blueimp-fileupload') || fu.data('fileupload')); - }); - - test('Data attribute options', function () { - $('#fileupload').attr('data-url', 'http://example.org'); - $('#fileupload').fileupload(); - strictEqual( - $('#fileupload').fileupload('option', 'url'), - 'http://example.org' - ); - }); - - test('File input initialization', function () { - var fu = $('#fileupload').fileupload(); - ok( - fu.fileupload('option', 'fileInput').length, - 'File input field inside of the widget' - ); - ok( - fu.fileupload('option', 'fileInput').length, - 'Widget element as file input field' - ); - }); - - test('Drop zone initialization', function () { - ok($('#fileupload').fileupload() - .fileupload('option', 'dropZone').length); - }); - - test('Paste zone initialization', function () { - ok($('#fileupload').fileupload() - .fileupload('option', 'pasteZone').length); - }); - - test('Event listeners initialization', function () { - expect( - $.support.xhrFormDataFileUpload ? 4 : 1 - ); - var eo = { - originalEvent: { - dataTransfer: {files: [{}], types: ['Files']}, - clipboardData: {items: [{}]} - } - }, - fu = $('#fileupload').fileupload({ - dragover: function () { - ok(true, 'Triggers dragover callback'); - return false; - }, - drop: function () { - ok(true, 'Triggers drop callback'); - return false; - }, - paste: function () { - ok(true, 'Triggers paste callback'); - return false; - }, - change: function () { - ok(true, 'Triggers change callback'); - return false; - } - }), - fileInput = fu.fileupload('option', 'fileInput'), - dropZone = fu.fileupload('option', 'dropZone'), - pasteZone = fu.fileupload('option', 'pasteZone'); - fileInput.trigger($.Event('change', eo)); - dropZone.trigger($.Event('dragover', eo)); - dropZone.trigger($.Event('drop', eo)); - pasteZone.trigger($.Event('paste', eo)); - }); - - module('API', lifecycle); - - test('destroy', function () { - expect(4); - var eo = { - originalEvent: { - dataTransfer: {files: [{}], types: ['Files']}, - clipboardData: {items: [{}]} - } - }, - options = { - dragover: function () { - ok(true, 'Triggers dragover callback'); - return false; - }, - drop: function () { - ok(true, 'Triggers drop callback'); - return false; - }, - paste: function () { - ok(true, 'Triggers paste callback'); - return false; - }, - change: function () { - ok(true, 'Triggers change callback'); - return false; - } - }, - fu = $('#fileupload').fileupload(options), - fileInput = fu.fileupload('option', 'fileInput'), - dropZone = fu.fileupload('option', 'dropZone'), - pasteZone = fu.fileupload('option', 'pasteZone'); - dropZone.bind('dragover', options.dragover); - dropZone.bind('drop', options.drop); - pasteZone.bind('paste', options.paste); - fileInput.bind('change', options.change); - fu.fileupload('destroy'); - fileInput.trigger($.Event('change', eo)); - dropZone.trigger($.Event('dragover', eo)); - dropZone.trigger($.Event('drop', eo)); - pasteZone.trigger($.Event('paste', eo)); - }); - - test('disable/enable', function () { - expect( - $.support.xhrFormDataFileUpload ? 4 : 1 - ); - var eo = { - originalEvent: { - dataTransfer: {files: [{}], types: ['Files']}, - clipboardData: {items: [{}]} - } - }, - fu = $('#fileupload').fileupload({ - dragover: function () { - ok(true, 'Triggers dragover callback'); - return false; - }, - drop: function () { - ok(true, 'Triggers drop callback'); - return false; - }, - paste: function () { - ok(true, 'Triggers paste callback'); - return false; - }, - change: function () { - ok(true, 'Triggers change callback'); - return false; - } - }), - fileInput = fu.fileupload('option', 'fileInput'), - dropZone = fu.fileupload('option', 'dropZone'), - pasteZone = fu.fileupload('option', 'pasteZone'); - fu.fileupload('disable'); - fileInput.trigger($.Event('change', eo)); - dropZone.trigger($.Event('dragover', eo)); - dropZone.trigger($.Event('drop', eo)); - pasteZone.trigger($.Event('paste', eo)); - fu.fileupload('enable'); - fileInput.trigger($.Event('change', eo)); - dropZone.trigger($.Event('dragover', eo)); - dropZone.trigger($.Event('drop', eo)); - pasteZone.trigger($.Event('paste', eo)); - }); - - test('option', function () { - expect( - $.support.xhrFormDataFileUpload ? 10 : 7 - ); - var eo = { - originalEvent: { - dataTransfer: {files: [{}], types: ['Files']}, - clipboardData: {items: [{}]} - } - }, - fu = $('#fileupload').fileupload({ - dragover: function () { - ok(true, 'Triggers dragover callback'); - return false; - }, - drop: function () { - ok(true, 'Triggers drop callback'); - return false; - }, - paste: function () { - ok(true, 'Triggers paste callback'); - return false; - }, - change: function () { - ok(true, 'Triggers change callback'); - return false; - } - }), - fileInput = fu.fileupload('option', 'fileInput'), - dropZone = fu.fileupload('option', 'dropZone'), - pasteZone = fu.fileupload('option', 'pasteZone'); - fu.fileupload('option', 'fileInput', null); - fu.fileupload('option', 'dropZone', null); - fu.fileupload('option', 'pasteZone', null); - fileInput.trigger($.Event('change', eo)); - dropZone.trigger($.Event('dragover', eo)); - dropZone.trigger($.Event('drop', eo)); - pasteZone.trigger($.Event('paste', eo)); - fu.fileupload('option', 'dropZone', 'body'); - strictEqual( - fu.fileupload('option', 'dropZone')[0], - document.body, - 'Allow a query string as parameter for the dropZone option' - ); - fu.fileupload('option', 'dropZone', document); - strictEqual( - fu.fileupload('option', 'dropZone')[0], - document, - 'Allow a document element as parameter for the dropZone option' - ); - fu.fileupload('option', 'pasteZone', 'body'); - strictEqual( - fu.fileupload('option', 'pasteZone')[0], - document.body, - 'Allow a query string as parameter for the pasteZone option' - ); - fu.fileupload('option', 'pasteZone', document); - strictEqual( - fu.fileupload('option', 'pasteZone')[0], - document, - 'Allow a document element as parameter for the pasteZone option' - ); - fu.fileupload('option', 'fileInput', ':file'); - strictEqual( - fu.fileupload('option', 'fileInput')[0], - $(':file')[0], - 'Allow a query string as parameter for the fileInput option' - ); - fu.fileupload('option', 'fileInput', $(':file')[0]); - strictEqual( - fu.fileupload('option', 'fileInput')[0], - $(':file')[0], - 'Allow a document element as parameter for the fileInput option' - ); - fu.fileupload('option', 'fileInput', fileInput); - fu.fileupload('option', 'dropZone', dropZone); - fu.fileupload('option', 'pasteZone', pasteZone); - fileInput.trigger($.Event('change', eo)); - dropZone.trigger($.Event('dragover', eo)); - dropZone.trigger($.Event('drop', eo)); - pasteZone.trigger($.Event('paste', eo)); - }); - - asyncTest('add', function () { - expect(2); - var param = {files: [{name: 'test'}]}; - $('#fileupload').fileupload({ - add: function (e, data) { - strictEqual( - data.files[0].name, - param.files[0].name, - 'Triggers add callback' - ); - } - }).fileupload('add', param).fileupload( - 'option', - 'add', - function (e, data) { - data.submit().complete(function () { - ok(true, 'data.submit() Returns a jqXHR object'); - start(); - }); - } - ).fileupload('add', param); - }); - - asyncTest('send', function () { - expect(3); - var param = {files: [{name: 'test'}]}; - $('#fileupload').fileupload({ - send: function (e, data) { - strictEqual( - data.files[0].name, - 'test', - 'Triggers send callback' - ); - } - }).fileupload('send', param).fail(function () { - ok(true, 'Allows to abort the request'); - }).complete(function () { - ok(true, 'Returns a jqXHR object'); - start(); - }).abort(); - }); - - module('Callbacks', lifecycle); - - asyncTest('add', function () { - expect(1); - var param = {files: [{name: 'test'}]}; - $('#fileupload').fileupload({ - add: function () { - ok(true, 'Triggers add callback'); - start(); - } - }).fileupload('add', param); - }); - - asyncTest('submit', function () { - expect(1); - var param = {files: [{name: 'test'}]}; - $('#fileupload').fileupload({ - submit: function () { - ok(true, 'Triggers submit callback'); - start(); - return false; - } - }).fileupload('add', param); - }); - - asyncTest('send', function () { - expect(1); - var param = {files: [{name: 'test'}]}; - $('#fileupload').fileupload({ - send: function () { - ok(true, 'Triggers send callback'); - start(); - return false; - } - }).fileupload('send', param); - }); - - asyncTest('done', function () { - expect(1); - var param = {files: [{name: 'test'}]}; - $('#fileupload').fileupload({ - done: function () { - ok(true, 'Triggers done callback'); - start(); - } - }).fileupload('send', param); - }); - - asyncTest('fail', function () { - expect(1); - var param = {files: [{name: 'test'}]}, - fu = $('#fileupload').fileupload({ - url: '404', - fail: function () { - ok(true, 'Triggers fail callback'); - start(); - } - }); - (fu.data('blueimp-fileupload') || fu.data('fileupload')) - ._isXHRUpload = function () { - return true; - }; - fu.fileupload('send', param); - }); - - asyncTest('always', function () { - expect(2); - var param = {files: [{name: 'test'}]}, - counter = 0, - fu = $('#fileupload').fileupload({ - always: function () { - ok(true, 'Triggers always callback'); - if (counter === 1) { - start(); - } else { - counter += 1; - } - } - }); - (fu.data('blueimp-fileupload') || fu.data('fileupload')) - ._isXHRUpload = function () { - return true; - }; - fu.fileupload('add', param).fileupload( - 'option', - 'url', - '404' - ).fileupload('add', param); - }); - - asyncTest('progress', function () { - expect(1); - var param = {files: [{name: 'test'}]}, - counter = 0; - $('#fileupload').fileupload({ - forceIframeTransport: true, - progress: function () { - ok(true, 'Triggers progress callback'); - if (counter === 0) { - start(); - } else { - counter += 1; - } - } - }).fileupload('send', param); - }); - - asyncTest('progressall', function () { - expect(1); - var param = {files: [{name: 'test'}]}, - counter = 0; - $('#fileupload').fileupload({ - forceIframeTransport: true, - progressall: function () { - ok(true, 'Triggers progressall callback'); - if (counter === 0) { - start(); - } else { - counter += 1; - } - } - }).fileupload('send', param); - }); - - asyncTest('start', function () { - expect(1); - var param = {files: [{name: '1'}, {name: '2'}]}, - active = 0; - $('#fileupload').fileupload({ - send: function () { - active += 1; - }, - start: function () { - ok(!active, 'Triggers start callback before uploads'); - start(); - } - }).fileupload('send', param); - }); - - asyncTest('stop', function () { - expect(1); - var param = {files: [{name: '1'}, {name: '2'}]}, - active = 0; - $('#fileupload').fileupload({ - send: function () { - active += 1; - }, - always: function () { - active -= 1; - }, - stop: function () { - ok(!active, 'Triggers stop callback after uploads'); - start(); - } - }).fileupload('send', param); - }); - - test('change', function () { - var fu = $('#fileupload').fileupload(), - fuo = fu.data('blueimp-fileupload') || fu.data('fileupload'), - fileInput = fu.fileupload('option', 'fileInput'); - expect(2); - fu.fileupload({ - change: function (e, data) { - ok(true, 'Triggers change callback'); - strictEqual( - data.files.length, - 0, - 'Returns empty files list' - ); - }, - add: $.noop - }); - fuo._onChange({ - data: {fileupload: fuo}, - target: fileInput[0] - }); - }); - - test('paste', function () { - var fu = $('#fileupload').fileupload(), - fuo = fu.data('blueimp-fileupload') || fu.data('fileupload'); - expect(1); - fu.fileupload({ - paste: function () { - ok(true, 'Triggers paste callback'); - }, - add: $.noop - }); - fuo._onPaste({ - data: {fileupload: fuo}, - originalEvent: { - dataTransfer: {files: [{}]}, - clipboardData: {items: [{}]} - }, - preventDefault: $.noop - }); - }); - - test('drop', function () { - var fu = $('#fileupload').fileupload(), - fuo = fu.data('blueimp-fileupload') || fu.data('fileupload'); - expect(1); - fu.fileupload({ - drop: function () { - ok(true, 'Triggers drop callback'); - }, - add: $.noop - }); - fuo._onDrop({ - data: {fileupload: fuo}, - originalEvent: { - dataTransfer: {files: [{}]}, - clipboardData: {items: [{}]} - }, - preventDefault: $.noop - }); - }); - - test('dragover', function () { - var fu = $('#fileupload').fileupload(), - fuo = fu.data('blueimp-fileupload') || fu.data('fileupload'); - expect(1); - fu.fileupload({ - dragover: function () { - ok(true, 'Triggers dragover callback'); - }, - add: $.noop - }); - fuo._onDragOver({ - data: {fileupload: fuo}, - originalEvent: {dataTransfer: {types: ['Files']}}, - preventDefault: $.noop - }); - }); - - module('Options', lifecycle); - - test('paramName', function () { - expect(1); - var param = {files: [{name: 'test'}]}; - $('#fileupload').fileupload({ - paramName: null, - send: function (e, data) { - strictEqual( - data.paramName[0], - data.fileInput.prop('name'), - 'Takes paramName from file input field if not set' - ); - return false; - } - }).fileupload('send', param); - }); - - test('url', function () { - expect(1); - var param = {files: [{name: 'test'}]}; - $('#fileupload').fileupload({ - url: null, - send: function (e, data) { - strictEqual( - data.url, - $(data.fileInput.prop('form')).prop('action'), - 'Takes url from form action if not set' - ); - return false; - } - }).fileupload('send', param); - }); - - test('type', function () { - expect(2); - var param = {files: [{name: 'test'}]}; - $('#fileupload').fileupload({ - type: null, - send: function (e, data) { - strictEqual( - data.type, - 'POST', - 'Request type is "POST" if not set to "PUT"' - ); - return false; - } - }).fileupload('send', param); - $('#fileupload').fileupload({ - type: 'PUT', - send: function (e, data) { - strictEqual( - data.type, - 'PUT', - 'Request type is "PUT" if set to "PUT"' - ); - return false; - } - }).fileupload('send', param); - }); - - test('replaceFileInput', function () { - var fu = $('#fileupload').fileupload(), - fuo = fu.data('blueimp-fileupload') || fu.data('fileupload'), - fileInput = fu.fileupload('option', 'fileInput'), - fileInputElement = fileInput[0]; - expect(2); - fu.fileupload({ - replaceFileInput: false, - change: function () { - strictEqual( - fu.fileupload('option', 'fileInput')[0], - fileInputElement, - 'Keeps file input with replaceFileInput: false' - ); - }, - add: $.noop - }); - fuo._onChange({ - data: {fileupload: fuo}, - target: fileInput[0] - }); - fu.fileupload({ - replaceFileInput: true, - change: function () { - notStrictEqual( - fu.fileupload('option', 'fileInput')[0], - fileInputElement, - 'Replaces file input with replaceFileInput: true' - ); - }, - add: $.noop - }); - fuo._onChange({ - data: {fileupload: fuo}, - target: fileInput[0] - }); - }); - - asyncTest('forceIframeTransport', function () { - expect(1); - var param = {files: [{name: 'test'}]}; - $('#fileupload').fileupload({ - forceIframeTransport: true, - done: function (e, data) { - strictEqual( - data.dataType.substr(0, 6), - 'iframe', - 'Iframe Transport is used' - ); - start(); - } - }).fileupload('send', param); - }); - - test('singleFileUploads', function () { - expect(3); - var fu = $('#fileupload').fileupload(), - param = {files: [{name: '1'}, {name: '2'}]}, - index = 1; - (fu.data('blueimp-fileupload') || fu.data('fileupload')) - ._isXHRUpload = function () { - return true; - }; - $('#fileupload').fileupload({ - singleFileUploads: true, - add: function () { - ok(true, 'Triggers callback number ' + index.toString()); - index += 1; - } - }).fileupload('add', param).fileupload( - 'option', - 'singleFileUploads', - false - ).fileupload('add', param); - }); - - test('limitMultiFileUploads', function () { - expect(3); - var fu = $('#fileupload').fileupload(), - param = {files: [ - {name: '1'}, - {name: '2'}, - {name: '3'}, - {name: '4'}, - {name: '5'} - ]}, - index = 1; - (fu.data('blueimp-fileupload') || fu.data('fileupload')) - ._isXHRUpload = function () { - return true; - }; - $('#fileupload').fileupload({ - singleFileUploads: false, - limitMultiFileUploads: 2, - add: function () { - ok(true, 'Triggers callback number ' + index.toString()); - index += 1; - } - }).fileupload('add', param); - }); - - test('limitMultiFileUploadSize', function () { - expect(7); - var fu = $('#fileupload').fileupload(), - param = {files: [ - {name: '1-1', size: 100000}, - {name: '1-2', size: 40000}, - {name: '2-1', size: 100000}, - {name: '3-1', size: 50000}, - {name: '3-2', size: 40000}, - {name: '4-1', size: 45000} // New request due to limitMultiFileUploads - ]}, - param2 = {files: [ - {name: '5-1'}, - {name: '5-2'}, - {name: '6-1'}, - {name: '6-2'}, - {name: '7-1'} - ]}, - index = 1; - (fu.data('blueimp-fileupload') || fu.data('fileupload')) - ._isXHRUpload = function () { - return true; - }; - $('#fileupload').fileupload({ - singleFileUploads: false, - limitMultiFileUploads: 2, - limitMultiFileUploadSize: 150000, - limitMultiFileUploadSizeOverhead: 5000, - add: function () { - ok(true, 'Triggers callback number ' + index.toString()); - index += 1; - } - }).fileupload('add', param).fileupload('add', param2); - }); - - asyncTest('sequentialUploads', function () { - expect(6); - var param = {files: [ - {name: '1'}, - {name: '2'}, - {name: '3'}, - {name: '4'}, - {name: '5'}, - {name: '6'} - ]}, - addIndex = 0, - sendIndex = 0, - loadIndex = 0, - fu = $('#fileupload').fileupload({ - sequentialUploads: true, - add: function (e, data) { - addIndex += 1; - if (addIndex === 4) { - data.submit().abort(); - } else { - data.submit(); - } - }, - send: function () { - sendIndex += 1; - }, - done: function () { - loadIndex += 1; - strictEqual(sendIndex, loadIndex, 'upload in order'); - }, - fail: function (e, data) { - strictEqual(data.errorThrown, 'abort', 'upload aborted'); - }, - stop: function () { - start(); - } - }); - (fu.data('blueimp-fileupload') || fu.data('fileupload')) - ._isXHRUpload = function () { - return true; - }; - fu.fileupload('add', param); - }); - - asyncTest('limitConcurrentUploads', function () { - expect(12); - var param = {files: [ - {name: '1'}, - {name: '2'}, - {name: '3'}, - {name: '4'}, - {name: '5'}, - {name: '6'}, - {name: '7'}, - {name: '8'}, - {name: '9'}, - {name: '10'}, - {name: '11'}, - {name: '12'} - ]}, - addIndex = 0, - sendIndex = 0, - loadIndex = 0, - fu = $('#fileupload').fileupload({ - limitConcurrentUploads: 3, - add: function (e, data) { - addIndex += 1; - if (addIndex === 4) { - data.submit().abort(); - } else { - data.submit(); - } - }, - send: function () { - sendIndex += 1; - }, - done: function () { - loadIndex += 1; - ok(sendIndex - loadIndex < 3); - }, - fail: function (e, data) { - strictEqual(data.errorThrown, 'abort', 'upload aborted'); - }, - stop: function () { - start(); - } - }); - (fu.data('blueimp-fileupload') || fu.data('fileupload')) - ._isXHRUpload = function () { - return true; - }; - fu.fileupload('add', param); - }); - - if ($.support.xhrFileUpload) { - asyncTest('multipart', function () { - expect(2); - var param = {files: [{ - name: 'test.png', - size: 123, - type: 'image/png' - }]}, - fu = $('#fileupload').fileupload({ - multipart: false, - always: function (e, data) { - strictEqual( - data.contentType, - param.files[0].type, - 'non-multipart upload sets file type as contentType' - ); - strictEqual( - data.headers['Content-Disposition'], - 'attachment; filename="' + param.files[0].name + '"', - 'non-multipart upload sets Content-Disposition header' - ); - start(); - } - }); - fu.fileupload('send', param); - }); - } - - module('UI Initialization', lifecycleUI); - - test('Widget initialization', function () { - var fu = $('#fileupload').fileupload(); - ok(fu.data('blueimp-fileupload') || fu.data('fileupload')); - ok( - $('#fileupload').fileupload('option', 'uploadTemplate').length, - 'Initialized upload template' - ); - ok( - $('#fileupload').fileupload('option', 'downloadTemplate').length, - 'Initialized download template' - ); - }); - - test('Buttonbar event listeners', function () { - var buttonbar = $('#fileupload .fileupload-buttonbar'), - files = [{name: 'test'}]; - expect(4); - $('#fileupload').fileupload({ - send: function () { - ok(true, 'Started file upload via global start button'); - }, - fail: function (e, data) { - ok(true, 'Canceled file upload via global cancel button'); - data.context.remove(); - }, - destroy: function () { - ok(true, 'Delete action called via global delete button'); - } - }); - $('#fileupload').fileupload('add', {files: files}); - buttonbar.find('.cancel').click(); - $('#fileupload').fileupload('add', {files: files}); - buttonbar.find('.start').click(); - buttonbar.find('.cancel').click(); - files[0].deleteUrl = 'http://example.org/banana.jpg'; - ($('#fileupload').data('blueimp-fileupload') || - $('#fileupload').data('fileupload')) - ._renderDownload(files) - .appendTo($('#fileupload .files')).show() - .find('.toggle').click(); - buttonbar.find('.delete').click(); - }); - - module('UI API', lifecycleUI); - - test('destroy', function () { - var buttonbar = $('#fileupload .fileupload-buttonbar'), - files = [{name: 'test'}]; - expect(1); - $('#fileupload').fileupload({ - send: function () { - ok(true, 'This test should not run'); - return false; - } - }) - .fileupload('add', {files: files}) - .fileupload('destroy'); - buttonbar.find('.start').click(function () { - ok(true, 'Clicked global start button'); - return false; - }).click(); - }); - - test('disable/enable', function () { - var buttonbar = $('#fileupload .fileupload-buttonbar'); - $('#fileupload').fileupload(); - $('#fileupload').fileupload('disable'); - strictEqual( - buttonbar.find('input[type=file], button').not(':disabled').length, - 0, - 'Disables the buttonbar buttons' - ); - $('#fileupload').fileupload('enable'); - strictEqual( - buttonbar.find('input[type=file], button').not(':disabled').length, - 4, - 'Enables the buttonbar buttons' - ); - }); - - module('UI Callbacks', lifecycleUI); - - test('destroy', function () { - expect(3); - $('#fileupload').fileupload({ - destroy: function (e, data) { - ok(true, 'Triggers destroy callback'); - strictEqual( - data.url, - 'test', - 'Passes over deletion url parameter' - ); - strictEqual( - data.type, - 'DELETE', - 'Passes over deletion request type parameter' - ); - } - }); - ($('#fileupload').data('blueimp-fileupload') || - $('#fileupload').data('fileupload')) - ._renderDownload([{ - name: 'test', - deleteUrl: 'test', - deleteType: 'DELETE' - }]) - .appendTo($('#fileupload .files')) - .show() - .find('.toggle').click(); - $('#fileupload .fileupload-buttonbar .delete').click(); - }); - - asyncTest('added', function () { - expect(1); - var param = {files: [{name: 'test'}]}; - $('#fileupload').fileupload({ - added: function (e, data) { - start(); - strictEqual( - data.files[0].name, - param.files[0].name, - 'Triggers added callback' - ); - }, - send: function () { - return false; - } - }).fileupload('add', param); - }); - - asyncTest('started', function () { - expect(1); - var param = {files: [{name: 'test'}]}; - $('#fileupload').fileupload({ - started: function () { - start(); - ok('Triggers started callback'); - return false; - }, - sent: function () { - return false; - } - }).fileupload('send', param); - }); - - asyncTest('sent', function () { - expect(1); - var param = {files: [{name: 'test'}]}; - $('#fileupload').fileupload({ - sent: function (e, data) { - start(); - strictEqual( - data.files[0].name, - param.files[0].name, - 'Triggers sent callback' - ); - return false; - } - }).fileupload('send', param); - }); - - asyncTest('completed', function () { - expect(1); - var param = {files: [{name: 'test'}]}; - $('#fileupload').fileupload({ - completed: function () { - start(); - ok('Triggers completed callback'); - return false; - } - }).fileupload('send', param); - }); - - asyncTest('failed', function () { - expect(1); - var param = {files: [{name: 'test'}]}; - $('#fileupload').fileupload({ - failed: function () { - start(); - ok('Triggers failed callback'); - return false; - } - }).fileupload('send', param).abort(); - }); - - asyncTest('stopped', function () { - expect(1); - var param = {files: [{name: 'test'}]}; - $('#fileupload').fileupload({ - stopped: function () { - start(); - ok('Triggers stopped callback'); - return false; - } - }).fileupload('send', param); - }); - - asyncTest('destroyed', function () { - expect(1); - $('#fileupload').fileupload({ - dataType: 'html', - destroyed: function () { - start(); - ok(true, 'Triggers destroyed callback'); - } - }); - ($('#fileupload').data('blueimp-fileupload') || - $('#fileupload').data('fileupload')) - ._renderDownload([{ - name: 'test', - deleteUrl: '.', - deleteType: 'GET' - }]) - .appendTo($('#fileupload .files')) - .show() - .find('.toggle').click(); - $('#fileupload .fileupload-buttonbar .delete').click(); - }); - - module('UI Options', lifecycleUI); - - test('autoUpload', function () { - expect(1); - $('#fileupload') - .fileupload({ - autoUpload: true, - send: function () { - ok(true, 'Started file upload automatically'); - return false; - } - }) - .fileupload('add', {files: [{name: 'test'}]}) - .fileupload('option', 'autoUpload', false) - .fileupload('add', {files: [{name: 'test'}]}); - }); - - test('maxNumberOfFiles', function () { - expect(3); - var addIndex = 0, - sendIndex = 0; - $('#fileupload') - .fileupload({ - autoUpload: true, - maxNumberOfFiles: 3, - singleFileUploads: false, - send: function () { - strictEqual( - sendIndex += 1, - addIndex - ); - }, - progress: $.noop, - progressall: $.noop, - done: $.noop, - stop: $.noop - }) - .fileupload('add', {files: [{name: (addIndex += 1)}]}) - .fileupload('add', {files: [{name: (addIndex += 1)}]}) - .fileupload('add', {files: [{name: (addIndex += 1)}]}) - .fileupload('add', {files: [{name: 'test'}]}); - }); - - test('maxFileSize', function () { - expect(2); - var addIndex = 0, - sendIndex = 0; - $('#fileupload') - .fileupload({ - autoUpload: true, - maxFileSize: 1000, - send: function () { - strictEqual( - sendIndex += 1, - addIndex - ); - return false; - } - }) - .fileupload('add', {files: [{ - name: (addIndex += 1) - }]}) - .fileupload('add', {files: [{ - name: (addIndex += 1), - size: 999 - }]}) - .fileupload('add', {files: [{ - name: 'test', - size: 1001 - }]}) - .fileupload({ - send: function (e, data) { - ok( - !$.blueimp.fileupload.prototype.options - .send.call(this, e, data) - ); - return false; - } - }); - }); - - test('minFileSize', function () { - expect(2); - var addIndex = 0, - sendIndex = 0; - $('#fileupload') - .fileupload({ - autoUpload: true, - minFileSize: 1000, - send: function () { - strictEqual( - sendIndex += 1, - addIndex - ); - return false; - } - }) - .fileupload('add', {files: [{ - name: (addIndex += 1) - }]}) - .fileupload('add', {files: [{ - name: (addIndex += 1), - size: 1001 - }]}) - .fileupload('add', {files: [{ - name: 'test', - size: 999 - }]}) - .fileupload({ - send: function (e, data) { - ok( - !$.blueimp.fileupload.prototype.options - .send.call(this, e, data) - ); - return false; - } - }); - }); - - test('acceptFileTypes', function () { - expect(2); - var addIndex = 0, - sendIndex = 0; - $('#fileupload') - .fileupload({ - autoUpload: true, - acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i, - disableImageMetaDataLoad: true, - send: function () { - strictEqual( - sendIndex += 1, - addIndex - ); - return false; - } - }) - .fileupload('add', {files: [{ - name: (addIndex += 1) + '.jpg' - }]}) - .fileupload('add', {files: [{ - name: (addIndex += 1), - type: 'image/jpeg' - }]}) - .fileupload('add', {files: [{ - name: 'test.txt', - type: 'text/plain' - }]}) - .fileupload({ - send: function (e, data) { - ok( - !$.blueimp.fileupload.prototype.options - .send.call(this, e, data) - ); - return false; - } - }); - }); - - test('acceptFileTypes as HTML5 data attribute', function () { - expect(2); - var regExp = /(\.|\/)(gif|jpe?g|png)$/i; - $('#fileupload') - .attr('data-accept-file-types', regExp.toString()) - .fileupload(); - strictEqual( - $.type($('#fileupload').fileupload('option', 'acceptFileTypes')), - $.type(regExp) - ); - strictEqual( - $('#fileupload').fileupload('option', 'acceptFileTypes').toString(), - regExp.toString() - ); - }); - -}); -- cgit v1.2.3 From f180558041507bcc4f80e8f373ca3e6bd635edea Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Tue, 23 Oct 2018 19:32:36 +0200 Subject: Convert non UTF-8 content on link embeding --- Zotlabs/Module/Linkinfo.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php index f0d62b5e0..534e5697b 100644 --- a/Zotlabs/Module/Linkinfo.php +++ b/Zotlabs/Module/Linkinfo.php @@ -228,8 +228,10 @@ class Linkinfo extends \Zotlabs\Web\Controller { $header = $result['header']; $body = $result['body']; - - $body = mb_convert_encoding($body, 'UTF-8', 'UTF-8'); + + $x = preg_match('/ Date: Tue, 23 Oct 2018 19:57:21 +0200 Subject: Update Linkinfo.php --- Zotlabs/Module/Linkinfo.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php index 534e5697b..715cda356 100644 --- a/Zotlabs/Module/Linkinfo.php +++ b/Zotlabs/Module/Linkinfo.php @@ -228,10 +228,8 @@ class Linkinfo extends \Zotlabs\Web\Controller { $header = $result['header']; $body = $result['body']; - - $x = preg_match('/ Date: Tue, 23 Oct 2018 20:36:30 +0200 Subject: Update Linkinfo.php --- Zotlabs/Module/Linkinfo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php index 715cda356..8666976af 100644 --- a/Zotlabs/Module/Linkinfo.php +++ b/Zotlabs/Module/Linkinfo.php @@ -229,7 +229,7 @@ class Linkinfo extends \Zotlabs\Web\Controller { $header = $result['header']; $body = $result['body']; - $body = mb_convert_encoding($body, 'UTF-8', (preg_match('/ Date: Wed, 24 Oct 2018 10:28:18 +0200 Subject: Update Linkinfo.php --- Zotlabs/Module/Linkinfo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php index 8666976af..a0ad17e68 100644 --- a/Zotlabs/Module/Linkinfo.php +++ b/Zotlabs/Module/Linkinfo.php @@ -229,7 +229,7 @@ class Linkinfo extends \Zotlabs\Web\Controller { $header = $result['header']; $body = $result['body']; - $body = mb_convert_encoding($body, 'UTF-8', (preg_match('/meta\s+http-equiv=.content-type.+;\s+charset=([^"|\']+)/i', $body, $o) ? $o[1] : 'UTF-8')); + $body = mb_convert_encoding($body, 'UTF-8', (preg_match('/meta.+content=["|\']text\/html;\s+charset=([^"|\']+)/i', $body, $o) ? $o[1] : 'UTF-8')); $body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8"); $doc = new \DOMDocument(); -- cgit v1.2.3 From 8b9acf750bde9b21551367f34e57ff549d7d3297 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 24 Oct 2018 20:22:27 +0200 Subject: autocomplete performance: this slightly changes the editor contact autocomplete behaviour. queries using *like* with a prepended % to the query string do not make use of indices. this is no big issue when we query abook but can get really slow when xchan table is involved. this commit changes the xchan table only queries to use the *str%* format. this means that the result set for channels we are not connected with will change in a way that xchan_name and xchan_addr will bematched only from the beginning of the name or address. this commit also changes textcomplete to only start the query after the 3rd character. the result set between 2 and 3 characters is mostly very different and only from 3 chars on there is a high possibility the channel we look for is already in the result. --- Zotlabs/Module/Acl.php | 9 +++++---- view/js/autocomplete.js | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index ea131e08c..cbb58f5fe 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -83,7 +83,8 @@ class Acl extends \Zotlabs\Web\Controller { if($search) { $sql_extra = " AND pgrp.gname LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " "; $sql_extra2 = "AND ( xchan_name LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " OR xchan_addr LIKE " . protect_sprintf( "'%" . dbesc(punify($search)) . ((strpos($search,'@') === false) ? "%@%'" : "%'")) . ") "; - + $sql_extra2_xchan = "AND ( xchan_name LIKE " . protect_sprintf( "'" . dbesc($search) . "%'" ) . " OR xchan_addr LIKE " . protect_sprintf( "'" . dbesc(punify($search)) . ((strpos($search,'@') === false) ? "%@%'" : "%'")) . ") "; + // This horrible mess is needed because position also returns 0 if nothing is found. // Would be MUCH easier if it instead returned a very large value // Otherwise we could just @@ -226,7 +227,7 @@ class Acl extends \Zotlabs\Web\Controller { else { // Visitors $r = q("SELECT xchan_hash as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_their_perms, 0 as abook_flags, 0 as abook_self FROM xchan left join xlink on xlink_link = xchan_hash - WHERE xlink_xchan = '%s' AND xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" , + WHERE xlink_xchan = '%s' AND xchan_deleted = 0 $sql_extra2_xchan order by $order_extra2 xchan_name asc" , dbesc(get_observer_hash()) ); @@ -242,7 +243,7 @@ class Acl extends \Zotlabs\Web\Controller { $r2 = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, abook_flags, abook_self FROM abook left join xchan on abook_xchan = xchan_hash - WHERE abook_channel IN ($extra_channels_sql) $known_hashes_sql AND abook_blocked = 0 and abook_pending = 0 and abook_hidden = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc"); + WHERE abook_channel IN ($extra_channels_sql) $known_hashes_sql AND abook_blocked = 0 and abook_pending = 0 and abook_hidden = 0 and xchan_deleted = 0 $sql_extra2_xchan order by $order_extra2 xchan_name asc"); if($r2) $r = array_merge($r,$r2); @@ -270,7 +271,7 @@ class Acl extends \Zotlabs\Web\Controller { if((count($r) < 100) && $type == 'c') { $r2 = q("SELECT substr(xchan_hash,1,18) as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_their_perms, 0 as abook_flags, 0 as abook_self FROM xchan - WHERE xchan_deleted = 0 and not xchan_network in ('rss','anon','unknown') $sql_extra2 order by $order_extra2 xchan_name asc" + WHERE xchan_deleted = 0 and not xchan_network in ('rss','anon','unknown') $sql_extra2_xchan order by $order_extra2 xchan_name asc" ); if($r2) { $r = array_merge($r,$r2); diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index aa580b163..6b77f0631 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -163,7 +163,7 @@ function string2bb(element) { // Autocomplete contacts contacts = { - match: /(^|\s)(@\!*)([^ \n]{2,})$/, + match: /(^|\s)(@\!*)([^ \n]{3,})$/, index: 3, cache: true, search: function(term, callback) { contact_search(term, callback, backend_url, 'c', extra_channels, spinelement=false); }, -- cgit v1.2.3 From 615402ea83e0ff3fa4b92a1e50ef40f8d18d61f5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 24 Oct 2018 20:34:15 +0200 Subject: wrong var --- Zotlabs/Module/Acl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index cbb58f5fe..738e8fbe2 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -243,7 +243,7 @@ class Acl extends \Zotlabs\Web\Controller { $r2 = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, abook_flags, abook_self FROM abook left join xchan on abook_xchan = xchan_hash - WHERE abook_channel IN ($extra_channels_sql) $known_hashes_sql AND abook_blocked = 0 and abook_pending = 0 and abook_hidden = 0 and xchan_deleted = 0 $sql_extra2_xchan order by $order_extra2 xchan_name asc"); + WHERE abook_channel IN ($extra_channels_sql) $known_hashes_sql AND abook_blocked = 0 and abook_pending = 0 and abook_hidden = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc"); if($r2) $r = array_merge($r,$r2); -- cgit v1.2.3 From 5c4fbbebe1bd633e30a907b4a188d04c2f2f4fb0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 24 Oct 2018 20:58:25 +0200 Subject: refine stream filter and forum notification behaviour (mostly for performance). personal posts will be displayed in unthreaded mode and clicking a forum notification will show only the unseen items of the forum in unthreaded mode. group the filters in the widget - threaded at the top, unthreaded beneath. --- Zotlabs/Module/Network.php | 50 +++++++++++++++++++------------- Zotlabs/Module/Ping.php | 2 +- Zotlabs/Widget/Activity_filter.php | 59 +++++++++++++++++++------------------- Zotlabs/Widget/Activity_order.php | 4 +-- include/dba/dba_driver.php | 2 +- view/tpl/build_query.tpl | 2 ++ 6 files changed, 66 insertions(+), 53 deletions(-) diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 792f92418..e8ee1eef9 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -128,11 +128,12 @@ class Network extends \Zotlabs\Web\Controller { $xchan = ((x($_GET,'xchan')) ? $_GET['xchan'] : ''); $net = ((x($_GET,'net')) ? $_GET['net'] : ''); $pf = ((x($_GET,'pf')) ? $_GET['pf'] : ''); + $unseen = ((x($_GET,'unseen')) ? $_GET['unseen'] : ''); $deftag = ''; - if(x($_GET,'search') || $file || (!$pf && $cid) || $hashtags || $verb || $category) + if(x($_GET,'search') || $file || (!$pf && $cid) || $hashtags || $verb || $category || $conv || $unseen) $nouveau = true; if($cid) { @@ -220,6 +221,7 @@ class Network extends \Zotlabs\Web\Controller { $sql_extra = ''; if($group) { + $contact_str = ''; $contacts = group_get_members($group); if($contacts) { @@ -232,7 +234,6 @@ class Network extends \Zotlabs\Web\Controller { } } $item_thread_top = ''; - $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str )) or allow_gid like '" . protect_sprintf('%<' . dbesc($group_hash) . '>%') . "' ) and id = parent $item_normal ) "; $x = group_rec_byhash(local_channel(), $group_hash); @@ -252,9 +253,20 @@ class Network extends \Zotlabs\Web\Controller { if($load || $update) { if(!$pf && $nouveau) { + // This is for nouveau view cid queries (not a public forum) $sql_extra = " AND author_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' "; } + elseif($pf && $unseen && $nouveau) { + + $ttype = TERM_FORUM; + // This is for nouveau view public forum cid queries (if a forum notification is clicked) + $p = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($cid_r[0]['xchan_name']) . "'"); + + $p = ids_to_querystr($p, 'parent'); + $sql_extra = " AND ( owner_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' OR item.parent IN ( $p ) ) AND item_unseen = 1 "; + } else { + // This is for threaded view cid queries (e.g. if a forum is selected from the forum filter) $ttype = (($pf) ? TERM_FORUM : TERM_MENTION); $p1 = q("SELECT DISTINCT parent FROM item WHERE uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' OR owner_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' ) $item_normal "); @@ -345,7 +357,8 @@ class Network extends \Zotlabs\Web\Controller { '$verb' => $verb, '$net' => $net, '$dbegin' => $datequery2, - '$pf' => (($pf) ? $pf : '0'), + '$pf' => (($pf) ? $pf : '0'), + '$unseen' => $unseen )); } @@ -386,15 +399,7 @@ class Network extends \Zotlabs\Web\Controller { if($conv) { $item_thread_top = ''; - - if($nouveau) { - $sql_extra .= " AND author_xchan = '" . dbesc($channel['channel_hash']) . "' "; - } - else { - $sql_extra .= sprintf(" AND parent IN (SELECT distinct(parent) from item where ( author_xchan = '%s' or item_mentionsme = 1 )) ", - dbesc(protect_sprintf($channel['channel_hash'])) - ); - } + $sql_extra .= " AND ( author_xchan = '" . dbesc($channel['channel_hash']) . "' OR item_mentionsme = 1 ) "; } if($update && ! $load) { @@ -441,9 +446,11 @@ class Network extends \Zotlabs\Web\Controller { $page_mode = 'list'; else $page_mode = 'client'; - - $simple_update = (($update) ? " and item_unseen = 1 " : ''); + $parents_str = ''; + $update_unseen = ''; + + $simple_update = (($update) ? " and item_unseen = 1 " : ''); // This fixes a very subtle bug so I'd better explain it. You wake up in the morning or return after a day // or three and look at your matrix page - after opening up your browser. The first page loads just as it @@ -459,15 +466,15 @@ class Network extends \Zotlabs\Web\Controller { if($update && $_SESSION['loadtime']) $simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) "; - if($load) - $simple_update = ''; + + if($load) + $simple_update = ''; if($static && $simple_update) $simple_update .= " and item_thread_top = 0 and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' "; if($nouveau && $load) { // "New Item View" - show all items unthreaded in reverse created date order - $items = q("SELECT item.*, item.id AS item_id, created FROM item left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids ) $net_query @@ -478,7 +485,12 @@ class Network extends \Zotlabs\Web\Controller { $net_query2 ORDER BY item.created DESC $pager_sql " ); - + + $parents_str = ids_to_querystr($items,'item_id'); + if($parents_str) { + $update_unseen = " AND id IN ( " . dbesc($parents_str) . " )"; + } + require_once('include/items.php'); xchan_query($items); @@ -521,8 +533,6 @@ class Network extends \Zotlabs\Web\Controller { } // Then fetch all the children of the parents that are on this page - $parents_str = ''; - $update_unseen = ''; if($r) { diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index 14627f56e..bc6985301 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -650,7 +650,7 @@ class Ping extends \Zotlabs\Web\Controller { dbesc($forums[$x]['xchan_hash']) ); if($r[0]['unseen']) { - $forums[$x]['notify_link'] = (($forums[$x]['private_forum']) ? $forums[$x]['xchan_url'] : z_root() . '/network/?f=&pf=1&cid=' . $forums[$x]['abook_id']); + $forums[$x]['notify_link'] = (($forums[$x]['private_forum']) ? $forums[$x]['xchan_url'] : z_root() . '/network/?f=&pf=1&unseen=1&cid=' . $forums[$x]['abook_id']); $forums[$x]['name'] = $forums[$x]['xchan_name']; $forums[$x]['url'] = $forums[$x]['xchan_url']; $forums[$x]['photo'] = $forums[$x]['xchan_photo_s']; diff --git a/Zotlabs/Widget/Activity_filter.php b/Zotlabs/Widget/Activity_filter.php index 4ea0086dd..32ab10c77 100644 --- a/Zotlabs/Widget/Activity_filter.php +++ b/Zotlabs/Widget/Activity_filter.php @@ -16,35 +16,6 @@ class Activity_filter { $tabs = []; - if(feature_enabled(local_channel(),'personal_tab')) { - if(x($_GET,'conv')) { - $conv_active = (($_GET['conv'] == 1) ? 'active' : ''); - $filter_active = 'personal'; - } - - $tabs[] = [ - 'label' => t('Personal Posts'), - 'icon' => 'user-circle', - 'url' => z_root() . '/' . $cmd . '/?f=&conv=1', - 'sel' => $conv_active, - 'title' => t('Show posts that mention or involve me') - ]; - } - - if(feature_enabled(local_channel(),'star_posts')) { - if(x($_GET,'star')) { - $starred_active = (($_GET['star'] == 1) ? 'active' : ''); - $filter_active = 'star'; - } - - $tabs[] = [ - 'label' => t('Starred Posts'), - 'icon' => 'star', - 'url'=>z_root() . '/' . $cmd . '/?f=&star=1', - 'sel'=>$starred_active, - 'title' => t('Show posts that I have starred') - ]; - } if(Apps::system_app_installed(local_channel(), 'Privacy Groups')) { $groups = q("SELECT * FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", @@ -110,6 +81,36 @@ class Activity_filter { } } + if(feature_enabled(local_channel(),'star_posts')) { + if(x($_GET,'star')) { + $starred_active = (($_GET['star'] == 1) ? 'active' : ''); + $filter_active = 'star'; + } + + $tabs[] = [ + 'label' => t('Starred Posts'), + 'icon' => 'star', + 'url'=>z_root() . '/' . $cmd . '/?f=&star=1', + 'sel'=>$starred_active, + 'title' => t('Show posts that I have starred') + ]; + } + + if(feature_enabled(local_channel(),'personal_tab')) { + if(x($_GET,'conv')) { + $conv_active = (($_GET['conv'] == 1) ? 'active' : ''); + $filter_active = 'personal'; + } + + $tabs[] = [ + 'label' => t('Personal Posts'), + 'icon' => 'user-circle', + 'url' => z_root() . '/' . $cmd . '/?f=&conv=1', + 'sel' => $conv_active, + 'title' => t('Show posts that mention or involve me') + ]; + } + if(feature_enabled(local_channel(),'filing')) { $terms = q("select distinct term from term where uid = %d and ttype = %d order by term asc", intval(local_channel()), diff --git a/Zotlabs/Widget/Activity_order.php b/Zotlabs/Widget/Activity_order.php index 1cba1ce8c..d3fe2a30f 100644 --- a/Zotlabs/Widget/Activity_order.php +++ b/Zotlabs/Widget/Activity_order.php @@ -54,8 +54,8 @@ class Activity_order { } } - // override order for search, filer and cid results - if(x($_GET,'search') || x($_GET,'file') || (! x($_GET,'pf') && x($_GET,'cid')) || x($_GET,'verb') || x($_GET,'tag') || x($_GET,'cat')) { + // override order for some filter results + if(x($_GET,'search') || x($_GET,'file') || (! x($_GET,'pf') && x($_GET,'cid')) || x($_GET,'verb') || x($_GET,'tag') || x($_GET,'cat') || x($_GET,'conv') || x($_GET,'unseen')) { $unthreaded_active = 'active'; $commentord_active = $postord_active = 'disabled'; } diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php index 9e9f24bb3..9533acc7f 100755 --- a/include/dba/dba_driver.php +++ b/include/dba/dba_driver.php @@ -484,4 +484,4 @@ function db_columns($table) { } return []; -} \ No newline at end of file +} diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl index 2c55a8140..fcb22b605 100755 --- a/view/tpl/build_query.tpl +++ b/view/tpl/build_query.tpl @@ -31,6 +31,7 @@ var bParam_verb = "{{$verb}}"; var bParam_net = "{{$net}}"; var bParam_pf = "{{$pf}}"; + var bParam_unseen = "{{$unseen}}"; function buildCmd() { var udargs = ((page_load) ? "/load" : ""); @@ -62,6 +63,7 @@ if(bParam_net != "") bCmd = bCmd + "&net=" + bParam_net; if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page; if(bParam_pf != 0) bCmd = bCmd + "&pf=" + bParam_pf; + if(bParam_unseen != 0) bCmd = bCmd + "&unseen=" + bParam_unseen; return(bCmd); } -- cgit v1.2.3 From 25c7e64ded56fcd8030cb898ba187be612c7b0f1 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 24 Oct 2018 23:06:32 +0200 Subject: fix get on {1} --- view/tpl/notifications_widget.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 9b3d7487e..f43d82301 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -143,7 +143,7 @@

{9} - + {2} -- cgit v1.2.3 From 802a7ff3a8005641bae3a82bbe2a32a15c9ad7eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Jim=C3=A9nez=20Friaza?= Date: Thu, 25 Oct 2018 11:37:06 +0200 Subject: New strings in Spanish translation --- view/es-es/hmessages.po | 916 +++++++++++++++++++++++++----------------------- view/es-es/hstrings.php | 43 ++- 2 files changed, 516 insertions(+), 443 deletions(-) diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index 54a1f3bed..f2c1ccf79 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the hubzilla package. # # Translators: -# alfonsomthd , 2015 +# Alfonso Martínez , 2015 # inboxwall , 2015 # jeroenpraat , 2015 # Manuel Jiménez Friaza , 2017-2018 @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: hubzilla\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-06 17:07+0200\n" -"PO-Revision-Date: 2018-10-11 10:13+0000\n" +"POT-Creation-Date: 2018-10-19 11:04+0200\n" +"PO-Revision-Date: 2018-10-24 11:35+0000\n" "Last-Translator: Manuel Jiménez Friaza \n" "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/hubzilla/language/es_ES/)\n" "MIME-Version: 1.0\n" @@ -158,9 +158,9 @@ msgstr "Especial - Repositorio de grupo" #: ../../Zotlabs/Access/PermissionRoles.php:306 #: ../../Zotlabs/Module/Cdav.php:1227 ../../Zotlabs/Module/Connedit.php:919 -#: ../../Zotlabs/Module/Profiles.php:795 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/selectors.php:104 -#: ../../include/selectors.php:140 ../../include/event.php:1315 +#: ../../Zotlabs/Module/Profiles.php:795 ../../include/selectors.php:60 +#: ../../include/selectors.php:77 ../../include/selectors.php:115 +#: ../../include/selectors.php:151 ../../include/event.php:1315 #: ../../include/event.php:1322 ../../include/connections.php:703 #: ../../include/connections.php:710 msgid "Other" @@ -202,7 +202,7 @@ msgstr "El perfil solicitado no está disponible." #: ../../Zotlabs/Module/Mood.php:124 ../../Zotlabs/Module/Connections.php:32 #: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:70 #: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:59 -#: ../../Zotlabs/Module/Wiki.php:282 ../../Zotlabs/Module/Wiki.php:415 +#: ../../Zotlabs/Module/Wiki.php:285 ../../Zotlabs/Module/Wiki.php:428 #: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Poke.php:157 #: ../../Zotlabs/Module/Profile_photo.php:302 #: ../../Zotlabs/Module/Profile_photo.php:315 @@ -229,7 +229,7 @@ msgstr "El perfil solicitado no está disponible." #: ../../Zotlabs/Module/Register.php:77 #: ../../Zotlabs/Module/Cover_photo.php:313 #: ../../Zotlabs/Module/Cover_photo.php:326 -#: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Network.php:17 +#: ../../Zotlabs/Module/Display.php:448 ../../Zotlabs/Module/Network.php:17 #: ../../Zotlabs/Module/Filestorage.php:15 #: ../../Zotlabs/Module/Filestorage.php:70 #: ../../Zotlabs/Module/Filestorage.php:96 @@ -291,7 +291,7 @@ msgstr "Crear" #: ../../Zotlabs/Module/Connections.php:284 #: ../../Zotlabs/Module/Connections.php:322 #: ../../Zotlabs/Module/Connections.php:342 ../../Zotlabs/Module/Wiki.php:211 -#: ../../Zotlabs/Module/Wiki.php:371 ../../Zotlabs/Module/Menu.php:175 +#: ../../Zotlabs/Module/Wiki.php:384 ../../Zotlabs/Module/Menu.php:175 #: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Group.php:235 #: ../../Zotlabs/Module/Editwebpage.php:142 #: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Card_edit.php:99 @@ -304,7 +304,7 @@ msgid "Edit" msgstr "Editar" #: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1104 -#: ../../Zotlabs/Module/Wiki.php:296 ../../Zotlabs/Module/Layouts.php:194 +#: ../../Zotlabs/Module/Wiki.php:301 ../../Zotlabs/Module/Layouts.php:194 #: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Widget/Cdav.php:124 #: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1389 msgid "Share" @@ -330,7 +330,7 @@ msgid "Delete" msgstr "Eliminar" #: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:695 -#: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:396 +#: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:409 #: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Webpages.php:261 #: ../../Zotlabs/Module/Pubsites.php:60 msgid "View" @@ -448,7 +448,7 @@ msgstr "3. Pulse [conectar]" #: ../../Zotlabs/Module/Admin/Profs.php:178 #: ../../Zotlabs/Module/Admin/Account_edit.php:73 #: ../../Zotlabs/Module/Admin/Security.php:112 -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:493 #: ../../Zotlabs/Module/Settings/Features.php:46 #: ../../Zotlabs/Module/Settings/Events.php:41 #: ../../Zotlabs/Module/Settings/Calendar.php:41 @@ -456,10 +456,10 @@ msgstr "3. Pulse [conectar]" #: ../../Zotlabs/Module/Settings/Connections.php:41 #: ../../Zotlabs/Module/Settings/Photos.php:41 #: ../../Zotlabs/Module/Settings/Account.php:103 -#: ../../Zotlabs/Module/Settings/Profiles.php:41 +#: ../../Zotlabs/Module/Settings/Profiles.php:50 #: ../../Zotlabs/Module/Settings/Manage.php:41 #: ../../Zotlabs/Module/Settings/Featured.php:54 -#: ../../Zotlabs/Module/Settings/Channel_home.php:61 +#: ../../Zotlabs/Module/Settings/Channel_home.php:89 #: ../../Zotlabs/Module/Settings/Directory.php:41 #: ../../Zotlabs/Module/Settings/Editor.php:41 #: ../../Zotlabs/Module/Settings/Display.php:189 @@ -473,7 +473,7 @@ msgstr "3. Pulse [conectar]" #: ../../Zotlabs/Module/Poke.php:217 ../../Zotlabs/Module/Connedit.php:888 #: ../../Zotlabs/Module/Chat.php:211 ../../Zotlabs/Module/Chat.php:250 #: ../../Zotlabs/Module/Email_validation.php:40 -#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:265 +#: ../../Zotlabs/Module/Pconfig.php:111 ../../Zotlabs/Module/Defperms.php:265 #: ../../Zotlabs/Module/Group.php:140 ../../Zotlabs/Module/Group.php:156 #: ../../Zotlabs/Module/Profiles.php:723 ../../Zotlabs/Module/Editpost.php:85 #: ../../Zotlabs/Module/Sources.php:125 ../../Zotlabs/Module/Sources.php:162 @@ -481,8 +481,8 @@ msgstr "3. Pulse [conectar]" #: ../../Zotlabs/Module/Filestorage.php:183 ../../Zotlabs/Module/Rate.php:166 #: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Lib/ThreadItem.php:767 #: ../../Zotlabs/Widget/Eventstools.php:16 -#: ../../Zotlabs/Widget/Wiki_pages.php:40 -#: ../../Zotlabs/Widget/Wiki_pages.php:97 +#: ../../Zotlabs/Widget/Wiki_pages.php:42 +#: ../../Zotlabs/Widget/Wiki_pages.php:99 #: ../../view/theme/redbasic_c/php/config.php:95 #: ../../view/theme/redbasic/php/config.php:94 #: ../../addon/skeleton/skeleton.php:65 ../../addon/planets/planets.php:153 @@ -513,7 +513,7 @@ msgstr "3. Pulse [conectar]" #: ../../addon/cart/Settings/Cart.php:114 ../../addon/cart/cart.php:1263 #: ../../addon/cart/submodules/manualcat.php:248 #: ../../addon/cart/submodules/hzservices.php:640 -#: ../../addon/cart/submodules/subscriptions.php:401 +#: ../../addon/cart/submodules/subscriptions.php:410 #: ../../addon/piwik/piwik.php:95 ../../addon/pageheader/pageheader.php:48 #: ../../addon/xmpp/xmpp.php:69 ../../addon/pumpio/pumpio.php:237 #: ../../addon/redfiles/redfiles.php:124 ../../addon/hubwall/hubwall.php:95 @@ -534,7 +534,7 @@ msgid "Add Article" msgstr "Añadir un artículo" #: ../../Zotlabs/Module/Articles.php:214 ../../Zotlabs/Lib/Apps.php:302 -#: ../../include/nav.php:477 +#: ../../include/nav.php:482 msgid "Articles" msgstr "Artículos" @@ -567,8 +567,8 @@ msgstr "Modificar la plantilla" #: ../../Zotlabs/Module/Article_edit.php:131 #: ../../Zotlabs/Module/Admin/Addons.php:423 #: ../../Zotlabs/Module/Oauth2.php:117 ../../Zotlabs/Module/Oauth2.php:145 -#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Wiki.php:356 -#: ../../Zotlabs/Module/Wiki.php:388 +#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Wiki.php:368 +#: ../../Zotlabs/Module/Wiki.php:401 #: ../../Zotlabs/Module/Profile_photo.php:465 #: ../../Zotlabs/Module/Connedit.php:925 ../../Zotlabs/Module/Fbrowser.php:66 #: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801 @@ -633,7 +633,7 @@ msgstr "Resumen: " #: ../../Zotlabs/Lib/Activity.php:858 ../../Zotlabs/Lib/Apps.php:994 #: ../../Zotlabs/Lib/Apps.php:1078 ../../Zotlabs/Storage/Browser.php:164 #: ../../Zotlabs/Widget/Portfolio.php:95 ../../Zotlabs/Widget/Album.php:84 -#: ../../addon/pubcrawl/as.php:964 ../../include/conversation.php:1166 +#: ../../addon/pubcrawl/as.php:963 ../../include/conversation.php:1166 msgid "Unknown" msgstr "Desconocido" @@ -769,7 +769,7 @@ msgstr "¡Disculpas! La edición de eventos recurrentes aún no se ha implementa #: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Connedit.php:907 #: ../../Zotlabs/Module/Chat.php:259 ../../Zotlabs/Module/Group.php:144 #: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth.php:139 -#: ../../Zotlabs/Lib/NativeWikiPage.php:558 +#: ../../Zotlabs/Lib/NativeWikiPage.php:561 #: ../../Zotlabs/Storage/Browser.php:285 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 #: ../../addon/rendezvous/rendezvous.php:172 @@ -795,7 +795,7 @@ msgstr "Teléfono" #: ../../Zotlabs/Module/Connedit.php:911 ../../Zotlabs/Module/Profiles.php:787 #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 -#: ../../addon/redred/redred.php:107 ../../include/network.php:1769 +#: ../../addon/redred/redred.php:107 ../../include/network.php:1779 msgid "Email" msgstr "Correo electrónico" @@ -983,7 +983,7 @@ msgstr "Buscar resultados para:" msgid "Reset form" msgstr "Reiniciar el formulario" -#: ../../Zotlabs/Module/Channel.php:424 ../../Zotlabs/Module/Display.php:375 +#: ../../Zotlabs/Module/Channel.php:424 ../../Zotlabs/Module/Display.php:374 msgid "" "You must enable javascript for your browser to be able to view this content." msgstr "Debe habilitar javascript para poder ver este contenido en su navegador." @@ -1204,7 +1204,7 @@ msgid "Menu Item Permissions" msgstr "Permisos del elemento del menú" #: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247 -#: ../../Zotlabs/Module/Settings/Channel.php:544 +#: ../../Zotlabs/Module/Settings/Channel.php:526 msgid "(click to open/close)" msgstr "(pulsar para abrir o cerrar)" @@ -1229,7 +1229,7 @@ msgstr "Usar la autenticación mágica si está disponible" #: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Events.php:473 #: ../../Zotlabs/Module/Removeme.php:63 #: ../../Zotlabs/Module/Admin/Site.php:255 -#: ../../Zotlabs/Module/Settings/Channel.php:315 +#: ../../Zotlabs/Module/Settings/Channel.php:309 #: ../../Zotlabs/Module/Settings/Display.php:89 #: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558 #: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:99 @@ -1284,7 +1284,7 @@ msgstr "Usar la autenticación mágica si está disponible" #: ../../addon/cart/submodules/hzservices.php:646 #: ../../addon/cart/submodules/hzservices.php:650 #: ../../addon/cart/submodules/subscriptions.php:153 -#: ../../addon/cart/submodules/subscriptions.php:416 +#: ../../addon/cart/submodules/subscriptions.php:425 #: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219 #: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227 #: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143 @@ -1297,7 +1297,7 @@ msgstr "No" #: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Events.php:473 #: ../../Zotlabs/Module/Removeme.php:63 #: ../../Zotlabs/Module/Admin/Site.php:257 -#: ../../Zotlabs/Module/Settings/Channel.php:315 +#: ../../Zotlabs/Module/Settings/Channel.php:309 #: ../../Zotlabs/Module/Settings/Display.php:89 #: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558 #: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:98 @@ -1351,7 +1351,7 @@ msgstr "No" #: ../../addon/cart/submodules/hzservices.php:646 #: ../../addon/cart/submodules/hzservices.php:650 #: ../../addon/cart/submodules/subscriptions.php:153 -#: ../../addon/cart/submodules/subscriptions.php:416 +#: ../../addon/cart/submodules/subscriptions.php:425 #: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219 #: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227 #: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143 @@ -1651,14 +1651,14 @@ msgstr "Servidor no encontrado" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69 #: ../../Zotlabs/Module/Like.php:384 ../../Zotlabs/Lib/Activity.php:1570 #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/diaspora/Receiver.php:1539 ../../addon/pubcrawl/as.php:1512 +#: ../../addon/diaspora/Receiver.php:1539 ../../addon/pubcrawl/as.php:1511 #: ../../include/conversation.php:116 ../../include/text.php:2028 msgid "photo" msgstr "foto" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384 #: ../../Zotlabs/Lib/Activity.php:1570 ../../addon/diaspora/Receiver.php:1539 -#: ../../addon/pubcrawl/as.php:1512 ../../include/conversation.php:144 +#: ../../addon/pubcrawl/as.php:1511 ../../include/conversation.php:144 #: ../../include/text.php:2034 msgid "status" msgstr "el mensaje de estado " @@ -1745,7 +1745,7 @@ msgstr "Ha creado %1$.0f de %2$.0f canales permitidos." #: ../../Zotlabs/Module/New_channel.php:157 #: ../../Zotlabs/Module/New_channel.php:164 #: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:256 -#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:288 +#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:293 msgid "Loading" msgstr "Cargando" @@ -1777,7 +1777,7 @@ msgid "Choose a short nickname" msgstr "Elija un alias corto" #: ../../Zotlabs/Module/New_channel.php:178 -#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Settings/Channel.php:535 #: ../../Zotlabs/Module/Register.php:261 msgid "Channel role and privacy" msgstr "Clase de canal y privacidad" @@ -1855,7 +1855,7 @@ msgid "" msgstr "Por defecto, solo la instancia del canal alojado en este servidor será eliminado de la red" #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:617 +#: ../../Zotlabs/Module/Settings/Channel.php:594 msgid "Remove Channel" msgstr "Eliminar el canal" @@ -2694,7 +2694,7 @@ msgstr "Permitir código" msgid "Disallow Code" msgstr "No permitir código" -#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:386 +#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:391 msgid "Channel" msgstr "Canal" @@ -2725,7 +2725,7 @@ msgstr "No se han encontrado temas." #: ../../Zotlabs/Module/Admin/Themes.php:72 #: ../../Zotlabs/Module/Admin/Addons.php:259 ../../Zotlabs/Module/Thing.php:94 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:45 -#: ../../Zotlabs/Module/Display.php:453 +#: ../../Zotlabs/Module/Display.php:452 #: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62 #: ../../include/items.php:3587 msgid "Item not found." @@ -2786,7 +2786,7 @@ msgstr "Ajustes del sitio actualizados." #: ../../Zotlabs/Module/Admin/Site.php:187 #: ../../view/theme/redbasic_c/php/config.php:15 -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3085 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3087 msgid "Default" msgstr "Predeterminado" @@ -2969,9 +2969,9 @@ msgstr "Página personal que se mostrará a los visitantes (por defecto: la pág #: ../../Zotlabs/Module/Admin/Site.php:314 msgid "" -"example: 'public' to show public stream, 'page/sys/home' to show a system " -"webpage called 'home' or 'include:home.html' to include a file." -msgstr "ejemplo: 'public' para mostrar contenido público, 'page/sys/home' para mostrar la página web definida como \"home\" o 'include:home.html' para mostrar el contenido de un fichero." +"example: 'pubstream' to show public stream, 'page/sys/home' to show a system" +" webpage called 'home' or 'include:home.html' to include a file." +msgstr "ejemplo: 'pubstream' para mostrar el stream público, 'page/sys/home' para mostrar una página web del sistema llamada 'home' o 'include:home.html' para incluir un archivo." #: ../../Zotlabs/Module/Admin/Site.php:315 msgid "Preserve site homepage URL" @@ -3592,12 +3592,12 @@ msgstr "Se ha eliminado el comentario" #: ../../Zotlabs/Module/Settings/Channel.php:78 #: ../../Zotlabs/Module/Settings/Channel.php:89 #: ../../Zotlabs/Module/Connedit.php:712 ../../Zotlabs/Widget/Affinity.php:24 -#: ../../include/selectors.php:123 ../../include/channel.php:444 +#: ../../include/selectors.php:134 ../../include/channel.php:444 #: ../../include/channel.php:445 ../../include/channel.php:452 msgid "Friends" msgstr "Amigos/as" -#: ../../Zotlabs/Module/Settings/Channel.php:272 +#: ../../Zotlabs/Module/Settings/Channel.php:266 #: ../../Zotlabs/Module/Defperms.php:111 #: ../../addon/rendezvous/rendezvous.php:82 #: ../../addon/openstreetmap/openstreetmap.php:184 @@ -3607,414 +3607,402 @@ msgstr "Amigos/as" msgid "Settings updated." msgstr "Ajustes actualizados." -#: ../../Zotlabs/Module/Settings/Channel.php:333 +#: ../../Zotlabs/Module/Settings/Channel.php:327 msgid "Nobody except yourself" msgstr "Nadie excepto usted" -#: ../../Zotlabs/Module/Settings/Channel.php:334 +#: ../../Zotlabs/Module/Settings/Channel.php:328 msgid "Only those you specifically allow" msgstr "Solo aquellos a los que usted permita explícitamente" -#: ../../Zotlabs/Module/Settings/Channel.php:335 +#: ../../Zotlabs/Module/Settings/Channel.php:329 msgid "Approved connections" msgstr "Conexiones aprobadas" -#: ../../Zotlabs/Module/Settings/Channel.php:336 +#: ../../Zotlabs/Module/Settings/Channel.php:330 msgid "Any connections" msgstr "Cualquier conexión" -#: ../../Zotlabs/Module/Settings/Channel.php:337 +#: ../../Zotlabs/Module/Settings/Channel.php:331 msgid "Anybody on this website" msgstr "Cualquiera en este sitio web" -#: ../../Zotlabs/Module/Settings/Channel.php:338 +#: ../../Zotlabs/Module/Settings/Channel.php:332 msgid "Anybody in this network" msgstr "Cualquiera en esta red" -#: ../../Zotlabs/Module/Settings/Channel.php:339 +#: ../../Zotlabs/Module/Settings/Channel.php:333 msgid "Anybody authenticated" msgstr "Cualquiera que esté autenticado" -#: ../../Zotlabs/Module/Settings/Channel.php:340 +#: ../../Zotlabs/Module/Settings/Channel.php:334 msgid "Anybody on the internet" msgstr "Cualquiera en internet" -#: ../../Zotlabs/Module/Settings/Channel.php:415 +#: ../../Zotlabs/Module/Settings/Channel.php:409 msgid "Publish your default profile in the network directory" msgstr "Publicar su perfil principal en el directorio de la red" -#: ../../Zotlabs/Module/Settings/Channel.php:420 +#: ../../Zotlabs/Module/Settings/Channel.php:414 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "¿Nos permite sugerirle como amigo potencial a los nuevos miembros?" -#: ../../Zotlabs/Module/Settings/Channel.php:424 +#: ../../Zotlabs/Module/Settings/Channel.php:418 msgid "or" msgstr "o" -#: ../../Zotlabs/Module/Settings/Channel.php:433 +#: ../../Zotlabs/Module/Settings/Channel.php:427 msgid "Your channel address is" msgstr "Su dirección de canal es" -#: ../../Zotlabs/Module/Settings/Channel.php:436 +#: ../../Zotlabs/Module/Settings/Channel.php:430 msgid "Your files/photos are accessible via WebDAV at" msgstr "Sus archivos y fotos son accesibles a través de WebDAV en " -#: ../../Zotlabs/Module/Settings/Channel.php:488 +#: ../../Zotlabs/Module/Settings/Channel.php:470 msgid "Automatic membership approval" msgstr "Aprobación automática de nuevos miembros" -#: ../../Zotlabs/Module/Settings/Channel.php:488 +#: ../../Zotlabs/Module/Settings/Channel.php:470 #: ../../Zotlabs/Module/Defperms.php:255 msgid "" "If enabled, connection requests will be approved without your interaction" msgstr "Si está habilitado, las solicitudes de conexión serán aprobadas sin su intervención." -#: ../../Zotlabs/Module/Settings/Channel.php:509 +#: ../../Zotlabs/Module/Settings/Channel.php:491 msgid "Channel Settings" msgstr "Ajustes del canal" -#: ../../Zotlabs/Module/Settings/Channel.php:516 +#: ../../Zotlabs/Module/Settings/Channel.php:498 msgid "Basic Settings" msgstr "Configuración básica" -#: ../../Zotlabs/Module/Settings/Channel.php:517 +#: ../../Zotlabs/Module/Settings/Channel.php:499 #: ../../include/channel.php:1528 msgid "Full Name:" msgstr "Nombre completo:" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:500 #: ../../Zotlabs/Module/Settings/Account.php:104 msgid "Email Address:" msgstr "Dirección de correo electrónico:" -#: ../../Zotlabs/Module/Settings/Channel.php:519 +#: ../../Zotlabs/Module/Settings/Channel.php:501 msgid "Your Timezone:" msgstr "Su huso horario:" -#: ../../Zotlabs/Module/Settings/Channel.php:520 +#: ../../Zotlabs/Module/Settings/Channel.php:502 msgid "Default Post Location:" msgstr "Localización geográfica predeterminada para sus publicaciones:" -#: ../../Zotlabs/Module/Settings/Channel.php:520 +#: ../../Zotlabs/Module/Settings/Channel.php:502 msgid "Geographical location to display on your posts" msgstr "Localización geográfica que debe mostrarse en sus publicaciones" -#: ../../Zotlabs/Module/Settings/Channel.php:521 +#: ../../Zotlabs/Module/Settings/Channel.php:503 msgid "Use Browser Location:" msgstr "Usar la localización geográfica del navegador:" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:505 msgid "Adult Content" msgstr "Contenido solo para adultos" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:505 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "Este canal publica contenido solo para adultos con frecuencia o regularmente. (Por favor etiquete cualquier material para adultos con la etiqueta #NSFW)" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:507 msgid "Security and Privacy Settings" msgstr "Configuración de seguridad y privacidad" -#: ../../Zotlabs/Module/Settings/Channel.php:527 +#: ../../Zotlabs/Module/Settings/Channel.php:509 msgid "Your permissions are already configured. Click to view/adjust" msgstr "Sus permisos ya están configurados. Pulse para ver/ajustar" -#: ../../Zotlabs/Module/Settings/Channel.php:529 +#: ../../Zotlabs/Module/Settings/Channel.php:511 msgid "Hide my online presence" msgstr "Ocultar mi presencia en línea" -#: ../../Zotlabs/Module/Settings/Channel.php:529 +#: ../../Zotlabs/Module/Settings/Channel.php:511 msgid "Prevents displaying in your profile that you are online" msgstr "Evitar mostrar en su perfil que está en línea" -#: ../../Zotlabs/Module/Settings/Channel.php:531 +#: ../../Zotlabs/Module/Settings/Channel.php:513 msgid "Simple Privacy Settings:" msgstr "Configuración de privacidad sencilla:" -#: ../../Zotlabs/Module/Settings/Channel.php:532 +#: ../../Zotlabs/Module/Settings/Channel.php:514 msgid "" "Very Public - extremely permissive (should be used with caution)" msgstr "Muy Público - extremadamente permisivo (debería ser usado con precaución)" -#: ../../Zotlabs/Module/Settings/Channel.php:533 +#: ../../Zotlabs/Module/Settings/Channel.php:515 msgid "" "Typical - default public, privacy when desired (similar to social " "network permissions but with improved privacy)" msgstr "Típico - por defecto público, privado cuando se desee (similar a los permisos de una red social pero con privacidad mejorada)" -#: ../../Zotlabs/Module/Settings/Channel.php:534 +#: ../../Zotlabs/Module/Settings/Channel.php:516 msgid "Private - default private, never open or public" msgstr "Privado - por defecto, privado, nunca abierto o público" -#: ../../Zotlabs/Module/Settings/Channel.php:535 +#: ../../Zotlabs/Module/Settings/Channel.php:517 msgid "Blocked - default blocked to/from everybody" msgstr "Bloqueado - por defecto, bloqueado/a para cualquiera" -#: ../../Zotlabs/Module/Settings/Channel.php:537 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "Allow others to tag your posts" msgstr "Permitir a otros etiquetar sus publicaciones" -#: ../../Zotlabs/Module/Settings/Channel.php:537 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "A menudo usado por la comunidad para marcar contenido inapropiado de forma retroactiva." -#: ../../Zotlabs/Module/Settings/Channel.php:539 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "Channel Permission Limits" msgstr "Límites de los permisos del canal" -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "Expire other channel content after this many days" msgstr "Caducar contenido de otros canales después de este número de días" -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "0 or blank to use the website limit." msgstr "0 o en blanco para usar el límite del sitio web." -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 #, php-format msgid "This website expires after %d days." msgstr "Este sitio web caduca después de %d días." -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "This website does not expire imported content." msgstr "Este sitio web no caduca el contenido importado." -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "The website limit takes precedence if lower than your limit." msgstr "El límite del sitio web tiene prioridad si es inferior a su propio límite." -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "Maximum Friend Requests/Day:" msgstr "Máximo de solicitudes de amistad por día:" -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "May reduce spam activity" msgstr "Podría reducir la actividad de spam" -#: ../../Zotlabs/Module/Settings/Channel.php:543 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "Default Privacy Group" msgstr "Grupo de canales predeterminado" -#: ../../Zotlabs/Module/Settings/Channel.php:545 +#: ../../Zotlabs/Module/Settings/Channel.php:527 msgid "Use my default audience setting for the type of object published" msgstr "Usar los ajustes de mi audiencia predeterminada para el tipo de publicación" -#: ../../Zotlabs/Module/Settings/Channel.php:546 -msgid "Profile to assign new connections" -msgstr "Perfil para asignar a las nuevas conexiones" - -#: ../../Zotlabs/Module/Settings/Channel.php:556 +#: ../../Zotlabs/Module/Settings/Channel.php:536 msgid "Default permissions category" msgstr "Categoría de permisos por defecto" -#: ../../Zotlabs/Module/Settings/Channel.php:562 +#: ../../Zotlabs/Module/Settings/Channel.php:542 msgid "Maximum private messages per day from unknown people:" msgstr "Máximo de mensajes privados por día de gente desconocida:" -#: ../../Zotlabs/Module/Settings/Channel.php:562 +#: ../../Zotlabs/Module/Settings/Channel.php:542 msgid "Useful to reduce spamming" msgstr "Útil para reducir el envío de correo no deseado" -#: ../../Zotlabs/Module/Settings/Channel.php:565 +#: ../../Zotlabs/Module/Settings/Channel.php:545 #: ../../Zotlabs/Lib/Enotify.php:68 msgid "Notification Settings" msgstr "Configuración de las notificaciones" -#: ../../Zotlabs/Module/Settings/Channel.php:566 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "By default post a status message when:" msgstr "Por defecto, enviar un mensaje de estado cuando:" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:547 msgid "accepting a friend request" msgstr "Acepte una solicitud de amistad" -#: ../../Zotlabs/Module/Settings/Channel.php:568 +#: ../../Zotlabs/Module/Settings/Channel.php:548 msgid "joining a forum/community" msgstr "al unirse a un foro o comunidad" -#: ../../Zotlabs/Module/Settings/Channel.php:569 +#: ../../Zotlabs/Module/Settings/Channel.php:549 msgid "making an interesting profile change" msgstr "Realice un cambio interesante en su perfil" -#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:550 msgid "Send a notification email when:" msgstr "Enviar una notificación por correo electrónico cuando:" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:551 msgid "You receive a connection request" msgstr "Reciba una solicitud de conexión" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:552 msgid "Your connections are confirmed" msgstr "Sus conexiones hayan sido confirmadas" -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:553 msgid "Someone writes on your profile wall" msgstr "Alguien escriba en la página de su perfil (\"muro\")" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:554 msgid "Someone writes a followup comment" msgstr "Alguien escriba un comentario sobre sus publicaciones" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:555 msgid "You receive a private message" msgstr "Reciba un mensaje privado" -#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:556 msgid "You receive a friend suggestion" msgstr "Reciba una sugerencia de amistad" -#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:557 msgid "You are tagged in a post" msgstr "Usted sea etiquetado en una publicación" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:558 msgid "You are poked/prodded/etc. in a post" msgstr "Reciba un toque o incitación en una publicación" -#: ../../Zotlabs/Module/Settings/Channel.php:580 +#: ../../Zotlabs/Module/Settings/Channel.php:560 msgid "Someone likes your post/comment" msgstr "Alguien muestre agrado por su entrada o comentario" -#: ../../Zotlabs/Module/Settings/Channel.php:583 +#: ../../Zotlabs/Module/Settings/Channel.php:563 msgid "Show visual notifications including:" msgstr "Mostrar notificaciones visuales que incluyan:" -#: ../../Zotlabs/Module/Settings/Channel.php:585 +#: ../../Zotlabs/Module/Settings/Channel.php:565 msgid "Unseen stream activity" msgstr "Actividad del stream no vista" -#: ../../Zotlabs/Module/Settings/Channel.php:586 +#: ../../Zotlabs/Module/Settings/Channel.php:566 msgid "Unseen channel activity" msgstr "Actividad no vista en el canal" -#: ../../Zotlabs/Module/Settings/Channel.php:587 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Unseen private messages" msgstr "Mensajes privados no leídos" -#: ../../Zotlabs/Module/Settings/Channel.php:587 -#: ../../Zotlabs/Module/Settings/Channel.php:592 -#: ../../Zotlabs/Module/Settings/Channel.php:593 -#: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:574 #: ../../addon/jappixmini/jappixmini.php:343 msgid "Recommended" msgstr "Recomendado" -#: ../../Zotlabs/Module/Settings/Channel.php:588 +#: ../../Zotlabs/Module/Settings/Channel.php:568 msgid "Upcoming events" msgstr "Próximos eventos" -#: ../../Zotlabs/Module/Settings/Channel.php:589 +#: ../../Zotlabs/Module/Settings/Channel.php:569 msgid "Events today" msgstr "Eventos de hoy" -#: ../../Zotlabs/Module/Settings/Channel.php:590 +#: ../../Zotlabs/Module/Settings/Channel.php:570 msgid "Upcoming birthdays" msgstr "Próximos cumpleaños" -#: ../../Zotlabs/Module/Settings/Channel.php:590 +#: ../../Zotlabs/Module/Settings/Channel.php:570 msgid "Not available in all themes" msgstr "No disponible en todos los temas" -#: ../../Zotlabs/Module/Settings/Channel.php:591 +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "System (personal) notifications" msgstr "Notificaciones del sistema (personales)" -#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "System info messages" msgstr "Mensajes de información del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "System critical alerts" msgstr "Alertas críticas del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "New connections" msgstr "Nuevas conexiones" -#: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:575 msgid "System Registrations" msgstr "Registros del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:596 +#: ../../Zotlabs/Module/Settings/Channel.php:576 msgid "Unseen shared files" msgstr "Ficheros compartidos no vistos" -#: ../../Zotlabs/Module/Settings/Channel.php:597 +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "Unseen public stream activity" msgstr "Actividad del stream público no vista" -#: ../../Zotlabs/Module/Settings/Channel.php:598 +#: ../../Zotlabs/Module/Settings/Channel.php:578 msgid "Unseen likes and dislikes" msgstr "Los \"me gusta\" y \"no me gusta\" no vistos" -#: ../../Zotlabs/Module/Settings/Channel.php:599 +#: ../../Zotlabs/Module/Settings/Channel.php:579 msgid "Unseen forum posts" msgstr "Entradas no vistas en el foro" -#: ../../Zotlabs/Module/Settings/Channel.php:600 +#: ../../Zotlabs/Module/Settings/Channel.php:580 msgid "Email notification hub (hostname)" msgstr "Email de notificación del hub (nombre del host)" -#: ../../Zotlabs/Module/Settings/Channel.php:600 +#: ../../Zotlabs/Module/Settings/Channel.php:580 #, php-format msgid "" "If your channel is mirrored to multiple hubs, set this to your preferred " "location. This will prevent duplicate email notifications. Example: %s" msgstr "Si su canal está replicado en múltiples hubs, colóquelo en su ubicación preferida. Esto evitará la duplicación de notificaciones por correo electrónico. Ejemplo: %s" -#: ../../Zotlabs/Module/Settings/Channel.php:601 +#: ../../Zotlabs/Module/Settings/Channel.php:581 msgid "Show new wall posts, private messages and connections under Notices" msgstr "Mostrar nuevos mensajes en el muro, mensajes privados y conexiones en Avisos" -#: ../../Zotlabs/Module/Settings/Channel.php:603 +#: ../../Zotlabs/Module/Settings/Channel.php:583 msgid "Notify me of events this many days in advance" msgstr "Avisarme de los eventos con algunos días de antelación" -#: ../../Zotlabs/Module/Settings/Channel.php:603 +#: ../../Zotlabs/Module/Settings/Channel.php:583 msgid "Must be greater than 0" msgstr "Debe ser mayor que 0" -#: ../../Zotlabs/Module/Settings/Channel.php:609 +#: ../../Zotlabs/Module/Settings/Channel.php:588 msgid "Advanced Account/Page Type Settings" msgstr "Ajustes avanzados de la cuenta y de los tipos de página" -#: ../../Zotlabs/Module/Settings/Channel.php:610 +#: ../../Zotlabs/Module/Settings/Channel.php:589 msgid "Change the behaviour of this account for special situations" msgstr "Cambiar el comportamiento de esta cuenta en situaciones especiales" -#: ../../Zotlabs/Module/Settings/Channel.php:612 +#: ../../Zotlabs/Module/Settings/Channel.php:591 msgid "Miscellaneous Settings" msgstr "Ajustes diversos" -#: ../../Zotlabs/Module/Settings/Channel.php:613 +#: ../../Zotlabs/Module/Settings/Channel.php:592 msgid "Default photo upload folder" msgstr "Carpeta por defecto de las fotos subidas" -#: ../../Zotlabs/Module/Settings/Channel.php:613 -#: ../../Zotlabs/Module/Settings/Channel.php:614 +#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "%Y - current year, %m - current month" msgstr "%Y - año en curso, %m - mes actual" -#: ../../Zotlabs/Module/Settings/Channel.php:614 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "Default file upload folder" msgstr "Carpeta por defecto de los ficheros subidos" -#: ../../Zotlabs/Module/Settings/Channel.php:616 -msgid "Personal menu to display in your channel pages" -msgstr "Menú personal que debe mostrarse en las páginas de su canal" - -#: ../../Zotlabs/Module/Settings/Channel.php:618 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Remove this channel." msgstr "Eliminar este canal." -#: ../../Zotlabs/Module/Settings/Channel.php:619 -msgid "Firefox Share $Projectname provider" -msgstr "Servicio de compartición de Firefox: proveedor $Projectname" - #: ../../Zotlabs/Module/Settings/Features.php:43 msgid "Additional Features" msgstr "Funcionalidades" @@ -4108,7 +4096,7 @@ msgstr "Eliminar cuenta" msgid "Remove this account including all its channels" msgstr "Eliminar esta cuenta incluyendo todos sus canales" -#: ../../Zotlabs/Module/Settings/Profiles.php:39 +#: ../../Zotlabs/Module/Settings/Profiles.php:47 msgid "Profiles Settings" msgstr "Gestión de los perfiles" @@ -4152,17 +4140,21 @@ msgstr "Ajustes de los complementos" msgid "Please save/submit changes to any panel before opening another." msgstr "Guarde o envíe los cambios a cualquier panel antes de abrir otro." -#: ../../Zotlabs/Module/Settings/Channel_home.php:41 +#: ../../Zotlabs/Module/Settings/Channel_home.php:44 #: ../../Zotlabs/Module/Settings/Network.php:41 msgid "Max height of content (in pixels)" msgstr "Altura máxima del contenido (en píxeles)" -#: ../../Zotlabs/Module/Settings/Channel_home.php:43 +#: ../../Zotlabs/Module/Settings/Channel_home.php:46 #: ../../Zotlabs/Module/Settings/Network.php:43 msgid "Click to expand content exceeding this height" msgstr "Haga clic para expandir el contenido que exceda esta altura" -#: ../../Zotlabs/Module/Settings/Channel_home.php:58 +#: ../../Zotlabs/Module/Settings/Channel_home.php:59 +msgid "Personal menu to display in your channel pages" +msgstr "Menú personal que debe mostrarse en las páginas de su canal" + +#: ../../Zotlabs/Module/Settings/Channel_home.php:86 msgid "Channel Home Settings" msgstr "Ajustes del canal" @@ -4258,7 +4250,7 @@ msgid "Link post titles to source" msgstr "Enlazar título de la publicación a la fuente original" #: ../../Zotlabs/Module/Settings/Display.php:205 -#: ../../Zotlabs/Widget/Newmember.php:69 +#: ../../Zotlabs/Widget/Newmember.php:75 msgid "New Member Links" msgstr "Enlaces para nuevos miembros" @@ -5164,7 +5156,7 @@ msgstr "Proporcionar un wiki para su canal" #: ../../Zotlabs/Module/Wiki.php:77 ../../addon/cart/myshop.php:37 #: ../../addon/cart/cart.php:1440 #: ../../addon/cart/submodules/paypalbutton.php:456 -#: ../../addon/cart/manual_payments.php:63 +#: ../../addon/cart/manual_payments.php:93 msgid "Invalid channel" msgstr "Canal no válido" @@ -5181,7 +5173,7 @@ msgid "Error downloading wiki: " msgstr "Error al descargar el wiki: " #: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Widget/Wiki_list.php:19 -#: ../../include/nav.php:501 +#: ../../include/nav.php:506 msgid "Wikis" msgstr "Wikis" @@ -5202,21 +5194,21 @@ msgstr "Nombre del wiki" msgid "Content type" msgstr "Tipo de contenido" -#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:359 -#: ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:41 +#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:371 +#: ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../addon/mdpost/mdpost.php:41 #: ../../include/text.php:1892 msgid "Markdown" msgstr "Markdown" -#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:359 -#: ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1890 +#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:371 +#: ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1890 msgid "BBcode" msgstr "BBcode" -#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1893 +#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1893 msgid "Text" msgstr "Texto" @@ -5240,53 +5232,53 @@ msgstr "Crear un mensaje de estado para este wiki" msgid "Edit Wiki Name" msgstr "Editar el nombre del wiki" -#: ../../Zotlabs/Module/Wiki.php:271 +#: ../../Zotlabs/Module/Wiki.php:274 msgid "Wiki not found" msgstr "Wiki no encontrado" -#: ../../Zotlabs/Module/Wiki.php:295 +#: ../../Zotlabs/Module/Wiki.php:300 msgid "Rename page" msgstr "Renombrar la página" -#: ../../Zotlabs/Module/Wiki.php:316 +#: ../../Zotlabs/Module/Wiki.php:321 msgid "Error retrieving page content" msgstr "Error al recuperar el contenido de la página" -#: ../../Zotlabs/Module/Wiki.php:324 ../../Zotlabs/Module/Wiki.php:326 +#: ../../Zotlabs/Module/Wiki.php:329 ../../Zotlabs/Module/Wiki.php:331 msgid "New page" msgstr "Nueva página" -#: ../../Zotlabs/Module/Wiki.php:354 +#: ../../Zotlabs/Module/Wiki.php:366 msgid "Revision Comparison" msgstr "Comparación de revisiones" -#: ../../Zotlabs/Module/Wiki.php:355 ../../Zotlabs/Lib/NativeWikiPage.php:561 +#: ../../Zotlabs/Module/Wiki.php:367 ../../Zotlabs/Lib/NativeWikiPage.php:564 #: ../../Zotlabs/Widget/Wiki_page_history.php:25 msgid "Revert" msgstr "Revertir" -#: ../../Zotlabs/Module/Wiki.php:362 +#: ../../Zotlabs/Module/Wiki.php:374 msgid "Short description of your changes (optional)" msgstr "Breve descripción de sus cambios (opcional)" -#: ../../Zotlabs/Module/Wiki.php:371 +#: ../../Zotlabs/Module/Wiki.php:384 msgid "Source" msgstr "Fuente" -#: ../../Zotlabs/Module/Wiki.php:381 +#: ../../Zotlabs/Module/Wiki.php:394 msgid "New page name" msgstr "Nombre de la nueva página" -#: ../../Zotlabs/Module/Wiki.php:386 +#: ../../Zotlabs/Module/Wiki.php:399 msgid "Embed image from photo albums" msgstr "Incluir una imagen de los álbumes de fotos" -#: ../../Zotlabs/Module/Wiki.php:387 ../../addon/hsse/hsse.php:208 +#: ../../Zotlabs/Module/Wiki.php:400 ../../addon/hsse/hsse.php:208 #: ../../include/conversation.php:1411 msgid "Embed an image from your albums" msgstr "Incluir una imagen de sus álbumes" -#: ../../Zotlabs/Module/Wiki.php:389 +#: ../../Zotlabs/Module/Wiki.php:402 #: ../../Zotlabs/Module/Profile_photo.php:466 #: ../../Zotlabs/Module/Cover_photo.php:400 ../../addon/hsse/hsse.php:210 #: ../../addon/hsse/hsse.php:257 ../../include/conversation.php:1413 @@ -5294,100 +5286,100 @@ msgstr "Incluir una imagen de sus álbumes" msgid "OK" msgstr "OK" -#: ../../Zotlabs/Module/Wiki.php:390 +#: ../../Zotlabs/Module/Wiki.php:403 #: ../../Zotlabs/Module/Profile_photo.php:467 #: ../../Zotlabs/Module/Cover_photo.php:401 ../../addon/hsse/hsse.php:139 #: ../../include/conversation.php:1342 msgid "Choose images to embed" msgstr "Elegir imágenes para incluir" -#: ../../Zotlabs/Module/Wiki.php:391 +#: ../../Zotlabs/Module/Wiki.php:404 #: ../../Zotlabs/Module/Profile_photo.php:468 #: ../../Zotlabs/Module/Cover_photo.php:402 ../../addon/hsse/hsse.php:140 #: ../../include/conversation.php:1343 msgid "Choose an album" msgstr "Elegir un álbum" -#: ../../Zotlabs/Module/Wiki.php:392 +#: ../../Zotlabs/Module/Wiki.php:405 #: ../../Zotlabs/Module/Profile_photo.php:469 #: ../../Zotlabs/Module/Cover_photo.php:403 msgid "Choose a different album" msgstr "Elegir un álbum diferente..." -#: ../../Zotlabs/Module/Wiki.php:393 +#: ../../Zotlabs/Module/Wiki.php:406 #: ../../Zotlabs/Module/Profile_photo.php:470 #: ../../Zotlabs/Module/Cover_photo.php:404 ../../addon/hsse/hsse.php:142 #: ../../include/conversation.php:1345 msgid "Error getting album list" msgstr "Error al obtener la lista de álbumes" -#: ../../Zotlabs/Module/Wiki.php:394 +#: ../../Zotlabs/Module/Wiki.php:407 #: ../../Zotlabs/Module/Profile_photo.php:471 #: ../../Zotlabs/Module/Cover_photo.php:405 ../../addon/hsse/hsse.php:143 #: ../../include/conversation.php:1346 msgid "Error getting photo link" msgstr "Error al obtener el enlace de la foto" -#: ../../Zotlabs/Module/Wiki.php:395 +#: ../../Zotlabs/Module/Wiki.php:408 #: ../../Zotlabs/Module/Profile_photo.php:472 #: ../../Zotlabs/Module/Cover_photo.php:406 ../../addon/hsse/hsse.php:144 #: ../../include/conversation.php:1347 msgid "Error getting album" msgstr "Error al obtener el álbum" -#: ../../Zotlabs/Module/Wiki.php:397 +#: ../../Zotlabs/Module/Wiki.php:410 msgid "History" msgstr "Historial" -#: ../../Zotlabs/Module/Wiki.php:473 +#: ../../Zotlabs/Module/Wiki.php:488 msgid "Error creating wiki. Invalid name." msgstr "Error al crear el wiki: el nombre no es válido." -#: ../../Zotlabs/Module/Wiki.php:480 +#: ../../Zotlabs/Module/Wiki.php:495 msgid "A wiki with this name already exists." msgstr "Ya hay un wiki con este nombre." -#: ../../Zotlabs/Module/Wiki.php:493 +#: ../../Zotlabs/Module/Wiki.php:508 msgid "Wiki created, but error creating Home page." msgstr "Se ha creado el wiki, pero se ha producido un error al crear la página de inicio." -#: ../../Zotlabs/Module/Wiki.php:500 +#: ../../Zotlabs/Module/Wiki.php:515 msgid "Error creating wiki" msgstr "Error al crear el wiki" -#: ../../Zotlabs/Module/Wiki.php:523 +#: ../../Zotlabs/Module/Wiki.php:539 msgid "Error updating wiki. Invalid name." msgstr "Error al actualizar el wiki. Nombre no válido." -#: ../../Zotlabs/Module/Wiki.php:543 +#: ../../Zotlabs/Module/Wiki.php:559 msgid "Error updating wiki" msgstr "Error al actualizar el wiki" -#: ../../Zotlabs/Module/Wiki.php:558 +#: ../../Zotlabs/Module/Wiki.php:574 msgid "Wiki delete permission denied." msgstr "Se ha denegado el permiso para eliminar el wiki." -#: ../../Zotlabs/Module/Wiki.php:568 +#: ../../Zotlabs/Module/Wiki.php:584 msgid "Error deleting wiki" msgstr "Se ha producido un error al eliminar el wiki" -#: ../../Zotlabs/Module/Wiki.php:601 +#: ../../Zotlabs/Module/Wiki.php:617 msgid "New page created" msgstr "Se ha creado la nueva página" -#: ../../Zotlabs/Module/Wiki.php:722 +#: ../../Zotlabs/Module/Wiki.php:739 msgid "Cannot delete Home" msgstr "No se puede eliminar la página principal" -#: ../../Zotlabs/Module/Wiki.php:786 +#: ../../Zotlabs/Module/Wiki.php:803 msgid "Current Revision" msgstr "Revisión actual" -#: ../../Zotlabs/Module/Wiki.php:786 +#: ../../Zotlabs/Module/Wiki.php:803 msgid "Selected Revision" msgstr "Revisión seleccionada" -#: ../../Zotlabs/Module/Wiki.php:836 +#: ../../Zotlabs/Module/Wiki.php:853 msgid "You must be authenticated." msgstr "Debe estar autenticado." @@ -5667,7 +5659,7 @@ msgstr "Elemento no válido." #: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77 #: ../../Zotlabs/Module/Display.php:140 ../../Zotlabs/Module/Display.php:157 #: ../../Zotlabs/Module/Display.php:174 -#: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:185 +#: ../../Zotlabs/Lib/NativeWikiPage.php:521 ../../Zotlabs/Web/Router.php:185 #: ../../include/help.php:132 msgid "Page not found." msgstr "Página no encontrada." @@ -6067,12 +6059,12 @@ msgid "min" msgstr "min" #: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:320 -#: ../../include/features.php:391 ../../include/nav.php:409 +#: ../../include/features.php:391 ../../include/nav.php:414 msgid "Photos" msgstr "Fotos" #: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:315 -#: ../../Zotlabs/Storage/Browser.php:272 ../../include/nav.php:417 +#: ../../Zotlabs/Storage/Browser.php:272 ../../include/nav.php:422 msgid "Files" msgstr "Ficheros" @@ -6169,7 +6161,7 @@ msgid "Layouts" msgstr "Plantillas" #: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:323 -#: ../../include/nav.php:168 ../../include/nav.php:284 +#: ../../include/nav.php:168 ../../include/nav.php:289 #: ../../include/help.php:117 ../../include/help.php:125 msgid "Help" msgstr "Ayuda" @@ -6250,15 +6242,15 @@ msgstr "el comentario" msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "%1$s ha etiquetado %3$s de %2$s con %4$s" -#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59 +#: ../../Zotlabs/Module/Pconfig.php:27 ../../Zotlabs/Module/Pconfig.php:63 msgid "This setting requires special processing and editing has been blocked." msgstr "Este ajuste necesita de un proceso especial y la edición ha sido bloqueada." -#: ../../Zotlabs/Module/Pconfig.php:48 +#: ../../Zotlabs/Module/Pconfig.php:52 msgid "Configuration Editor" msgstr "Editor de configuración" -#: ../../Zotlabs/Module/Pconfig.php:49 +#: ../../Zotlabs/Module/Pconfig.php:53 msgid "" "Warning: Changing some settings could render your channel inoperable. Please" " leave this page unless you are comfortable with and knowledgeable about how" @@ -6782,7 +6774,7 @@ msgid "Add Card" msgstr "Añadir una ficha" #: ../../Zotlabs/Module/Cards.php:203 ../../Zotlabs/Lib/Apps.php:303 -#: ../../include/nav.php:466 +#: ../../include/nav.php:471 msgid "Cards" msgstr "Fichas" @@ -6882,7 +6874,7 @@ msgid "Export selected" msgstr "Exportar los elementos seleccionados" #: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Lib/Apps.php:316 -#: ../../include/nav.php:489 +#: ../../include/nav.php:494 msgid "Webpages" msgstr "Páginas web" @@ -7016,8 +7008,8 @@ msgstr "correo enviado" msgid "Delivery report for %1$s" msgstr "Informe de entrega para %1$s" -#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:39 -#: ../../Zotlabs/Widget/Wiki_pages.php:96 +#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:41 +#: ../../Zotlabs/Widget/Wiki_pages.php:98 msgid "Options" msgstr "Opciones" @@ -7154,14 +7146,14 @@ msgid "Previous action reversed." msgstr "Acción anterior revocada." #: ../../Zotlabs/Module/Like.php:438 ../../Zotlabs/Lib/Activity.php:1605 -#: ../../addon/diaspora/Receiver.php:1568 ../../addon/pubcrawl/as.php:1547 +#: ../../addon/diaspora/Receiver.php:1568 ../../addon/pubcrawl/as.php:1546 #: ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "A %1$s le gusta %3$s de %2$s" #: ../../Zotlabs/Module/Like.php:440 ../../Zotlabs/Lib/Activity.php:1607 -#: ../../addon/pubcrawl/as.php:1549 ../../include/conversation.php:163 +#: ../../addon/pubcrawl/as.php:1548 ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "A %1$s no le gusta %3$s de %2$s" @@ -7718,7 +7710,7 @@ msgstr "Cambiar la foto de portada del perfil" msgid "Documentation Search" msgstr "Búsqueda de Documentación" -#: ../../Zotlabs/Module/Help.php:80 ../../include/nav.php:399 +#: ../../Zotlabs/Module/Help.php:80 ../../include/nav.php:404 msgid "About" msgstr "Mi perfil" @@ -7742,11 +7734,11 @@ msgstr "Documentación de $Projectname" msgid "Contents" msgstr "Contenidos" -#: ../../Zotlabs/Module/Display.php:394 +#: ../../Zotlabs/Module/Display.php:393 msgid "Article" msgstr "Artículo" -#: ../../Zotlabs/Module/Display.php:446 +#: ../../Zotlabs/Module/Display.php:445 msgid "Item has been removed." msgstr "Se ha eliminado el elemento." @@ -8063,9 +8055,9 @@ msgid "Mark all seen" msgstr "Marcar todo como visto" #: ../../Zotlabs/Lib/Activity.php:1417 ../../Zotlabs/Lib/Activity.php:1614 -#: ../../widget/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1222 -#: ../../addon/pubcrawl/as.php:1377 ../../addon/pubcrawl/as.php:1556 -#: ../../include/network.php:1768 +#: ../../widget/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1221 +#: ../../addon/pubcrawl/as.php:1376 ../../addon/pubcrawl/as.php:1555 +#: ../../include/network.php:1778 msgid "ActivityPub" msgstr "ActivityPub" @@ -8109,12 +8101,12 @@ msgstr "Administrador del sitio" msgid "Report Bug" msgstr "Informe de errores" -#: ../../Zotlabs/Lib/Apps.php:306 ../../include/nav.php:455 +#: ../../Zotlabs/Lib/Apps.php:306 ../../include/nav.php:460 msgid "Bookmarks" msgstr "Marcadores" #: ../../Zotlabs/Lib/Apps.php:307 ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/nav.php:442 ../../include/nav.php:445 +#: ../../include/nav.php:447 ../../include/nav.php:450 msgid "Chatrooms" msgstr "Salas de chat" @@ -8135,7 +8127,7 @@ msgstr "Iniciar sesión" msgid "Stream" msgstr "Stream" -#: ../../Zotlabs/Lib/Apps.php:317 ../../include/nav.php:504 +#: ../../Zotlabs/Lib/Apps.php:317 ../../include/nav.php:509 msgid "Wiki" msgstr "Wiki" @@ -8290,79 +8282,79 @@ msgid "publisher" msgstr "editor" #: ../../Zotlabs/Lib/NativeWikiPage.php:42 -#: ../../Zotlabs/Lib/NativeWikiPage.php:93 +#: ../../Zotlabs/Lib/NativeWikiPage.php:94 msgid "(No Title)" msgstr "(Sin título)" -#: ../../Zotlabs/Lib/NativeWikiPage.php:107 +#: ../../Zotlabs/Lib/NativeWikiPage.php:109 msgid "Wiki page create failed." msgstr "Se ha producido un error en la creación de la página wiki." -#: ../../Zotlabs/Lib/NativeWikiPage.php:120 +#: ../../Zotlabs/Lib/NativeWikiPage.php:122 msgid "Wiki not found." msgstr "No se ha encontrado el wiki." -#: ../../Zotlabs/Lib/NativeWikiPage.php:131 +#: ../../Zotlabs/Lib/NativeWikiPage.php:133 msgid "Destination name already exists" msgstr "El nombre de destino ya existe" -#: ../../Zotlabs/Lib/NativeWikiPage.php:163 -#: ../../Zotlabs/Lib/NativeWikiPage.php:359 +#: ../../Zotlabs/Lib/NativeWikiPage.php:166 +#: ../../Zotlabs/Lib/NativeWikiPage.php:362 msgid "Page not found" msgstr "No se ha encontrado la página" -#: ../../Zotlabs/Lib/NativeWikiPage.php:194 +#: ../../Zotlabs/Lib/NativeWikiPage.php:197 msgid "Error reading page content" msgstr "Se ha producido un error al leer el contenido de la página" -#: ../../Zotlabs/Lib/NativeWikiPage.php:350 -#: ../../Zotlabs/Lib/NativeWikiPage.php:400 -#: ../../Zotlabs/Lib/NativeWikiPage.php:467 -#: ../../Zotlabs/Lib/NativeWikiPage.php:508 +#: ../../Zotlabs/Lib/NativeWikiPage.php:353 +#: ../../Zotlabs/Lib/NativeWikiPage.php:402 +#: ../../Zotlabs/Lib/NativeWikiPage.php:469 +#: ../../Zotlabs/Lib/NativeWikiPage.php:510 msgid "Error reading wiki" msgstr "Se ha producido un error al leer el wiki" -#: ../../Zotlabs/Lib/NativeWikiPage.php:388 +#: ../../Zotlabs/Lib/NativeWikiPage.php:390 msgid "Page update failed." msgstr "Se ha producido un error al actualizar la página." -#: ../../Zotlabs/Lib/NativeWikiPage.php:422 +#: ../../Zotlabs/Lib/NativeWikiPage.php:424 msgid "Nothing deleted" msgstr "No se ha eliminado nada" -#: ../../Zotlabs/Lib/NativeWikiPage.php:488 +#: ../../Zotlabs/Lib/NativeWikiPage.php:490 msgid "Compare: object not found." msgstr "No se ha encontrado un objeto para comparar." -#: ../../Zotlabs/Lib/NativeWikiPage.php:494 +#: ../../Zotlabs/Lib/NativeWikiPage.php:496 msgid "Page updated" msgstr "Se ha actualizado la página" -#: ../../Zotlabs/Lib/NativeWikiPage.php:497 +#: ../../Zotlabs/Lib/NativeWikiPage.php:499 msgid "Untitled" msgstr "Sin título" -#: ../../Zotlabs/Lib/NativeWikiPage.php:503 +#: ../../Zotlabs/Lib/NativeWikiPage.php:505 msgid "Wiki resource_id required for git commit" msgstr "Se necesita Wiki resource_id para el git commit" -#: ../../Zotlabs/Lib/NativeWikiPage.php:559 +#: ../../Zotlabs/Lib/NativeWikiPage.php:562 #: ../../Zotlabs/Widget/Wiki_page_history.php:23 msgctxt "wiki_history" msgid "Message" msgstr "Mensaje" -#: ../../Zotlabs/Lib/NativeWikiPage.php:560 +#: ../../Zotlabs/Lib/NativeWikiPage.php:563 #: ../../Zotlabs/Widget/Wiki_page_history.php:24 msgid "Date" msgstr "Fecha" -#: ../../Zotlabs/Lib/NativeWikiPage.php:562 +#: ../../Zotlabs/Lib/NativeWikiPage.php:565 #: ../../Zotlabs/Widget/Wiki_page_history.php:26 msgid "Compare" msgstr "Comparar" -#: ../../Zotlabs/Lib/NativeWikiPage.php:600 ../../include/bbcode.php:746 +#: ../../Zotlabs/Lib/NativeWikiPage.php:603 ../../include/bbcode.php:746 #: ../../include/bbcode.php:916 msgid "Different viewers will see this text differently" msgstr "Visitantes diferentes verán este texto de forma distinta" @@ -8771,11 +8763,11 @@ msgstr "ha editado una entrada fechada el %s" msgid "edited a comment dated %s" msgstr "ha editado un comentario fechado el %s" -#: ../../Zotlabs/Lib/NativeWiki.php:151 +#: ../../Zotlabs/Lib/NativeWiki.php:152 msgid "Wiki updated successfully" msgstr "El wiki se ha actualizado con éxito" -#: ../../Zotlabs/Lib/NativeWiki.php:205 +#: ../../Zotlabs/Lib/NativeWiki.php:206 msgid "Wiki files deleted successfully" msgstr "Se han borrado con éxito los ficheros del wiki" @@ -9024,8 +9016,8 @@ msgstr "Principal" msgid "Addressbook" msgstr "Libreta de direcciones" -#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:428 -#: ../../include/nav.php:431 +#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:433 +#: ../../include/nav.php:436 msgid "Calendar" msgstr "Calendario" @@ -9363,16 +9355,16 @@ msgstr "Eliminar término" msgid "Saved Searches" msgstr "Búsquedas guardadas" -#: ../../Zotlabs/Widget/Wiki_pages.php:32 -#: ../../Zotlabs/Widget/Wiki_pages.php:89 +#: ../../Zotlabs/Widget/Wiki_pages.php:34 +#: ../../Zotlabs/Widget/Wiki_pages.php:91 msgid "Add new page" msgstr "Añadir una nueva página" -#: ../../Zotlabs/Widget/Wiki_pages.php:83 +#: ../../Zotlabs/Widget/Wiki_pages.php:85 msgid "Wiki Pages" msgstr "Páginas del wiki" -#: ../../Zotlabs/Widget/Wiki_pages.php:94 +#: ../../Zotlabs/Widget/Wiki_pages.php:96 msgid "Page name" msgstr "Nombre de la página" @@ -9481,7 +9473,19 @@ msgstr "Ver el \"stream\" de su red" msgid "Documentation" msgstr "Documentación" -#: ../../Zotlabs/Widget/Newmember.php:65 +#: ../../Zotlabs/Widget/Newmember.php:57 +msgid "Missing Features?" +msgstr "¿Faltan Características?" + +#: ../../Zotlabs/Widget/Newmember.php:59 +msgid "Pin apps to navigation bar" +msgstr "Fijar apps a la barra de navegación" + +#: ../../Zotlabs/Widget/Newmember.php:60 +msgid "Install more apps" +msgstr "Instalar más apps" + +#: ../../Zotlabs/Widget/Newmember.php:71 msgid "View public stream" msgstr "Ver el \"stream\" público" @@ -9657,20 +9661,20 @@ msgstr "No se ha encontrado el canal de origen." msgid "Network/Protocol" msgstr "Red / Protocolo" -#: ../../widget/Netselect/Netselect.php:28 ../../include/network.php:1772 +#: ../../widget/Netselect/Netselect.php:28 ../../include/network.php:1782 msgid "Zot" msgstr "Zot" -#: ../../widget/Netselect/Netselect.php:31 ../../include/network.php:1770 +#: ../../widget/Netselect/Netselect.php:31 ../../include/network.php:1780 msgid "Diaspora" msgstr "Diaspora" -#: ../../widget/Netselect/Netselect.php:33 ../../include/network.php:1763 -#: ../../include/network.php:1764 +#: ../../widget/Netselect/Netselect.php:33 ../../include/network.php:1773 +#: ../../include/network.php:1774 msgid "Friendica" msgstr "Friendica" -#: ../../widget/Netselect/Netselect.php:38 ../../include/network.php:1765 +#: ../../widget/Netselect/Netselect.php:38 ../../include/network.php:1775 msgid "OStatus" msgstr "OStatus" @@ -10549,13 +10553,13 @@ msgstr "Error de protocolo OpenID. No se recuperó ninguna ID." msgid "Login failed." msgstr "El acceso ha fallado." -#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1487 +#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:60 +#: ../../include/selectors.php:77 ../../include/channel.php:1487 msgid "Male" msgstr "Hombre" -#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1485 +#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:60 +#: ../../include/selectors.php:77 ../../include/channel.php:1485 msgid "Female" msgstr "Mujer" @@ -11129,6 +11133,36 @@ msgstr "Ayuda para los ajustes" msgid "Jappix Mini Settings" msgstr "Ajustes de Jappix Mini" +#: ../../addon/upgrade_info/upgrade_info.php:43 +msgid "Your channel has been upgraded to the latest $Projectname version." +msgstr "Su canal ha sido actualizado a la última versión de $Projectname." + +#: ../../addon/upgrade_info/upgrade_info.php:44 +msgid "" +"To improve usability, we have converted some features into installable " +"stand-alone apps." +msgstr "Para mejorar la usabilidad, hemos convertido algunas características en aplicaciones independientes instalables." + +#: ../../addon/upgrade_info/upgrade_info.php:45 +msgid "Please visit the $Projectname" +msgstr "Por favor visite el sitio web de $Projectname" + +#: ../../addon/upgrade_info/upgrade_info.php:46 +msgid "app store" +msgstr "depósito de apps" + +#: ../../addon/upgrade_info/upgrade_info.php:47 +msgid "and install possibly missing apps." +msgstr "e instalar aplicaciones que posiblemente falten." + +#: ../../addon/upgrade_info/upgrade_info.php:52 +msgid "Upgrade Info" +msgstr "Información de actualización" + +#: ../../addon/upgrade_info/upgrade_info.php:56 +msgid "Do not show this again" +msgstr "No mostrar esto de nuevo" + #: ../../addon/channelreputation/channelreputation.php:101 #: ../../addon/channelreputation/channelreputation.php:102 #: ../../addon/cart/myshop.php:141 ../../addon/cart/myshop.php:177 @@ -11957,7 +11991,7 @@ msgstr "Debe iniciar sesión en la red para comprar." #: ../../addon/cart/cart.php:1462 #: ../../addon/cart/submodules/paypalbutton.php:392 -#: ../../addon/cart/manual_payments.php:38 +#: ../../addon/cart/manual_payments.php:68 msgid "Order not found." msgstr "El pedido no se ha encontrado." @@ -12097,39 +12131,39 @@ msgid "" "Cannot include subscription items with different terms in the same order." msgstr "No se pueden incluir artículos de suscripción con términos diferentes en el mismo orden." -#: ../../addon/cart/submodules/subscriptions.php:365 +#: ../../addon/cart/submodules/subscriptions.php:372 msgid "Select Subscription to Edit" msgstr "Seleccione suscripción a editar" -#: ../../addon/cart/submodules/subscriptions.php:371 +#: ../../addon/cart/submodules/subscriptions.php:380 msgid "Edit Subscriptions" msgstr "Editar suscripciones" -#: ../../addon/cart/submodules/subscriptions.php:405 +#: ../../addon/cart/submodules/subscriptions.php:414 msgid "Subscription SKU" msgstr "SKU de la suscripción" -#: ../../addon/cart/submodules/subscriptions.php:410 +#: ../../addon/cart/submodules/subscriptions.php:419 msgid "Catalog Description" msgstr "Descripción del catálogo" -#: ../../addon/cart/submodules/subscriptions.php:414 +#: ../../addon/cart/submodules/subscriptions.php:423 msgid "Subscription available for purchase." msgstr "Suscripción disponible para la compra." -#: ../../addon/cart/submodules/subscriptions.php:419 +#: ../../addon/cart/submodules/subscriptions.php:428 msgid "Maximum active subscriptions to this item per account." msgstr "Máximo de suscripciones activas a este artículo por cuenta." -#: ../../addon/cart/submodules/subscriptions.php:422 +#: ../../addon/cart/submodules/subscriptions.php:431 msgid "Subscription price." msgstr "Precio de la suscripción." -#: ../../addon/cart/submodules/subscriptions.php:426 +#: ../../addon/cart/submodules/subscriptions.php:435 msgid "Quantity" msgstr "Cuantía" -#: ../../addon/cart/submodules/subscriptions.php:430 +#: ../../addon/cart/submodules/subscriptions.php:439 msgid "Term" msgstr "Condición" @@ -12137,11 +12171,11 @@ msgstr "Condición" msgid "Error: order mismatch. Please try again." msgstr "Error: desajuste de pedidos. Por favor, inténtelo de nuevo." -#: ../../addon/cart/manual_payments.php:31 +#: ../../addon/cart/manual_payments.php:61 msgid "Manual payments are not enabled." msgstr "Los pagos manuales no están habilitados." -#: ../../addon/cart/manual_payments.php:47 +#: ../../addon/cart/manual_payments.php:77 msgid "Finished" msgstr "Terminado" @@ -12672,243 +12706,247 @@ msgstr "Dirección de correo electrónico del remitente" msgid "Test mode (only send to hub administrator)" msgstr "Modo de prueba (enviar sólo al administrador del hub)" -#: ../../include/selectors.php:30 +#: ../../include/selectors.php:18 +msgid "Profile to assign new connections" +msgstr "Perfil para asignar a las nuevas conexiones" + +#: ../../include/selectors.php:41 msgid "Frequently" msgstr "Frecuentemente" -#: ../../include/selectors.php:31 +#: ../../include/selectors.php:42 msgid "Hourly" msgstr "Cada hora" -#: ../../include/selectors.php:32 +#: ../../include/selectors.php:43 msgid "Twice daily" msgstr "Dos veces al día" -#: ../../include/selectors.php:33 +#: ../../include/selectors.php:44 msgid "Daily" msgstr "Diariamente" -#: ../../include/selectors.php:34 +#: ../../include/selectors.php:45 msgid "Weekly" msgstr "Semanalmente" -#: ../../include/selectors.php:35 +#: ../../include/selectors.php:46 msgid "Monthly" msgstr "Mensualmente" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Currently Male" msgstr "Actualmente hombre" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Currently Female" msgstr "Actualmente mujer" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Mostly Male" msgstr "Generalmente hombre" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Mostly Female" msgstr "Generalmente mujer" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Transgender" msgstr "Transgénero" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Intersex" msgstr "Intersexual" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Transsexual" msgstr "Transexual" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Hermaphrodite" msgstr "Hermafrodita" -#: ../../include/selectors.php:49 ../../include/channel.php:1491 +#: ../../include/selectors.php:60 ../../include/channel.php:1491 msgid "Neuter" msgstr "Neutral" -#: ../../include/selectors.php:49 ../../include/channel.php:1493 +#: ../../include/selectors.php:60 ../../include/channel.php:1493 msgid "Non-specific" msgstr "No especificado" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Undecided" msgstr "Indeciso/a" -#: ../../include/selectors.php:85 ../../include/selectors.php:104 +#: ../../include/selectors.php:96 ../../include/selectors.php:115 msgid "Males" msgstr "Hombres" -#: ../../include/selectors.php:85 ../../include/selectors.php:104 +#: ../../include/selectors.php:96 ../../include/selectors.php:115 msgid "Females" msgstr "Mujeres" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Gay" msgstr "Homosexual" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Lesbian" msgstr "Lesbiana" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "No Preference" msgstr "Sin preferencias" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Bisexual" msgstr "Bisexual" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Autosexual" msgstr "Autosexual" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Abstinent" msgstr "Casto/a" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Virgin" msgstr "Virgen" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Deviant" msgstr "Fuera de lo común" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Fetish" msgstr "Fetichista" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Oodles" msgstr "Orgías" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Nonsexual" msgstr "Asexual" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Single" msgstr "Soltero/a" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Lonely" msgstr "Solo/a" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Available" msgstr "Disponible" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Unavailable" msgstr "No disponible" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Has crush" msgstr "Enamorado/a" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Infatuated" msgstr "Apasionado/a" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Dating" msgstr "Saliendo con alguien" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Unfaithful" msgstr "Infiel" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Sex Addict" msgstr "Con adicción al sexo" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Friends/Benefits" msgstr "Amigos con algo extra" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Casual" msgstr "Casual" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Engaged" msgstr "Prometido/a" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Married" msgstr "Casado/a" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Imaginarily married" msgstr "Casado/a en sueños" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Partners" msgstr "Pareja" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Cohabiting" msgstr "Cohabitando" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Common law" msgstr "Matrimonio tradicional" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Happy" msgstr "Felíz" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Not looking" msgstr "No estoy buscando" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Swinger" msgstr "Libertino" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Betrayed" msgstr "Engañado/a" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Separated" msgstr "Separado/a" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Unstable" msgstr "Inestable" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Divorced" msgstr "Divorciado/a" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Imaginarily divorced" msgstr "Divorciado/a en sueños" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Widowed" msgstr "Viudo/a" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Uncertain" msgstr "Indeterminado" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "It's complicated" msgstr "Es complicado" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Don't care" msgstr "No me importa" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Ask me" msgstr "Pregúnteme" @@ -13257,47 +13295,47 @@ msgstr "relajado/a" msgid "surprised" msgstr "sorprendido/a" -#: ../../include/text.php:1377 ../../include/js_strings.php:86 +#: ../../include/text.php:1377 ../../include/js_strings.php:95 msgid "Monday" msgstr "lunes" -#: ../../include/text.php:1377 ../../include/js_strings.php:87 +#: ../../include/text.php:1377 ../../include/js_strings.php:96 msgid "Tuesday" msgstr "martes" -#: ../../include/text.php:1377 ../../include/js_strings.php:88 +#: ../../include/text.php:1377 ../../include/js_strings.php:97 msgid "Wednesday" msgstr "miércoles" -#: ../../include/text.php:1377 ../../include/js_strings.php:89 +#: ../../include/text.php:1377 ../../include/js_strings.php:98 msgid "Thursday" msgstr "jueves" -#: ../../include/text.php:1377 ../../include/js_strings.php:90 +#: ../../include/text.php:1377 ../../include/js_strings.php:99 msgid "Friday" msgstr "viernes" -#: ../../include/text.php:1377 ../../include/js_strings.php:91 +#: ../../include/text.php:1377 ../../include/js_strings.php:100 msgid "Saturday" msgstr "sábado" -#: ../../include/text.php:1377 ../../include/js_strings.php:85 +#: ../../include/text.php:1377 ../../include/js_strings.php:94 msgid "Sunday" msgstr "domingo" -#: ../../include/text.php:1381 ../../include/js_strings.php:61 +#: ../../include/text.php:1381 ../../include/js_strings.php:70 msgid "January" msgstr "enero" -#: ../../include/text.php:1381 ../../include/js_strings.php:62 +#: ../../include/text.php:1381 ../../include/js_strings.php:71 msgid "February" msgstr "febrero" -#: ../../include/text.php:1381 ../../include/js_strings.php:63 +#: ../../include/text.php:1381 ../../include/js_strings.php:72 msgid "March" msgstr "marzo" -#: ../../include/text.php:1381 ../../include/js_strings.php:64 +#: ../../include/text.php:1381 ../../include/js_strings.php:73 msgid "April" msgstr "abril" @@ -13305,31 +13343,31 @@ msgstr "abril" msgid "May" msgstr "mayo" -#: ../../include/text.php:1381 ../../include/js_strings.php:66 +#: ../../include/text.php:1381 ../../include/js_strings.php:75 msgid "June" msgstr "junio" -#: ../../include/text.php:1381 ../../include/js_strings.php:67 +#: ../../include/text.php:1381 ../../include/js_strings.php:76 msgid "July" msgstr "julio" -#: ../../include/text.php:1381 ../../include/js_strings.php:68 +#: ../../include/text.php:1381 ../../include/js_strings.php:77 msgid "August" msgstr "agosto" -#: ../../include/text.php:1381 ../../include/js_strings.php:69 +#: ../../include/text.php:1381 ../../include/js_strings.php:78 msgid "September" msgstr "septiembre" -#: ../../include/text.php:1381 ../../include/js_strings.php:70 +#: ../../include/text.php:1381 ../../include/js_strings.php:79 msgid "October" msgstr "octubre" -#: ../../include/text.php:1381 ../../include/js_strings.php:71 +#: ../../include/text.php:1381 ../../include/js_strings.php:80 msgid "November" msgstr "noviembre" -#: ../../include/text.php:1381 ../../include/js_strings.php:72 +#: ../../include/text.php:1381 ../../include/js_strings.php:81 msgid "December" msgstr "diciembre" @@ -13353,7 +13391,7 @@ msgstr "eliminar del fichero" msgid "Download binary/encrypted content" msgstr "Descargar contenido binario o cifrado" -#: ../../include/text.php:1872 ../../include/language.php:397 +#: ../../include/text.php:1872 ../../include/language.php:423 msgid "default" msgstr "por defecto" @@ -13652,181 +13690,191 @@ msgid " channel name" msgstr "nombre de canal" #: ../../include/js_strings.php:41 +#, php-format +msgid "%d minutes" +msgid_plural "%d minutes" +msgstr[0] "%d minutos" +msgstr[1] "%d minutos" + +#: ../../include/js_strings.php:42 +#, php-format +msgid "about %d hours" +msgid_plural "about %d hours" +msgstr[0] "alrededor de %d horas" +msgstr[1] "alrededor de %d horas" + +#: ../../include/js_strings.php:43 +#, php-format +msgid "%d days" +msgid_plural "%d days" +msgstr[0] "%d días" +msgstr[1] "%d días" + +#: ../../include/js_strings.php:44 +#, php-format +msgid "%d months" +msgid_plural "%d months" +msgstr[0] "%d meses" +msgstr[1] "%d meses" + +#: ../../include/js_strings.php:45 +#, php-format +msgid "%d years" +msgid_plural "%d years" +msgstr[0] "%d años" +msgstr[1] "%d años" + +#: ../../include/js_strings.php:50 msgid "timeago.prefixAgo" msgstr "hace " -#: ../../include/js_strings.php:42 +#: ../../include/js_strings.php:51 msgid "timeago.prefixFromNow" msgstr "en " -#: ../../include/js_strings.php:43 +#: ../../include/js_strings.php:52 msgid "timeago.suffixAgo" msgstr "NONE" -#: ../../include/js_strings.php:44 +#: ../../include/js_strings.php:53 msgid "timeago.suffixFromNow" msgstr "NONE" -#: ../../include/js_strings.php:47 +#: ../../include/js_strings.php:56 msgid "less than a minute" msgstr "menos de un minuto" -#: ../../include/js_strings.php:48 +#: ../../include/js_strings.php:57 msgid "about a minute" msgstr "alrededor de un minuto" -#: ../../include/js_strings.php:49 -#, php-format -msgid "%d minutes" -msgstr "%d minutos" - -#: ../../include/js_strings.php:50 +#: ../../include/js_strings.php:59 msgid "about an hour" msgstr "alrededor de una hora" -#: ../../include/js_strings.php:51 -#, php-format -msgid "about %d hours" -msgstr "alrededor de %d horas" - -#: ../../include/js_strings.php:52 +#: ../../include/js_strings.php:61 msgid "a day" msgstr "un día" -#: ../../include/js_strings.php:53 -#, php-format -msgid "%d days" -msgstr "%d días" - -#: ../../include/js_strings.php:54 +#: ../../include/js_strings.php:63 msgid "about a month" msgstr "alrededor de un mes" -#: ../../include/js_strings.php:55 -#, php-format -msgid "%d months" -msgstr "%d meses" - -#: ../../include/js_strings.php:56 +#: ../../include/js_strings.php:65 msgid "about a year" msgstr "alrededor de un año" -#: ../../include/js_strings.php:57 -#, php-format -msgid "%d years" -msgstr "%d años" - -#: ../../include/js_strings.php:58 +#: ../../include/js_strings.php:67 msgid " " msgstr " " -#: ../../include/js_strings.php:59 +#: ../../include/js_strings.php:68 msgid "timeago.numbers" msgstr "timeago.numbers" -#: ../../include/js_strings.php:65 +#: ../../include/js_strings.php:74 msgctxt "long" msgid "May" msgstr "mayo" -#: ../../include/js_strings.php:73 +#: ../../include/js_strings.php:82 msgid "Jan" msgstr "ene" -#: ../../include/js_strings.php:74 +#: ../../include/js_strings.php:83 msgid "Feb" msgstr "feb" -#: ../../include/js_strings.php:75 +#: ../../include/js_strings.php:84 msgid "Mar" msgstr "mar" -#: ../../include/js_strings.php:76 +#: ../../include/js_strings.php:85 msgid "Apr" msgstr "abr" -#: ../../include/js_strings.php:77 +#: ../../include/js_strings.php:86 msgctxt "short" msgid "May" msgstr "may" -#: ../../include/js_strings.php:78 +#: ../../include/js_strings.php:87 msgid "Jun" msgstr "jun" -#: ../../include/js_strings.php:79 +#: ../../include/js_strings.php:88 msgid "Jul" msgstr "jul" -#: ../../include/js_strings.php:80 +#: ../../include/js_strings.php:89 msgid "Aug" msgstr "ago" -#: ../../include/js_strings.php:81 +#: ../../include/js_strings.php:90 msgid "Sep" msgstr "sep" -#: ../../include/js_strings.php:82 +#: ../../include/js_strings.php:91 msgid "Oct" msgstr "oct" -#: ../../include/js_strings.php:83 +#: ../../include/js_strings.php:92 msgid "Nov" msgstr "nov" -#: ../../include/js_strings.php:84 +#: ../../include/js_strings.php:93 msgid "Dec" msgstr "dic" -#: ../../include/js_strings.php:92 +#: ../../include/js_strings.php:101 msgid "Sun" msgstr "dom" -#: ../../include/js_strings.php:93 +#: ../../include/js_strings.php:102 msgid "Mon" msgstr "lun" -#: ../../include/js_strings.php:94 +#: ../../include/js_strings.php:103 msgid "Tue" msgstr "mar" -#: ../../include/js_strings.php:95 +#: ../../include/js_strings.php:104 msgid "Wed" msgstr "mié" -#: ../../include/js_strings.php:96 +#: ../../include/js_strings.php:105 msgid "Thu" msgstr "jue" -#: ../../include/js_strings.php:97 +#: ../../include/js_strings.php:106 msgid "Fri" msgstr "vie" -#: ../../include/js_strings.php:98 +#: ../../include/js_strings.php:107 msgid "Sat" msgstr "sáb" -#: ../../include/js_strings.php:99 +#: ../../include/js_strings.php:108 msgctxt "calendar" msgid "today" msgstr "hoy" -#: ../../include/js_strings.php:100 +#: ../../include/js_strings.php:109 msgctxt "calendar" msgid "month" msgstr "mes" -#: ../../include/js_strings.php:101 +#: ../../include/js_strings.php:110 msgctxt "calendar" msgid "week" msgstr "semana" -#: ../../include/js_strings.php:102 +#: ../../include/js_strings.php:111 msgctxt "calendar" msgid "day" msgstr "día" -#: ../../include/js_strings.php:103 +#: ../../include/js_strings.php:112 msgctxt "calendar" msgid "All day" msgstr "Todos los días" @@ -14212,35 +14260,35 @@ msgstr "Llamadas de trabajo" msgid "Work, Fax" msgstr "Fax de trabajo" -#: ../../include/network.php:760 +#: ../../include/network.php:770 msgid "view full size" msgstr "Ver en el tamaño original" -#: ../../include/network.php:1766 +#: ../../include/network.php:1776 msgid "GNU-Social" msgstr "GNU Social" -#: ../../include/network.php:1767 +#: ../../include/network.php:1777 msgid "RSS/Atom" msgstr "RSS/Atom" -#: ../../include/network.php:1771 +#: ../../include/network.php:1781 msgid "Facebook" msgstr "Facebook" -#: ../../include/network.php:1773 +#: ../../include/network.php:1783 msgid "LinkedIn" msgstr "LinkedIn" -#: ../../include/network.php:1774 +#: ../../include/network.php:1784 msgid "XMPP/IM" msgstr "XMPP/IM" -#: ../../include/network.php:1775 +#: ../../include/network.php:1785 msgid "MySpace" msgstr "MySpace" -#: ../../include/language.php:410 +#: ../../include/language.php:436 msgid "Select an alternate language" msgstr "Seleccionar un idioma alternativo" @@ -14881,55 +14929,55 @@ msgstr "Buscar en el sitio @nombre, !foro, #tag, ?docs, contenido" msgid "Site Setup and Configuration" msgstr "Ajustes y configuración del sitio" -#: ../../include/nav.php:294 +#: ../../include/nav.php:299 msgid "@name, !forum, #tag, ?doc, content" msgstr "@nombre, !foro, #tag, ?docs, contenido" -#: ../../include/nav.php:295 +#: ../../include/nav.php:300 msgid "Please wait..." msgstr "Espere por favor…" -#: ../../include/nav.php:301 +#: ../../include/nav.php:306 msgid "Add Apps" msgstr "Añadir aplicaciones" -#: ../../include/nav.php:302 +#: ../../include/nav.php:307 msgid "Arrange Apps" msgstr "Organizar aplicaciones" -#: ../../include/nav.php:303 +#: ../../include/nav.php:308 msgid "Toggle System Apps" msgstr "Alternar aplicaciones de sistema" -#: ../../include/nav.php:389 +#: ../../include/nav.php:394 msgid "Status Messages and Posts" msgstr "Mensajes de estado y publicaciones" -#: ../../include/nav.php:402 +#: ../../include/nav.php:407 msgid "Profile Details" msgstr "Detalles del perfil" -#: ../../include/nav.php:412 ../../include/photos.php:667 +#: ../../include/nav.php:417 ../../include/photos.php:667 msgid "Photo Albums" msgstr "Álbumes de fotos" -#: ../../include/nav.php:420 +#: ../../include/nav.php:425 msgid "Files and Storage" msgstr "Ficheros y repositorio" -#: ../../include/nav.php:458 +#: ../../include/nav.php:463 msgid "Saved Bookmarks" msgstr "Marcadores guardados" -#: ../../include/nav.php:469 +#: ../../include/nav.php:474 msgid "View Cards" msgstr "Ver las fichas" -#: ../../include/nav.php:480 +#: ../../include/nav.php:485 msgid "View Articles" msgstr "Ver los artículos" -#: ../../include/nav.php:492 +#: ../../include/nav.php:497 msgid "View Webpages" msgstr "Ver páginas web" diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index a92c1c6ea..6daac9592 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -5,6 +5,7 @@ function string_plural_select_es_es($n){ return ($n != 1);; }} App::$rtl = 0; +App::$strings["plural_function_code"] = "(n != 1);"; App::$strings["Can view my channel stream and posts"] = "Pueden verse la actividad y publicaciones de mi canal"; App::$strings["Can send me their channel stream and posts"] = "Se me pueden enviar entradas y contenido de un canal"; App::$strings["Can view my default channel profile"] = "Puede verse mi perfil de canal predeterminado."; @@ -571,7 +572,7 @@ App::$strings["This is displayed on the public server site list."] = "Esto se mu App::$strings["Register text"] = "Texto del registro"; App::$strings["Will be displayed prominently on the registration page."] = "Se mostrará de forma destacada en la página de registro."; App::$strings["Site homepage to show visitors (default: login box)"] = "Página personal que se mostrará a los visitantes (por defecto: la página de identificación)"; -App::$strings["example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "ejemplo: 'public' para mostrar contenido público, 'page/sys/home' para mostrar la página web definida como \"home\" o 'include:home.html' para mostrar el contenido de un fichero."; +App::$strings["example: 'pubstream' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "ejemplo: 'pubstream' para mostrar el stream público, 'page/sys/home' para mostrar una página web del sistema llamada 'home' o 'include:home.html' para incluir un archivo."; App::$strings["Preserve site homepage URL"] = "Preservar la dirección de la página personal"; App::$strings["Present the site homepage in a frame at the original location instead of redirecting"] = "Presenta la página personal del sitio en un marco en la ubicación original, en vez de redirigirla."; App::$strings["Accounts abandoned after x days"] = "Cuentas abandonadas después de x días"; @@ -753,7 +754,6 @@ App::$strings["Maximum Friend Requests/Day:"] = "Máximo de solicitudes de amist App::$strings["May reduce spam activity"] = "Podría reducir la actividad de spam"; App::$strings["Default Privacy Group"] = "Grupo de canales predeterminado"; App::$strings["Use my default audience setting for the type of object published"] = "Usar los ajustes de mi audiencia predeterminada para el tipo de publicación"; -App::$strings["Profile to assign new connections"] = "Perfil para asignar a las nuevas conexiones"; App::$strings["Default permissions category"] = "Categoría de permisos por defecto"; App::$strings["Maximum private messages per day from unknown people:"] = "Máximo de mensajes privados por día de gente desconocida:"; App::$strings["Useful to reduce spamming"] = "Útil para reducir el envío de correo no deseado"; @@ -801,9 +801,7 @@ App::$strings["Miscellaneous Settings"] = "Ajustes diversos"; App::$strings["Default photo upload folder"] = "Carpeta por defecto de las fotos subidas"; App::$strings["%Y - current year, %m - current month"] = "%Y - año en curso, %m - mes actual"; App::$strings["Default file upload folder"] = "Carpeta por defecto de los ficheros subidos"; -App::$strings["Personal menu to display in your channel pages"] = "Menú personal que debe mostrarse en las páginas de su canal"; App::$strings["Remove this channel."] = "Eliminar este canal."; -App::$strings["Firefox Share \$Projectname provider"] = "Servicio de compartición de Firefox: proveedor \$Projectname"; App::$strings["Additional Features"] = "Funcionalidades"; App::$strings["Events Settings"] = "Gestión de eventos"; App::$strings["CalDAV Settings"] = "Ajustes de CalDav"; @@ -840,6 +838,7 @@ App::$strings["Addon Settings"] = "Ajustes de los complementos"; App::$strings["Please save/submit changes to any panel before opening another."] = "Guarde o envíe los cambios a cualquier panel antes de abrir otro."; App::$strings["Max height of content (in pixels)"] = "Altura máxima del contenido (en píxeles)"; App::$strings["Click to expand content exceeding this height"] = "Haga clic para expandir el contenido que exceda esta altura"; +App::$strings["Personal menu to display in your channel pages"] = "Menú personal que debe mostrarse en las páginas de su canal"; App::$strings["Channel Home Settings"] = "Ajustes del canal"; App::$strings["Directory Settings"] = "Configuración del directorio"; App::$strings["Editor Settings"] = "Ajustes del editor"; @@ -2067,6 +2066,9 @@ App::$strings["Communicate"] = "Comunicarse"; App::$strings["View your channel homepage"] = "Ver la página principal de su canal"; App::$strings["View your network stream"] = "Ver el \"stream\" de su red"; App::$strings["Documentation"] = "Documentación"; +App::$strings["Missing Features?"] = "¿Faltan Características?"; +App::$strings["Pin apps to navigation bar"] = "Fijar apps a la barra de navegación"; +App::$strings["Install more apps"] = "Instalar más apps"; App::$strings["View public stream"] = "Ver el \"stream\" público"; App::$strings["Member registrations waiting for confirmation"] = "Inscripciones de nuevos miembros pendientes de aprobación"; App::$strings["Inspect queue"] = "Examinar la cola"; @@ -2453,6 +2455,13 @@ App::$strings["Approve subscription requests from Hubzilla contacts automaticall App::$strings["Purge internal list of jabber addresses of contacts"] = "Purgar la lista interna de las direcciones de contactos de jabber"; App::$strings["Configuration Help"] = "Ayuda para los ajustes"; App::$strings["Jappix Mini Settings"] = "Ajustes de Jappix Mini"; +App::$strings["Your channel has been upgraded to the latest \$Projectname version."] = "Su canal ha sido actualizado a la última versión de \$Projectname."; +App::$strings["To improve usability, we have converted some features into installable stand-alone apps."] = "Para mejorar la usabilidad, hemos convertido algunas características en aplicaciones independientes instalables."; +App::$strings["Please visit the \$Projectname"] = "Por favor visite el sitio web de \$Projectname"; +App::$strings["app store"] = "depósito de apps"; +App::$strings["and install possibly missing apps."] = "e instalar aplicaciones que posiblemente falten."; +App::$strings["Upgrade Info"] = "Información de actualización"; +App::$strings["Do not show this again"] = "No mostrar esto de nuevo"; App::$strings["Access Denied"] = "Acceso denegado"; App::$strings["Enable Community Moderation"] = "Habilitar la moderación de la comunidad"; App::$strings["Reputation automatically given to new members"] = "La reputación se otorga automáticamente a los nuevos miembros"; @@ -2805,6 +2814,7 @@ App::$strings["%1\$d of %2\$d messages sent."] = "%1\$d de %2\$d mensajes enviad App::$strings["Send email to all hub members."] = "Enviar un correo electrónico a todos los miembros del hub."; App::$strings["Sender Email address"] = "Dirección de correo electrónico del remitente"; App::$strings["Test mode (only send to hub administrator)"] = "Modo de prueba (enviar sólo al administrador del hub)"; +App::$strings["Profile to assign new connections"] = "Perfil para asignar a las nuevas conexiones"; App::$strings["Frequently"] = "Frecuentemente"; App::$strings["Hourly"] = "Cada hora"; App::$strings["Twice daily"] = "Dos veces al día"; @@ -3067,21 +3077,36 @@ App::$strings["Thank you, this nickname is valid."] = "Gracias, este alias es v App::$strings["A channel name is required."] = "Se requiere un nombre de canal"; App::$strings["This is a "] = "Esto es un "; App::$strings[" channel name"] = "nombre de canal"; +App::$strings["%d minutes"] = array( + 0 => "%d minutos", + 1 => "%d minutos", +); +App::$strings["about %d hours"] = array( + 0 => "alrededor de %d horas", + 1 => "alrededor de %d horas", +); +App::$strings["%d days"] = array( + 0 => "%d días", + 1 => "%d días", +); +App::$strings["%d months"] = array( + 0 => "%d meses", + 1 => "%d meses", +); +App::$strings["%d years"] = array( + 0 => "%d años", + 1 => "%d años", +); App::$strings["timeago.prefixAgo"] = "hace "; App::$strings["timeago.prefixFromNow"] = "en "; App::$strings["timeago.suffixAgo"] = "NONE"; App::$strings["timeago.suffixFromNow"] = "NONE"; App::$strings["less than a minute"] = "menos de un minuto"; App::$strings["about a minute"] = "alrededor de un minuto"; -App::$strings["%d minutes"] = "%d minutos"; App::$strings["about an hour"] = "alrededor de una hora"; -App::$strings["about %d hours"] = "alrededor de %d horas"; App::$strings["a day"] = "un día"; -App::$strings["%d days"] = "%d días"; App::$strings["about a month"] = "alrededor de un mes"; -App::$strings["%d months"] = "%d meses"; App::$strings["about a year"] = "alrededor de un año"; -App::$strings["%d years"] = "%d años"; App::$strings[" "] = " "; App::$strings["timeago.numbers"] = "timeago.numbers"; App::$strings["__ctx:long__ May"] = "mayo"; -- cgit v1.2.3 From aef212ada9ff61326ae56c5c17ff8873b7cc4c69 Mon Sep 17 00:00:00 2001 From: "M.Dent" Date: Thu, 25 Oct 2018 10:12:03 -0400 Subject: Add entropy to queue worker - and fix requeuing of expired tasks --- Zotlabs/Daemon/Master.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Daemon/Master.php b/Zotlabs/Daemon/Master.php index 3a71ee578..0656ca05b 100644 --- a/Zotlabs/Daemon/Master.php +++ b/Zotlabs/Daemon/Master.php @@ -60,7 +60,8 @@ class Master { $k = explode('_',$worker['k']); q("delete from config where cat='queueworkers' and k='%s'", 'workerstarted_'.$k[1]); - q("update config set k='workitem' where cat='queuework' and k='%s'", + q("update config set k='%s' where cat='queuework' and k='%s'", + dbesc(uniqid('workitem:',true)), 'workitem_'.$k[1]); unset($workers[$idx]); } @@ -69,7 +70,7 @@ class Master { return false; } } - return uniqid(); + return uniqid('',true); } -- cgit v1.2.3 From 2b3cbc638bb626141bce0a6cc9860700823bc24b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 26 Oct 2018 09:53:56 +0200 Subject: notifications: fix unseen forum count --- Zotlabs/Module/Ping.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index bc6985301..2ad4f1277 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -634,18 +634,20 @@ class Ping extends \Zotlabs\Web\Controller { if($vnotify & VNOTIFY_FORUMS) { $forums = get_forum_channels(local_channel()); - if(! $forums) { - $result['forums'] = 0; - } - else { - + if($forums) { $perms_sql = item_permissions_sql(local_channel()) . item_normal(); $fcount = count($forums); $forums['total'] = 0; for($x = 0; $x < $fcount; $x ++) { + $ttype = TERM_FORUM; + $p = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($forums[$x]['xchan_name']) . "'"); + $p = ids_to_querystr($p, 'parent'); + + $pquery = (($p) ? "OR parent IN ( $p )" : ''); + $r = q("select sum(item_unseen) as unseen from item - where uid = %d and owner_xchan = '%s' and item_unseen = 1 $perms_sql ", + where uid = %d and ( owner_xchan = '%s' $pquery ) and item_unseen = 1 $perms_sql ", intval(local_channel()), dbesc($forums[$x]['xchan_hash']) ); -- cgit v1.2.3 From ae4aeb4b1e57855d8f1788e74c56b57377df59aa Mon Sep 17 00:00:00 2001 From: zotlabs Date: Fri, 26 Oct 2018 13:00:26 -0700 Subject: delivery chain linkage messed up if original post was edited --- include/items.php | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/include/items.php b/include/items.php index 58461cc3a..cae380b01 100755 --- a/include/items.php +++ b/include/items.php @@ -2150,6 +2150,7 @@ function item_store_update($arr, $allow_exec = false, $deliver = true) { unset($arr['created']); unset($arr['author_xchan']); unset($arr['owner_xchan']); + unset($arr['source_xchan']); unset($arr['thr_parent']); unset($arr['llink']); @@ -2514,7 +2515,7 @@ function tag_deliver($uid, $item_id) { // Just start the second delivery chain to deliver the updated post // after resetting ownership and permission bits logger('updating edited tag_deliver post for ' . $u[0]['channel_address']); - start_delivery_chain($u[0], $item, $item_id, 0); + start_delivery_chain($u[0], $item, $item_id, 0, true); return; } @@ -2941,7 +2942,7 @@ function tgroup_check($uid, $item) { * @param int $item_id * @param boolean $parent */ -function start_delivery_chain($channel, $item, $item_id, $parent) { +function start_delivery_chain($channel, $item, $item_id, $parent, $edit = false) { $sourced = check_item_source($channel['channel_id'],$item); @@ -2950,7 +2951,7 @@ function start_delivery_chain($channel, $item, $item_id, $parent) { intval($channel['channel_id']), dbesc(($item['source_xchan']) ? $item['source_xchan'] : $item['owner_xchan']) ); - if($r) { + if($r && ! $edit) { $t = trim($r[0]['src_tag']); if($t) { $tags = explode(',',$t); @@ -3017,9 +3018,17 @@ function start_delivery_chain($channel, $item, $item_id, $parent) { } else { $item_uplink = 1; - $r = q("update item set source_xchan = owner_xchan where id = %d", - intval($item_id) - ); + + // if this is an edit, item_store_update() will have already updated the item + // with the correct value for source_xchan (by ignoring it). We cannot set to owner_xchan + // in this case because owner_xchan will point to the parent of this chain + // and not the original sender. + + if(! $edit) { + $r = q("update item set source_xchan = owner_xchan where id = %d", + intval($item_id) + ); + } } $title = $item['title']; -- cgit v1.2.3 From 96bed3a623bf6bb832778b6957cd278c2a946c20 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 27 Oct 2018 22:34:18 +0200 Subject: fix issues with forum handling in mod network and ping. also some code cleanup. --- Zotlabs/Module/Network.php | 17 +++++++++++++---- Zotlabs/Module/Ping.php | 17 +++++++++++------ 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index e8ee1eef9..294e11c52 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -258,12 +258,18 @@ class Network extends \Zotlabs\Web\Controller { } elseif($pf && $unseen && $nouveau) { - $ttype = TERM_FORUM; // This is for nouveau view public forum cid queries (if a forum notification is clicked) - $p = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($cid_r[0]['xchan_name']) . "'"); + $p = q("SELECT oid AS parent FROM term WHERE uid = %d AND ttype = %d AND term = '%s'", + intval(local_channel()), + intval(TERM_FORUM), + dbesc($cid_r[0]['xchan_name']) + ); - $p = ids_to_querystr($p, 'parent'); - $sql_extra = " AND ( owner_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' OR item.parent IN ( $p ) ) AND item_unseen = 1 "; + $p_str = ids_to_querystr($p, 'parent'); + if($p_str) + $p_sql = " OR item.parent IN ( $p_str ) "; + + $sql_extra = " AND ( owner_xchan = '" . protect_sprintf(dbesc($cid_r[0]['abook_xchan'])) . "' OR owner_xchan = '" . protect_sprintf(dbesc($cid_r[0]['abook_xchan'])) . "' $p_sql ) AND item_unseen = 1 "; } else { // This is for threaded view cid queries (e.g. if a forum is selected from the forum filter) @@ -273,6 +279,9 @@ class Network extends \Zotlabs\Web\Controller { $p2 = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($cid_r[0]['xchan_name']) . "'"); $p_str = ids_to_querystr(array_merge($p1,$p2),'parent'); + if(! $p_str) + killme(); + $sql_extra = " AND item.parent IN ( $p_str ) "; } } diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index 2ad4f1277..75e8843d6 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -635,20 +635,25 @@ class Ping extends \Zotlabs\Web\Controller { $forums = get_forum_channels(local_channel()); if($forums) { - $perms_sql = item_permissions_sql(local_channel()) . item_normal(); + $perms_sql = item_permissions_sql(local_channel()); + $item_normal = item_normal(); $fcount = count($forums); $forums['total'] = 0; for($x = 0; $x < $fcount; $x ++) { - $ttype = TERM_FORUM; - $p = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($forums[$x]['xchan_name']) . "'"); - $p = ids_to_querystr($p, 'parent'); + $p = q("SELECT oid AS parent FROM term WHERE uid = %d AND ttype = %d AND term = '%s'", + intval(local_channel()), + intval(TERM_FORUM), + dbesc($forums[$x]['xchan_hash']) + ); - $pquery = (($p) ? "OR parent IN ( $p )" : ''); + $p_str = ids_to_querystr($p, 'parent'); + $p_sql = (($p_str) ? "OR parent IN ( $p_str )" : ''); $r = q("select sum(item_unseen) as unseen from item - where uid = %d and ( owner_xchan = '%s' $pquery ) and item_unseen = 1 $perms_sql ", + where uid = %d and ( owner_xchan = '%s' OR author_xchan = '%s' $p_sql ) and item_unseen = 1 $perms_sql $item_normal", intval(local_channel()), + dbesc($forums[$x]['xchan_hash']), dbesc($forums[$x]['xchan_hash']) ); if($r[0]['unseen']) { -- cgit v1.2.3