diff --git a/appinfo/app.php b/appinfo/app.php index 5b5b809..49c0170 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -21,15 +21,16 @@ */ \OCP\Util::addStyle($c->query('AppName'), 'colorbox'); \OCP\Util::addScript($c->query('AppName'), 'jquery.colorbox'); +\OCP\Util::addScript("core", 'jquery-showpassword'); \OCP\Util::addscript($c->query('AppName'), 'setpassword'); \OCP\Util::addStyle($c->query('AppName'), 'setpassword'); if (\OCP\User::isLoggedIn() and Helper::isEnabled()) { - \OC_Util::addScript( '3rdparty', 'strengthify/jquery.strengthify' ); - \OC_Util::addStyle( '3rdparty', 'strengthify/strengthify' ); - \OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' ); - \OC_Util::addStyle( '3rdparty', 'chosen/chosen' ); + \OC_Util::addVendorScript('strengthify/jquery.strengthify'); + \OC_Util::addVendorStyle('strengthify/strengthify'); + // \OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' ); + // \OC_Util::addStyle( '3rdparty', 'chosen/chosen' ); \OCP\Util::addScript($c->query('AppName'), 'activate'); } diff --git a/appinfo/info.xml b/appinfo/info.xml index afe0c0d..021b473 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -6,5 +6,9 @@ 0.1 AGPLv3 Patrick Paysant / CNRS - 7 + + + + https://github.com/CNRS-DSI-Dev/user_set_password + https://github.com/CNRS-DSI-Dev/user_set_password/issues diff --git a/controller/requestcontroller.php b/controller/requestcontroller.php index 8bf4a01..7357bc0 100644 --- a/controller/requestcontroller.php +++ b/controller/requestcontroller.php @@ -10,14 +10,14 @@ namespace OCA\User_Set_Password\Controller; -use \OCP\AppFramework\APIController; +use \OCP\AppFramework\ApiController; use \OCP\AppFramework\Http\JSONResponse; use \OCP\IRequest; use \OCP\IL10N; use \OCA\User_Set_Password\lib\Helper; -class RequestController extends APIController +class RequestController extends ApiController { protected $l; diff --git a/css/setpassword.css b/css/setpassword.css index 4adc32e..8e5892d 100644 --- a/css/setpassword.css +++ b/css/setpassword.css @@ -69,7 +69,7 @@ width: 24px; margin-top: 14px; margin-left: -36px; - background-image: url("../../../core/img/actions/toggle.png"); + background-image: url("../../../core/img/actions/toggle.svg"); background-repeat: no-repeat; background-position: center; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; diff --git a/js/activate.js b/js/activate.js index bfd44eb..4a243b7 100644 --- a/js/activate.js +++ b/js/activate.js @@ -8,7 +8,7 @@ $(document).ready(function () { // Done when "colorBox" is displayed function showSetPasswordComplete() { - $("#userSetPassword #passwordform").on('submit', function(){ + $("#userSetPassword #passwordform").on('submit', function(e){ // TODO: implement basic tests (fields must be set, fields must be same) if (($('#pass1').val() == '') || ($('#pass2').val() == '')) { @@ -24,38 +24,61 @@ function showSetPasswordComplete() { } if ($('#pass1').val() !== '') { - // Serialize the data - var post = $( "#passwordform" ).serialize(); - $('#passwordchanged').hide(); - $('#passworderror').hide(); - // Ajax foo - $.post(OC.generateUrl('/apps/user_set_password/api/1.0/changepassword'), post, function(data){ - if ( data.status === "success" ){ - $('.strengthify-wrapper').tipsy('hide'); - OC.Notification.show( t('user_set_password', 'Password successfully changed') ); - setTimeout(OC.Notification.hide, 7000); - $.colorbox.close(); + var password = $('#pass1').val(); + $.ajax({ + type: 'POST', + url: OC.generateUrl('/apps/password_policy/policy/set_password'), + data: {password: password}, + async: false + }). + done(function(data) { + if (data.status == 'success') { + var post = $( "#passwordform" ).serialize(); + $('#passwordchanged').hide(); + $('#passworderror').hide(); + // Ajax foo + $.post(OC.generateUrl('/apps/user_set_password/api/1.0/changepassword'), post, function(data){ + if ( data.status === "success" ){ + $('.strengthify-wrapper').tipsy('hide'); + OC.Notification.showTemporary( t('user_set_password', 'Password successfully changed') ); + e.stopImmediatePropagation(); + e.stopPropagation(); + e.preventDefault(); + $.colorbox.close(); + } + else { + if (typeof(data.data) !== "undefined") { + $('#passworderror').html(data.data.msg); + } else { + $('#passworderror').html(t('user_set_password', 'Unable to change password')); + } + $('#passworderror').show(); + } + }); + return false; } else { - if (typeof(data.data) !== "undefined") { - $('#passworderror').html(data.data.msg); - } else { - $('#passworderror').html(t('user_set_password', 'Unable to change password')); - } + $('#passworderror').html(t('password_policy', 'Password does not comply with the Password Policy.')); $('#passworderror').show(); + + e.stopImmediatePropagation(); + e.stopPropagation(); + e.preventDefault(); + return false; } }); - return false; } else { $('#passwordchanged').hide(); $('#passworderror').show(); return false; } + + return false; }); $('#pass1').strengthify({ - zxcvbn: OC.linkTo('3rdparty','zxcvbn/js/zxcvbn.js'), + zxcvbn: OC.linkTo('core','vendor/zxcvbn/dist/zxcvbn.js'), titles: [ t('core', 'Very weak password'), t('core', 'Weak password'), @@ -70,10 +93,6 @@ function showSetPasswordComplete() { }; setShowPassword($('#pass1'), $('label[for=personal-show]')); setShowPassword($('#pass2'), $('label[for=personal-confirm-show]')); - - $("#userSetPassword #passwordbutton").bindFirst('click',function(e){ - check_password_policy(e); - }); } function check_password_policy(e) { @@ -81,7 +100,7 @@ function check_password_policy(e) { $.ajax({ type: 'POST', - url: OC.filePath('password_policy', 'ajax', 'testPassword.php'), + url: OC.generateUrl('/apps/password_policy/policy/set_password'), data: {password: password}, success: function(data){ if (data.status == 'success') { @@ -100,13 +119,3 @@ function check_password_policy(e) { }); } - -$.fn.bindFirst = function(name, fn) { - this.on(name, fn); - - this.each(function() { - var handlers = $._data(this, 'events')[name.split('.')[0]]; - var handler = handlers.pop(); - handlers.splice(0, 0, handler); - }); -}; diff --git a/js/jquery.colorbox.js b/js/jquery.colorbox.js index 3db60c6..12dd1b2 100755 --- a/js/jquery.colorbox.js +++ b/js/jquery.colorbox.js @@ -1,13 +1,23 @@ -// ColorBox v1.3.20.2 - jQuery lightbox plugin -// (c) 2012 Jack Moore - jacklmoore.com -// License: http://www.opensource.org/licenses/mit-license.php +/*! + Colorbox 1.6.4 + license: MIT + http://www.jacklmoore.com/colorbox +*/ (function ($, document, window) { var // Default settings object. // See http://jacklmoore.com/colorbox for details. defaults = { + // data sources + html: false, + photo: false, + iframe: false, + inline: false, + + // behavior and appearance transition: "elastic", speed: 300, + fadeOut: 300, width: false, initialWidth: "600", innerWidth: false, @@ -18,17 +28,36 @@ maxHeight: false, scalePhotos: true, scrolling: true, - inline: false, - html: false, - iframe: false, - fastIframe: true, - photo: false, - href: false, - title: false, - rel: false, opacity: 0.9, preloading: true, + className: false, + overlayClose: true, + escKey: true, + arrowKey: true, + top: false, + bottom: false, + left: false, + right: false, + fixed: false, + data: undefined, + closeButton: true, + fastIframe: true, + open: false, + reposition: true, + loop: true, + slideshow: false, + slideshowAuto: true, + slideshowSpeed: 2500, + slideshowStart: "start slideshow", + slideshowStop: "stop slideshow", + photoRegex: /\.(gif|png|jp(e|g|eg)|bmp|ico|webp|jxr|svg)((#|\?).*)?$/i, + + // alternate image paths for high-res displays + retinaImage: false, + retinaUrl: false, + retinaSuffix: '@2x.$1', + // internationalization current: "image {current} of {total}", previous: "previous", next: "next", @@ -36,36 +65,67 @@ xhrError: "This content failed to load.", imgError: "This image failed to load.", - open: false, + // accessbility returnFocus: true, - reposition: true, - loop: true, - slideshow: false, - slideshowAuto: true, - slideshowSpeed: 2500, - slideshowStart: "start slideshow", - slideshowStop: "stop slideshow", + trapFocus: true, + + // callbacks onOpen: false, onLoad: false, onComplete: false, onCleanup: false, onClosed: false, - overlayClose: true, - escKey: true, - arrowKey: true, - top: false, - bottom: false, - left: false, - right: false, - fixed: false, - data: undefined + + rel: function() { + return this.rel; + }, + href: function() { + // using this.href would give the absolute url, when the href may have been inteded as a selector (e.g. '#container') + return $(this).attr('href'); + }, + title: function() { + return this.title; + }, + createImg: function() { + var img = new Image(); + var attrs = $(this).data('cbox-img-attrs'); + + if (typeof attrs === 'object') { + $.each(attrs, function(key, val){ + img[key] = val; + }); + } + + return img; + }, + createIframe: function() { + var iframe = document.createElement('iframe'); + var attrs = $(this).data('cbox-iframe-attrs'); + + if (typeof attrs === 'object') { + $.each(attrs, function(key, val){ + iframe[key] = val; + }); + } + + if ('frameBorder' in iframe) { + iframe.frameBorder = 0; + } + if ('allowTransparency' in iframe) { + iframe.allowTransparency = "true"; + } + iframe.name = (new Date()).getTime(); // give the iframe a unique name to prevent caching + iframe.allowFullscreen = true; + + return iframe; + } }, - + // Abstracting the HTML and event identifiers for easy rebranding colorbox = 'colorbox', prefix = 'cbox', boxElement = prefix + 'Element', - + // Events event_open = prefix + '_open', event_load = prefix + '_load', @@ -73,11 +133,6 @@ event_cleanup = prefix + '_cleanup', event_closed = prefix + '_closed', event_purge = prefix + '_purge', - - // Special Handling for IE - isIE = !$.support.opacity && !$.support.style, // IE7 & IE8 - isIE6 = isIE && !window.XMLHttpRequest, // IE6 - event_ie6 = prefix + '_IE6', // Cached jQuery Object Variables $overlay, @@ -100,14 +155,14 @@ $prev, $close, $groupControls, - + $events = $(''), // $({}) would be prefered, but there is an issue with jQuery 1.4.2 + // Variables for cached values or use across multiple functions settings, interfaceHeight, interfaceWidth, loadedHeight, loadedWidth, - element, index, photo, open, @@ -116,13 +171,15 @@ loadingTimer, publicMethod, div = "div", + requests = 0, + previousCSS = {}, init; // **************** // HELPER FUNCTIONS // **************** - - // Convience function for creating new jQuery objects + + // Convenience function for creating new jQuery objects function $tag(tag, id, css) { var element = document.createElement(tag); @@ -137,200 +194,303 @@ return $(element); } + // Get the window height using innerHeight when available to avoid an issue with iOS + // http://bugs.jquery.com/ticket/6724 + function winheight() { + return window.innerHeight ? window.innerHeight : $(window).height(); + } + + function Settings(element, options) { + if (options !== Object(options)) { + options = {}; + } + + this.cache = {}; + this.el = element; + + this.value = function(key) { + var dataAttr; + + if (this.cache[key] === undefined) { + dataAttr = $(this.el).attr('data-cbox-'+key); + + if (dataAttr !== undefined) { + this.cache[key] = dataAttr; + } else if (options[key] !== undefined) { + this.cache[key] = options[key]; + } else if (defaults[key] !== undefined) { + this.cache[key] = defaults[key]; + } + } + + return this.cache[key]; + }; + + this.get = function(key) { + var value = this.value(key); + return $.isFunction(value) ? value.call(this.el, this) : value; + }; + } + // Determine the next and previous members in a group. function getIndex(increment) { var max = $related.length, newIndex = (index + increment) % max; - + return (newIndex < 0) ? max + newIndex : newIndex; } // Convert '%' and 'px' values to integers function setSize(size, dimension) { - return Math.round((/%/.test(size) ? ((dimension === 'x' ? $window.width() : $window.height()) / 100) : 1) * parseInt(size, 10)); + return Math.round((/%/.test(size) ? ((dimension === 'x' ? $window.width() : winheight()) / 100) : 1) * parseInt(size, 10)); } - + // Checks an href to see if it is a photo. - // There is a force photo option (photo: true) for hrefs that cannot be matched by this regex. - function isImage(url) { - return settings.photo || /\.(gif|png|jp(e|g|eg)|bmp|ico)((#|\?).*)?$/i.test(url); + // There is a force photo option (photo: true) for hrefs that cannot be matched by the regex. + function isImage(settings, url) { + return settings.get('photo') || settings.get('photoRegex').test(url); + } + + function retinaUrl(settings, url) { + return settings.get('retinaUrl') && window.devicePixelRatio > 1 ? url.replace(settings.get('photoRegex'), settings.get('retinaSuffix')) : url; + } + + function trapFocus(e) { + if ('contains' in $box[0] && !$box[0].contains(e.target) && e.target !== $overlay[0]) { + e.stopPropagation(); + $box.focus(); + } + } + + function setClass(str) { + if (setClass.str !== str) { + $box.add($overlay).removeClass(setClass.str).addClass(str); + setClass.str = str; + } } - // Assigns function results to their respective properties - function makeSettings() { - var i, - data = $.data(element, colorbox); - - if (data == null) { - settings = $.extend({}, defaults); - if (console && console.log) { - console.log('Error: cboxElement missing settings object'); + function getRelated(rel) { + index = 0; + + if (rel && rel !== false && rel !== 'nofollow') { + $related = $('.' + boxElement).filter(function () { + var options = $.data(this, colorbox); + var settings = new Settings(this, options); + return (settings.get('rel') === rel); + }); + index = $related.index(settings.el); + + // Check direct calls to Colorbox. + if (index === -1) { + $related = $related.add(settings.el); + index = $related.length - 1; } } else { - settings = $.extend({}, data); + $related = $(settings.el); + } + } + + function trigger(event) { + // for external use + $(document).trigger(event); + // for internal use + $events.triggerHandler(event); + } + + var slideshow = (function(){ + var active, + className = prefix + "Slideshow_", + click = "click." + prefix, + timeOut; + + function clear () { + clearTimeout(timeOut); } - - for (i in settings) { - if ($.isFunction(settings[i]) && i.slice(0, 2) !== 'on') { // checks to make sure the function isn't one of the callbacks, they will be handled at the appropriate time. - settings[i] = settings[i].call(element); + + function set() { + if (settings.get('loop') || $related[index + 1]) { + clear(); + timeOut = setTimeout(publicMethod.next, settings.get('slideshowSpeed')); } } - - settings.rel = settings.rel || element.rel || $(element).data('rel') || 'nofollow'; - settings.href = settings.href || $(element).attr('href'); - settings.title = settings.title || element.title; - - if (typeof settings.href === "string") { - settings.href = $.trim(settings.href); + + function start() { + $slideshow + .html(settings.get('slideshowStop')) + .unbind(click) + .one(click, stop); + + $events + .bind(event_complete, set) + .bind(event_load, clear); + + $box.removeClass(className + "off").addClass(className + "on"); } - } - function trigger(event, callback) { - $.event.trigger(event); - if (callback) { - callback.call(element); + function stop() { + clear(); + + $events + .unbind(event_complete, set) + .unbind(event_load, clear); + + $slideshow + .html(settings.get('slideshowStart')) + .unbind(click) + .one(click, function () { + publicMethod.next(); + start(); + }); + + $box.removeClass(className + "on").addClass(className + "off"); } - } - // Slideshow functionality - function slideshow() { - var - timeOut, - className = prefix + "Slideshow_", - click = "click." + prefix, - start, - stop; - - if (settings.slideshow && $related[1]) { - start = function () { - $slideshow - .html(settings.slideshowStop) - .unbind(click) - .bind(event_complete, function () { - if (settings.loop || $related[index + 1]) { - timeOut = setTimeout(publicMethod.next, settings.slideshowSpeed); - } - }) - .bind(event_load, function () { - clearTimeout(timeOut); - }) - .one(click + ' ' + event_cleanup, stop); - $box.removeClass(className + "off").addClass(className + "on"); - timeOut = setTimeout(publicMethod.next, settings.slideshowSpeed); - }; - - stop = function () { - clearTimeout(timeOut); - $slideshow - .html(settings.slideshowStart) - .unbind([event_complete, event_load, event_cleanup, click].join(' ')) - .one(click, function () { - publicMethod.next(); - start(); - }); - $box.removeClass(className + "on").addClass(className + "off"); - }; - - if (settings.slideshowAuto) { - start(); - } else { - stop(); - } - } else { + function reset() { + active = false; + $slideshow.hide(); + clear(); + $events + .unbind(event_complete, set) + .unbind(event_load, clear); $box.removeClass(className + "off " + className + "on"); } - } - function launch(target) { - if (!closing) { - - element = target; - - makeSettings(); - - $related = $(element); - - index = 0; - - if (settings.rel !== 'nofollow') { - $related = $('.' + boxElement).filter(function () { - var data = $.data(this, colorbox), - relRelated; - - if (data) { - relRelated = $(this).data('rel') || data.rel || this.rel; + return function(){ + if (active) { + if (!settings.get('slideshow')) { + $events.unbind(event_cleanup, reset); + reset(); + } + } else { + if (settings.get('slideshow') && $related[1]) { + active = true; + $events.one(event_cleanup, reset); + if (settings.get('slideshowAuto')) { + start(); + } else { + stop(); } - - return (relRelated === settings.rel); - }); - index = $related.index(element); - - // Check direct calls to ColorBox. - if (index === -1) { - $related = $related.add(element); - index = $related.length - 1; + $slideshow.show(); } } - + }; + + }()); + + + function launch(element) { + var options; + + if (!closing) { + + options = $(element).data(colorbox); + + settings = new Settings(element, options); + + getRelated(settings.get('rel')); + if (!open) { open = active = true; // Prevents the page-change action from queuing up if the visitor holds down the left or right keys. - - $box.show(); - - if (settings.returnFocus) { - $(element).blur().one(event_closed, function () { - $(this).focus(); - }); - } - - // +settings.opacity avoids a problem in IE when using non-zero-prefixed-string-values, like '.5' - $overlay.css({"opacity": +settings.opacity, "cursor": settings.overlayClose ? "pointer" : "auto"}).show(); - - // Opens inital empty ColorBox prior to content being loaded. - settings.w = setSize(settings.initialWidth, 'x'); - settings.h = setSize(settings.initialHeight, 'y'); + + setClass(settings.get('className')); + + // Show colorbox so the sizes can be calculated in older versions of jQuery + $box.css({visibility:'hidden', display:'block', opacity:''}); + + $loaded = $tag(div, 'LoadedContent', 'width:0; height:0; overflow:hidden; visibility:hidden'); + $content.css({width:'', height:''}).append($loaded); + + // Cache values needed for size calculations + interfaceHeight = $topBorder.height() + $bottomBorder.height() + $content.outerHeight(true) - $content.height(); + interfaceWidth = $leftBorder.width() + $rightBorder.width() + $content.outerWidth(true) - $content.width(); + loadedHeight = $loaded.outerHeight(true); + loadedWidth = $loaded.outerWidth(true); + + // Opens inital empty Colorbox prior to content being loaded. + var initialWidth = setSize(settings.get('initialWidth'), 'x'); + var initialHeight = setSize(settings.get('initialHeight'), 'y'); + var maxWidth = settings.get('maxWidth'); + var maxHeight = settings.get('maxHeight'); + + settings.w = Math.max((maxWidth !== false ? Math.min(initialWidth, setSize(maxWidth, 'x')) : initialWidth) - loadedWidth - interfaceWidth, 0); + settings.h = Math.max((maxHeight !== false ? Math.min(initialHeight, setSize(maxHeight, 'y')) : initialHeight) - loadedHeight - interfaceHeight, 0); + + $loaded.css({width:'', height:settings.h}); publicMethod.position(); - - if (isIE6) { - $window.bind('resize.' + event_ie6 + ' scroll.' + event_ie6, function () { - $overlay.css({width: $window.width(), height: $window.height(), top: $window.scrollTop(), left: $window.scrollLeft()}); - }).trigger('resize.' + event_ie6); - } - - trigger(event_open, settings.onOpen); - + + trigger(event_open); + settings.get('onOpen'); + $groupControls.add($title).hide(); - - $close.html(settings.close).show(); + + $box.focus(); + + if (settings.get('trapFocus')) { + // Confine focus to the modal + // Uses event capturing that is not supported in IE8- + if (document.addEventListener) { + + document.addEventListener('focus', trapFocus, true); + + $events.one(event_closed, function () { + document.removeEventListener('focus', trapFocus, true); + }); + } + } + + // Return focus on closing + if (settings.get('returnFocus')) { + $events.one(event_closed, function () { + $(settings.el).focus(); + }); + } + } + + var opacity = parseFloat(settings.get('opacity')); + $overlay.css({ + opacity: opacity === opacity ? opacity : '', + cursor: settings.get('overlayClose') ? 'pointer' : '', + visibility: 'visible' + }).show(); + + if (settings.get('closeButton')) { + $close.html(settings.get('close')).appendTo($content); + } else { + $close.appendTo('
'); // replace with .detach() when dropping jQuery < 1.4 } - - publicMethod.load(true); + + load(); } } - // ColorBox's markup needs to be added to the DOM prior to being called + // Colorbox's markup needs to be added to the DOM prior to being called // so that the browser will go ahead and load the CSS background images. function appendHTML() { - if (!$box && document.body) { + if (!$box) { init = false; - $window = $(window); - $box = $tag(div).attr({id: colorbox, 'class': isIE ? prefix + (isIE6 ? 'IE6' : 'IE') : ''}).hide(); - $overlay = $tag(div, "Overlay", isIE6 ? 'position:absolute' : '').hide(); - $loadingOverlay = $tag(div, "LoadingOverlay").add($tag(div, "LoadingGraphic")); + $box = $tag(div).attr({ + id: colorbox, + 'class': $.support.opacity === false ? prefix + 'IE' : '', // class for optional IE8 & lower targeted CSS. + role: 'dialog', + tabindex: '-1' + }).hide(); + $overlay = $tag(div, "Overlay").hide(); + $loadingOverlay = $([$tag(div, "LoadingOverlay")[0],$tag(div, "LoadingGraphic")[0]]); $wrap = $tag(div, "Wrapper"); $content = $tag(div, "Content").append( - $loaded = $tag(div, "LoadedContent", 'width:0; height:0; overflow:hidden'), $title = $tag(div, "Title"), $current = $tag(div, "Current"), - $next = $tag(div, "Next"), - $prev = $tag(div, "Previous"), - $slideshow = $tag(div, "Slideshow").bind(event_open, slideshow), - $close = $tag(div, "Close") + $prev = $('