Changeset 1121928

Timestamp:

03/27/2015 05:44:17 AM (11 years ago)

Author:

loumray

Message:

Checking in 1.2.0

Location:

remote-medias-lite/trunk

Files:

• assets/css/media-remote-admin.css (modified) (1 diff)
• assets/css/media-remote-admin.min.css (modified) (1 diff)
• assets/js/media-remote-ext.js (modified) (13 diffs)
• assets/js/media-remote-ext.min.js (modified) (1 diff)
• assets/js/media-remote-query-test.js (modified) (1 diff)
• assets/js/media-remote-query-test.min.js (modified) (1 diff)
• lang/remote-medias-lite.pot (modified) (15 diffs)
• readme.txt (modified) (5 diffs)
• remote-medias-libs.php (modified) (1 diff)
• src/RemoteMediaExt/AccountPostType.php (modified) (1 diff)
• src/RemoteMediaExt/Accounts/AbstractRemoteAccount.php (modified) (10 diffs)
• src/RemoteMediaExt/Accounts/AbstractRemoteMedia.php (modified) (1 diff)
• src/RemoteMediaExt/Accounts/AbstractRemoteService.php (modified) (3 diffs)
• src/RemoteMediaExt/Accounts/Dailymotion/Service.php (modified) (7 diffs)
• src/RemoteMediaExt/Accounts/Dailymotion/ServiceDescription.json (modified) (2 diffs)
• src/RemoteMediaExt/Accounts/Flickr/Service.php (modified) (5 diffs)
• src/RemoteMediaExt/Accounts/MetaBoxSaveAccount.php (modified) (2 diffs)
• src/RemoteMediaExt/Accounts/RemoteAccountFactory.php (modified) (2 diffs)
• src/RemoteMediaExt/Accounts/RemoteMediaFactory.php (modified) (1 diff)
• src/RemoteMediaExt/Accounts/RemoteServiceFactory.php (modified) (1 diff)
• src/RemoteMediaExt/Accounts/Vimeo/Service.php (modified) (7 diffs)
• src/RemoteMediaExt/Accounts/Vimeo/ServiceDescription.json (modified) (2 diffs)
• src/RemoteMediaExt/Accounts/Youtube/RemoteMedia.php (modified) (2 diffs)
• src/RemoteMediaExt/Accounts/Youtube/Service.php (modified) (7 diffs)
• src/RemoteMediaExt/Accounts/Youtube/ServiceDescription.json (modified) (1 diff)
• src/RemoteMediaExt/Ajax/AjaxQueryAttachments.php (modified) (2 diffs)
• src/RemoteMediaExt/Ajax/AjaxQueryValidation.php (modified) (2 diffs)
• src/RemoteMediaExt/Ajax/AjaxSendRemoteToEditor.php (modified) (2 diffs)
• src/RemoteMediaExt/FRemoteMediaExt.php (modified) (5 diffs)
• src/RemoteMediaExt/Library/MediaSettings.php (modified) (1 diff)
• vendor/autoload.php (modified) (1 diff)
• vendor/composer/ClassLoader.php (modified) (3 diffs)
• vendor/composer/autoload_classmap.php (modified) (3 diffs)
• vendor/composer/autoload_real.php (modified) (3 diffs)
• vendor/guzzle/guzzle/src/Guzzle/Http/Curl/CurlMulti.php (modified) (1 diff)
• views/admin/media-remote-attachment.php (modified) (1 diff)
• views/admin/metaboxes/basic-settings.php (modified) (2 diffs)
• views/admin/metaboxes/status-actions.php (modified) (2 diffs)

remote-medias-lite/trunk/assets/css/media-remote-admin.css

@@ -83 +83 @@
     color: #a00;
 }
+
+.rmlnotice {
+    border-color: #ffba00 !important;
+}
+.media-frame select.rml-attachment-filters.attachment-filters {
+    max-width: 100%;
+    margin-right: 20px;
+}
+.ocsmorebanner {
+    display: none;
+    z-index: 999999;
+    background: rgba(0,0,0,0.8);
+    position: absolute;
+    margin: 0px 0 50px 0;
+    width: 100%;
+    height: 100%;
+    text-align: center;
+}
+.ocsbannerwrapper{
+    position: relative;
+    width: 100%;
+  height: 100%;
+}
+.ocsbannercontent{
+    position:absolute;
+    top:50%;
+    left:50%;
+    width: 50%;
+    margin-top:-75px;
+    margin-left: -25%;
+}
+.ocsbannerwrapper p{
+    color: #ffffff;
+    font-size: 18px;
+    font-weight: bold;
+    display: block;
+}
+a.ocsbannerdismiss{
+    color: #ffffff;
+    margin-top:20px;
+    display: inline-block;
+    font-size:16px;
+    text-decoration: none;
+}
+a.ocsbannerdismiss:hover{
+    text-decoration: underline;
+    color: #ffffff;
+}

remote-medias-lite/trunk/assets/css/media-remote-admin.min.css

@@ -1 @@
-.rm-upload-wrap .uploader-inline-content{top:10%}.rm-upload-wrap p.no-mg-top{margin-top:0}.ocs-logo{padding-top:20px}.ocs-logo small{display:inline-block}.ocs-logo img{display:inline-block;padding-top:10px}.spinner.ocs-inline-loading{float:initial;margin-top:-3px}.ocs-2x{font-size:2em}.ocs-3x{font-size:3em}.ocs-green{color:#7ad03a}.ocs-red{color:#a00}.rml-actions{padding:10px;clear:both;border-top:1px solid #ddd;background:#f5f5f5;margin:-12px}.rml-validation-actions{text-align:right;float:right;line-height:23px}.rml-status-actions{margin:-12px;padding:15px 0}.rml-status-actions label{vertical-align:baseline}.rml-status-field{font-weight:600}.rml-status-actions label[for=account_status]:before{content:"\f316";color:#888;display:inline-block;font:400 20px/1 dashicons;speak:none;left:-1px;padding:0 5px 0 0;position:relative;top:0;text-decoration:none!important;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}ul.wpform-fieldset li:last-child{border-bottom:none;padding-bottom:0}.rml-status-field.notvalid{color:#a00}
+.rm-upload-wrap .uploader-inline-content{top:10%}.rm-upload-wrap p.no-mg-top{margin-top:0}.ocs-logo{padding-top:20px}.ocs-logo small{display:inline-block}.ocs-logo img{display:inline-block;padding-top:10px}.spinner.ocs-inline-loading{float:initial;margin-top:-3px}.ocs-2x{font-size:2em}.ocs-3x{font-size:3em}.ocs-green{color:#7ad03a}.ocs-red{color:#a00}.rml-actions{padding:10px;clear:both;border-top:1px solid #ddd;background:#f5f5f5;margin:-12px}.rml-validation-actions{text-align:right;float:right;line-height:23px}.rml-status-actions{margin:-12px;padding:15px 0}.rml-status-actions label{vertical-align:baseline}.rml-status-field{font-weight:600}.rml-status-actions label[for=account_status]:before{content:"\f316";color:#888;display:inline-block;font:400 20px/1 dashicons;speak:none;left:-1px;padding:0 5px 0 0;position:relative;top:0;text-decoration:none!important;vertical-align:top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}ul.wpform-fieldset li:last-child{border-bottom:none;padding-bottom:0}.rml-status-field.notvalid{color:#a00}.rmlnotice{border-color:#ffba00!important}.media-frame select.rml-attachment-filters.attachment-filters{max-width:100%;margin-right:20px}.ocsmorebanner{display:none;z-index:999999;background:rgba(0,0,0,.8);position:absolute;margin:0 0 50px;width:100%;height:100%;text-align:center}.ocsbannerwrapper{position:relative;width:100%;height:100%}.ocsbannercontent{position:absolute;top:50%;left:50%;width:50%;margin-top:-75px;margin-left:-25%}.ocsbannerwrapper p{color:#fff;font-size:18px;font-weight:700;display:block}a.ocsbannerdismiss{color:#fff;margin-top:20px;display:inline-block;font-size:16px;text-decoration:none}a.ocsbannerdismiss:hover{text-decoration:underline;color:#fff}

remote-medias-lite/trunk/assets/js/media-remote-ext.js

@@ -63 +63 @@
         'change': 'refresh'
     },
-    initialize: function()
-    {
+    initialize: function() {
         _.defaults( this.options, {
             message: '',
@@ -70 +69 @@
         });
         
-        var state = this.controller.state();
-        var template = state.get('uploadTemplate');
+        var state = this.controller.state(),
+            template = state.get('uploadTemplate');
         if (template) {
             this.template = wp.media.template(template);
         }
+
+        if ( this.options.status ) {
+            this.views.set( '.upload-inline-status', new wp.media.view.UploaderStatus({
+                controller: this.controller
+            }) );
+        }
     },
-    
-    render: function()
-    {
-        wp.media.View.prototype.render.apply( this, arguments );
-        this.refresh();
+    render: function() {
+        wp.media.View.prototype.render.apply( this, arguments );
+        this.refresh();
         return this;
     },
-    
     refresh: function( event ) {},
     hide: function() {
@@ -89 +91 @@
     }
 });
+
 /**
  * 
@@ -156 +159 @@
                 delete props.query;
 
+                // Remove the `remotefilters` property. 
+                delete props.remotefilters;
+
+                // Remove the `uioptions` property. 
+                delete props.uioptions;
+
                 // Fill default args.
                 _.defaults( props, defaults );
@@ -202 +211 @@
         }())
 });
-// Extends the default MediaFrame.Post view
-/**
- * 
+
+/**
+ * wp.media.view.AttachmentFilters.RemoteCustom
+ *
+ */
+wp.media.view.AttachmentFilters.RemoteCustom = wp.media.view.AttachmentFilters.extend({
+    className: 'rml-attachment-filters attachment-filters',
+    createFilters: function() {
+        var filters = {},
+            remotefilters = this.model.get('remotefilters');
+
+        _.each(remotefilters, function(remotefilter) {
+            var filter = {
+                text: remotefilter.text || 'Undefined',
+                props: remotefilter.props || {uploadedTo: null,orderby: 'date',order: 'DESC'},
+                priority: remotefilter.priority || 10
+            }
+            if (remotefilter.slug) {
+                filters[remotefilter.slug] = (filter);
+            }
+            
+        });
+
+        this.filters = filters;
+    }
+});
+
+/**
+ * wp.media.controller.RemoteLibrary
  */
 wp.media.controller.RemoteLibrary = wp.media.controller.Library.extend({
@@ -216 +251 @@
         router:     'browse',
         menu:       'default',
+        date:       false,
         remote:     true,
         searchable: true,
         filterable: false,
         sortable:   true,
+        autoSelect: true,
 
         // Uses a user setting to override the content mode.
@@ -233 +270 @@
 var oldMediaFrame = wp.media.view.MediaFrame.Post;
 wp.media.view.MediaFrame.Post = oldMediaFrame.extend({
-
     initialize: function() {
         oldMediaFrame.prototype.initialize.apply( this, arguments );
@@ -244 +280 @@
         var that = this;
     
-        //TODO get service setting template from remote service setting object
-        _.each(wp.media.view.settings.remoteMediaAccounts,function(account) {
+        _.each(wp.media.view.settings.remoteMediaAccounts, function(account) {
+            var serviceSettings = wp.media.view.settings.remoteServiceSettings[account.type] || [];
             that.states.add([
                 new wp.media.controller.RemoteLibrary({
@@ -254 +290 @@
                     priority:   30,
                     toolbar:    'main-remote',
-                    uploadTemplate: _.isUndefined( wp.media.view.settings.remoteServiceSettings[account.type] ) ? null : wp.media.view.settings.remoteServiceSettings[account.type].uploadTemplate,
-                    filterable: 'uploaded',
+                    uploadTemplate: serviceSettings.uploadTemplate || '',
+                    filterable: account.filterable || 'uploaded',
                     library:  wp.media.remotequery( _.defaults({
                         type: 'remote',
-                        account_id: account.id
+                        account_id: account.id,
+                        remotefilters: account.filters || [],
+                        uioptions: account.uioptions || []
                     }, options.library ) ),
                     state:    'remote-library-'+account.id,
@@ -277 +315 @@
         this.on( 'toolbar:render:main-remote', this.mainInsertToolbar, this );
     },
-    
     uploadContent: function() {
         var sectionid = this.state().get('sectionid');
@@ -291 +328 @@
     }
 });
-
 wp.media.view.RemoteAttachmentsBrowser = wp.media.view.AttachmentsBrowser.extend({
-    createUploader: function() {
-        this.uploader = new wp.media.view.RemoteUploaderInline({
-            controller: this.controller,
-            status:     false,
-            message:    this.controller.isModeActive( 'grid' ) ? '' : wp.media.view.l10n.noItemsFound,
-            canClose:   this.controller.isModeActive( 'grid' )
-        });
-
-        this.uploader.hide();
-        this.views.add( this.uploader );
-    },
     createSingle: function () {
         var sidebar = this.sidebar,
@@ -327 +352 @@
         if ( this.model.id === 'remote-library-'+this.model.get('sectionid') ) {
             sidebar.$el.addClass( 'visible' );
+        }
+    },
+    createToolbar: function () {
+        wp.media.view.AttachmentsBrowser.prototype.createToolbar.apply( this, arguments );
+
+        if ( 'custom' === this.options.filters ) {
+            this.toolbar.set( 'filters', new wp.media.view.AttachmentFilters.RemoteCustom({
+                controller: this.controller,
+                model:      this.collection.props,
+                priority:   -80
+            }).render() );
         }
     }
@@ -346 +382 @@
                 search:     state.get('searchable'),
                 filters:    state.get('filterable'),
+                date:       state.get('date'),
                 display:    state.has('display') ? state.get('display') : state.get('displaySettings'),
                 dragInfo:   state.get('dragInfo'),

remote-medias-lite/trunk/assets/js/media-remote-ext.min.js

@@ -1 @@
-!function(){oldSendAttachment=wp.media.editor.send.attachment,wp.media.editor.send.attachment=function(a,b){if("remote"!==b.type)return oldSendAttachment(a,b);{var c;b.caption}return wp.media.view.settings.captions||delete b.caption,a=wp.media.string.props(a,b),c={id:b.id,title:b.title,type:b.type,subtype:b.subtype,remotetype:b.remotetype,accountId:b.accountId||0,remotedata:b.remotedata||[]},a.linkUrl&&(c.url=a.linkUrl),"image"===b.remotetype&&(_.each({align:"align",size:"image-size",alt:"image_alt"},function(b,d){a[d]&&(c[b]=a[d])}),c.width=b.width||0,c.height=b.height||0,c.imgurl=b.url||c.url),wp.media.post("send-remote-attachment-to-editor",{nonce:rmlSendToEditorParams.nonce,attachment:c,post_id:wp.media.view.settings.post.id})},wp.media.view.RemoteUploaderInline=wp.media.View.extend({tagName:"div",className:"remote-uploader",template:wp.media.template("remote-media-upload"),events:{input:"refresh",keyup:"refresh",change:"refresh"},initialize:function(){_.defaults(this.options,{message:"",status:!0});var a=this.controller.state(),b=a.get("uploadTemplate");b&&(this.template=wp.media.template(b))},render:function(){return wp.media.View.prototype.render.apply(this,arguments),this.refresh(),this},refresh:function(){},hide:function(){this.$el.addClass("hidden")}}),wp.media.remotequery=function(a){return new wp.media.model.RemoteAttachments(null,{props:_.extend(_.defaults(a||{},{orderby:"date"}),{query:!0})})},wp.media.model.RemoteAttachments=wp.media.model.Attachments.extend({initialize:function(){wp.media.model.Attachments.prototype.initialize.apply(this,arguments)},_requery:function(){this.props.get("query")&&this.mirror(wp.media.model.RemoteQuery.get(this.props.toJSON()))}}),wp.media.model.RemoteQuery=wp.media.model.Query.extend({initialize:function(){wp.media.model.Query.prototype.initialize.apply(this,arguments)},sync:function(a,b,c){var d;return"read"===a?(c=c||{},c.context=this,c.data=_.extend(c.data||{},{action:"query-remote-attachments",post_id:wp.media.model.settings.post.id,security:rmlQueryAttachmentsParams.nonce}),args=_.clone(this.args),-1!==args.posts_per_page&&(args.paged=Math.floor(this.length/args.posts_per_page)+1),c.data.query=args,wp.media.ajax(c)):(d=wp.media.model.Attachments.prototype.sync?wp.media.model.Attachments.prototype:Backbone,d.sync.apply(this,arguments))}},{get:function(){var a=[];return function(b,c){var d,e={},f=wp.media.model.RemoteQuery.orderby,g=wp.media.model.RemoteQuery.defaultProps;return delete b.query,_.defaults(b,g),b.order=b.order.toUpperCase(),"DESC"!==b.order&&"ASC"!==b.order&&(b.order=g.order.toUpperCase()),_.contains(f.allowed,b.orderby)||(b.orderby=g.orderby),_.each(b,function(a,b){_.isNull(a)||(e[wp.media.model.RemoteQuery.propmap[b]||b]=a)}),_.defaults(e,wp.media.model.RemoteQuery.defaultArgs),e.orderby=f.valuemap[b.orderby]||b.orderby,d=_.find(a,function(a){return _.isEqual(a.args,e)}),d||(d=new wp.media.model.RemoteQuery([],_.extend(c||{},{props:b,args:e})),a.push(d)),d}}()}),wp.media.controller.RemoteLibrary=wp.media.controller.Library.extend({defaults:{id:"remote-library",multiple:"add",describe:!1,toolbar:"select",sidebar:"settings",content:"upload",router:"browse",menu:"default",remote:!0,searchable:!0,filterable:!1,sortable:!0,contentUserSetting:!0,syncSelection:!0}});var a=wp.media.view.MediaFrame.Post;wp.media.view.MediaFrame.Post=a.extend({initialize:function(){a.prototype.initialize.apply(this,arguments)},createStates:function(){a.prototype.createStates.apply(this,arguments);var b=this.options,c=this;_.each(wp.media.view.settings.remoteMediaAccounts,function(a){c.states.add([new wp.media.controller.RemoteLibrary({id:"remote-library-"+a.id,sectionid:a.id,title:a.title,service:a.type,priority:30,toolbar:"main-remote",uploadTemplate:_.isUndefined(wp.media.view.settings.remoteServiceSettings[a.type])?null:wp.media.view.settings.remoteServiceSettings[a.type].uploadTemplate,filterable:"uploaded",library:wp.media.remotequery(_.defaults({type:"remote",account_id:a.id},b.library)),state:"remote-library-"+a.id,editable:!0,displaySettings:!0,displayUserSettings:!0,menu:"default",AttachmentView:wp.media.view.Attachment.RemoteLibrary})])},this)},bindHandlers:function(){a.prototype.bindHandlers.apply(this,arguments),this.on("toolbar:create:main-remote",this.createToolbar,this),this.on("toolbar:render:main-remote",this.mainInsertToolbar,this)},uploadContent:function(){var a=this.state().get("sectionid");a?(this.$el.removeClass("hide-toolbar"),this.content.set(new wp.media.view.RemoteUploaderInline({controller:this,model:this.state().props}))):wp.media.view.MediaFrame.Select.prototype.uploadContent.apply(this,arguments)}}),wp.media.view.RemoteAttachmentsBrowser=wp.media.view.AttachmentsBrowser.extend({createUploader:function(){this.uploader=new wp.media.view.RemoteUploaderInline({controller:this.controller,status:!1,message:this.controller.isModeActive("grid")?"":wp.media.view.l10n.noItemsFound,canClose:this.controller.isModeActive("grid")}),this.uploader.hide(),this.views.add(this.uploader)},createSingle:function(){var a=this.sidebar,b=this.options.selection.single(),c=b.get("type"),d=b.get("remotetype");return"remote"!==c?wp.media.view.AttachmentsBrowser.prototype.createSingle.apply(this,arguments):("image"===d?(b.set("type",d),wp.media.view.AttachmentsBrowser.prototype.createSingle.apply(this,arguments),b.set("type","remote")):wp.media.view.AttachmentsBrowser.prototype.createSingle.apply(this,arguments),void(this.model.id==="remote-library-"+this.model.get("sectionid")&&a.$el.addClass("visible")))}});var b=wp.media.view.MediaFrame.Select;wp.media.view.MediaFrame.Select.prototype.browseRemoteContent=function(a){var c=this.state(),d=c.get("remote");d===!0?(this.$el.removeClass("hide-toolbar"),a.view=new wp.media.view.RemoteAttachmentsBrowser({controller:this,collection:c.get("library"),selection:c.get("selection"),model:c,sortable:c.get("sortable"),search:c.get("searchable"),filters:c.get("filterable"),display:c.get(c.has("display")?"display":"displaySettings"),dragInfo:c.get("dragInfo"),idealColumnWidth:c.get("idealColumnWidth"),suggestedWidth:c.get("suggestedWidth"),suggestedHeight:c.get("suggestedHeight"),AttachmentView:c.get("AttachmentView")})):b.prototype.browseContent.apply(this,arguments)},wp.media.view.MediaFrame.Select=b.extend({bindHandlers:function(){this.on("router:create:browse",this.createRouter,this),this.on("router:render:browse",this.browseRouter,this),this.on("content:create:browse",this.browseRemoteContent,this),this.on("content:render:upload",this.uploadContent,this),this.on("toolbar:create:select",this.createSelectToolbar,this)}}),wp.media.view.Attachment.RemoteLibrary=wp.media.view.Attachment.Library.extend({template:wp.media.template("attachment-remote"),toggleSelection:function(){wp.media.view.Attachment.Library.prototype.toggleSelection.apply(this,arguments)}}),wp.media.view.Attachment.RemoteSelection=wp.media.view.Attachment.Selection.extend({template:wp.media.template("attachment-remote")}),oldAttachmentsSelection=wp.media.view.Attachments.Selection,wp.media.view.Attachments.Selection=oldAttachmentsSelection.extend({initialize:function(){return _.defaults(this.options,{AttachmentView:wp.media.view.Attachment.RemoteSelection}),oldAttachmentsSelection.prototype.initialize.apply(this,arguments)}})}(jQuery);
+!function(){oldSendAttachment=wp.media.editor.send.attachment,wp.media.editor.send.attachment=function(a,b){if("remote"!==b.type)return oldSendAttachment(a,b);{var c;b.caption}return wp.media.view.settings.captions||delete b.caption,a=wp.media.string.props(a,b),c={id:b.id,title:b.title,type:b.type,subtype:b.subtype,remotetype:b.remotetype,accountId:b.accountId||0,remotedata:b.remotedata||[]},a.linkUrl&&(c.url=a.linkUrl),"image"===b.remotetype&&(_.each({align:"align",size:"image-size",alt:"image_alt"},function(b,d){a[d]&&(c[b]=a[d])}),c.width=b.width||0,c.height=b.height||0,c.imgurl=b.url||c.url),wp.media.post("send-remote-attachment-to-editor",{nonce:rmlSendToEditorParams.nonce,attachment:c,post_id:wp.media.view.settings.post.id})},wp.media.view.RemoteUploaderInline=wp.media.View.extend({tagName:"div",className:"remote-uploader",template:wp.media.template("remote-media-upload"),events:{input:"refresh",keyup:"refresh",change:"refresh"},initialize:function(){_.defaults(this.options,{message:"",status:!0});var a=this.controller.state(),b=a.get("uploadTemplate");b&&(this.template=wp.media.template(b)),this.options.status&&this.views.set(".upload-inline-status",new wp.media.view.UploaderStatus({controller:this.controller}))},render:function(){return wp.media.View.prototype.render.apply(this,arguments),this.refresh(),this},refresh:function(){},hide:function(){this.$el.addClass("hidden")}}),wp.media.remotequery=function(a){return new wp.media.model.RemoteAttachments(null,{props:_.extend(_.defaults(a||{},{orderby:"date"}),{query:!0})})},wp.media.model.RemoteAttachments=wp.media.model.Attachments.extend({initialize:function(){wp.media.model.Attachments.prototype.initialize.apply(this,arguments)},_requery:function(){this.props.get("query")&&this.mirror(wp.media.model.RemoteQuery.get(this.props.toJSON()))}}),wp.media.model.RemoteQuery=wp.media.model.Query.extend({initialize:function(){wp.media.model.Query.prototype.initialize.apply(this,arguments)},sync:function(a,b,c){var d;return"read"===a?(c=c||{},c.context=this,c.data=_.extend(c.data||{},{action:"query-remote-attachments",post_id:wp.media.model.settings.post.id,security:rmlQueryAttachmentsParams.nonce}),args=_.clone(this.args),-1!==args.posts_per_page&&(args.paged=Math.floor(this.length/args.posts_per_page)+1),c.data.query=args,wp.media.ajax(c)):(d=wp.media.model.Attachments.prototype.sync?wp.media.model.Attachments.prototype:Backbone,d.sync.apply(this,arguments))}},{get:function(){var a=[];return function(b,c){var d,e={},f=wp.media.model.RemoteQuery.orderby,g=wp.media.model.RemoteQuery.defaultProps;return delete b.query,delete b.remotefilters,delete b.uioptions,_.defaults(b,g),b.order=b.order.toUpperCase(),"DESC"!==b.order&&"ASC"!==b.order&&(b.order=g.order.toUpperCase()),_.contains(f.allowed,b.orderby)||(b.orderby=g.orderby),_.each(b,function(a,b){_.isNull(a)||(e[wp.media.model.RemoteQuery.propmap[b]||b]=a)}),_.defaults(e,wp.media.model.RemoteQuery.defaultArgs),e.orderby=f.valuemap[b.orderby]||b.orderby,d=_.find(a,function(a){return _.isEqual(a.args,e)}),d||(d=new wp.media.model.RemoteQuery([],_.extend(c||{},{props:b,args:e})),a.push(d)),d}}()}),wp.media.view.AttachmentFilters.RemoteCustom=wp.media.view.AttachmentFilters.extend({className:"rml-attachment-filters attachment-filters",createFilters:function(){var a={},b=this.model.get("remotefilters");_.each(b,function(b){var c={text:b.text||"Undefined",props:b.props||{uploadedTo:null,orderby:"date",order:"DESC"},priority:b.priority||10};b.slug&&(a[b.slug]=c)}),this.filters=a}}),wp.media.controller.RemoteLibrary=wp.media.controller.Library.extend({defaults:{id:"remote-library",multiple:"add",describe:!1,toolbar:"select",sidebar:"settings",content:"upload",router:"browse",menu:"default",date:!1,remote:!0,searchable:!0,filterable:!1,sortable:!0,autoSelect:!0,contentUserSetting:!0,syncSelection:!0}});var a=wp.media.view.MediaFrame.Post;wp.media.view.MediaFrame.Post=a.extend({initialize:function(){a.prototype.initialize.apply(this,arguments)},createStates:function(){a.prototype.createStates.apply(this,arguments);var b=this.options,c=this;_.each(wp.media.view.settings.remoteMediaAccounts,function(a){var d=wp.media.view.settings.remoteServiceSettings[a.type]||[];c.states.add([new wp.media.controller.RemoteLibrary({id:"remote-library-"+a.id,sectionid:a.id,title:a.title,service:a.type,priority:30,toolbar:"main-remote",uploadTemplate:d.uploadTemplate||"",filterable:a.filterable||"uploaded",library:wp.media.remotequery(_.defaults({type:"remote",account_id:a.id,remotefilters:a.filters||[],uioptions:a.uioptions||[]},b.library)),state:"remote-library-"+a.id,editable:!0,displaySettings:!0,displayUserSettings:!0,menu:"default",AttachmentView:wp.media.view.Attachment.RemoteLibrary})])},this)},bindHandlers:function(){a.prototype.bindHandlers.apply(this,arguments),this.on("toolbar:create:main-remote",this.createToolbar,this),this.on("toolbar:render:main-remote",this.mainInsertToolbar,this)},uploadContent:function(){var a=this.state().get("sectionid");a?(this.$el.removeClass("hide-toolbar"),this.content.set(new wp.media.view.RemoteUploaderInline({controller:this,model:this.state().props}))):wp.media.view.MediaFrame.Select.prototype.uploadContent.apply(this,arguments)}}),wp.media.view.RemoteAttachmentsBrowser=wp.media.view.AttachmentsBrowser.extend({createSingle:function(){var a=this.sidebar,b=this.options.selection.single(),c=b.get("type"),d=b.get("remotetype");return"remote"!==c?wp.media.view.AttachmentsBrowser.prototype.createSingle.apply(this,arguments):("image"===d?(b.set("type",d),wp.media.view.AttachmentsBrowser.prototype.createSingle.apply(this,arguments),b.set("type","remote")):wp.media.view.AttachmentsBrowser.prototype.createSingle.apply(this,arguments),void(this.model.id==="remote-library-"+this.model.get("sectionid")&&a.$el.addClass("visible")))},createToolbar:function(){wp.media.view.AttachmentsBrowser.prototype.createToolbar.apply(this,arguments),"custom"===this.options.filters&&this.toolbar.set("filters",new wp.media.view.AttachmentFilters.RemoteCustom({controller:this.controller,model:this.collection.props,priority:-80}).render())}});var b=wp.media.view.MediaFrame.Select;wp.media.view.MediaFrame.Select.prototype.browseRemoteContent=function(a){var c=this.state(),d=c.get("remote");d===!0?(this.$el.removeClass("hide-toolbar"),a.view=new wp.media.view.RemoteAttachmentsBrowser({controller:this,collection:c.get("library"),selection:c.get("selection"),model:c,sortable:c.get("sortable"),search:c.get("searchable"),filters:c.get("filterable"),date:c.get("date"),display:c.get(c.has("display")?"display":"displaySettings"),dragInfo:c.get("dragInfo"),idealColumnWidth:c.get("idealColumnWidth"),suggestedWidth:c.get("suggestedWidth"),suggestedHeight:c.get("suggestedHeight"),AttachmentView:c.get("AttachmentView")})):b.prototype.browseContent.apply(this,arguments)},wp.media.view.MediaFrame.Select=b.extend({bindHandlers:function(){this.on("router:create:browse",this.createRouter,this),this.on("router:render:browse",this.browseRouter,this),this.on("content:create:browse",this.browseRemoteContent,this),this.on("content:render:upload",this.uploadContent,this),this.on("toolbar:create:select",this.createSelectToolbar,this)}}),wp.media.view.Attachment.RemoteLibrary=wp.media.view.Attachment.Library.extend({template:wp.media.template("attachment-remote"),toggleSelection:function(){wp.media.view.Attachment.Library.prototype.toggleSelection.apply(this,arguments)}}),wp.media.view.Attachment.RemoteSelection=wp.media.view.Attachment.Selection.extend({template:wp.media.template("attachment-remote")}),oldAttachmentsSelection=wp.media.view.Attachments.Selection,wp.media.view.Attachments.Selection=oldAttachmentsSelection.extend({initialize:function(){return _.defaults(this.options,{AttachmentView:wp.media.view.Attachment.RemoteSelection}),oldAttachmentsSelection.prototype.initialize.apply(this,arguments)}})}(jQuery);

remote-medias-lite/trunk/assets/js/media-remote-query-test.js

@@ +1 @@
+window.ocs = window.ocs || {};
+ocs.rml = ocs.rml || {};
+
 (function($){
-$(document).ready(function($) {
-    $('#rml_service_selection,#rml_account_settings select').live('change', function () {
-        $('.rml-status-field.working').hide();
-        $('.rml-status-field.notvalid').hide();
-        $('.rml-status-field.unknown').show();
+    'use strict';
+    ocs.rml.AccountStatusManager = function () {
+        this.init();
+    }
+
+    ocs.rml.AccountStatusManager.prototype = {
+        $statusField: $('.rml-status-field'),
+        $querymsg: $('#query_msg'),
+        $loading: $('#rmlloading'),
+        $currentFields: null,
+        authInterval: null,
+        init: function () {
+        },
+        hookevents: function () {
+            var that = this;
+            $('#rml_service_selection,#rml_account_settings select').live('change', function () {
+                that.setStatus('unknown');
+            });
+            $('#rml_account_settings input').live('keyup', function () {
+                that.setStatus('unknown');
+            });
+            $('.action_query_test').live('click', function() {
+                that.validate();
+            });
+        },
+        fetchActiveFields: function () {
+            this.$currentFields = $('.rmlfields-'+$('#remote_media_type').val());
+        },
+        getServiceClass: function () {
+            this.fetchActiveFields();
+            return this.$currentFields.find('#service_class').val() || '';
+        },
+        getPostId: function () {
+            return $('#post_ID').val();
+        },
+        setStatus: function (status) {
+            var $statusmsg = $('#rmlaccountstatus');
+
+            $statusmsg.html(status);
+            this.$querymsg.html('');
+            if (status === rmlQueryTestParams.status.invalid) {
+                this.$querymsg.html('<div class="dashicons dashicons-no ocs-3x ocs-red" style="margin-top: -3px; padding: 0 10px;"></div>');
+            }
+
+            if (status === rmlQueryTestParams.status.enabled) {
+                this.$querymsg.html('<div class="dashicons dashicons-yes ocs-3x ocs-green" style="margin-top: -3px; padding: 0 10px;"></div>');
+            }
+            
+            return;
+        },
+        getCurrentSettings: function () {
+            var settings = {},
+                elements = $('.rmlfields-'+$('#remote_media_type').val()+'').find('input');
+            $.each(elements, function () {
+                var start = this.name.indexOf('[', this.name.indexOf('[')+1)+1,
+                    end   = this.name.indexOf(']', this.name.indexOf(']')+1),
+                    name = this.name;
+                name = name.substr(start,end-start);
+                settings[name] = $(this).val();
+            })
+            return settings;
+        },
+        authenticate: function (url) {
+            var that = this,
+                authwindow;
+
+            this.$loading.css('display', 'inline-block');
+            this.setStatus(rmlQueryTestParams.status.authProcessing);
+            if (url) {
+                authwindow = window.open(url,'rmlauthprocess','height=400,width=800');
+                this.authInterval = window.setInterval(function() {
+                    try {
+                        if (authwindow === null || authwindow.closed) {
+                            that.authdone(0);
+                        }
+                    }
+                    catch (e) {
+                    }
+                }, 1000);
+            }
+            
+        },
+        authdone: function (status) {
+            var status = parseInt(status) || 0;
+            window.clearInterval(this.authInterval);
+            this.$loading.hide();
+            if (status === 1) {
+                this.setStatus(rmlQueryTestParams.status.enabled);
+                $('.rmlnotice').hide();
+                $('#rmlstatusbutton').html(rmlQueryTestParams.button.reauth);
+            } else {
+                this.setStatus(rmlQueryTestParams.status.authfailed);
+            }
+            this.$loading.hide();
+        },
+        validate: function () {
+            var that = this,
+                data = {
+                    action: 'rmlQueryTest',
+                    security: rmlQueryTestParams.nonce,
+                    post_id: this.getPostId(),
+                    account: this.getCurrentSettings()
+                };
+            
+            that.$loading.css('display', 'inline-block');
+
+            $.post(rmlQueryTestParams.ajax_url, data, function(response) {
+                that.$loading.hide();
+                data = $.parseJSON(response);
+
+                if (data.authneeded && data.authurl) {
+                    that.authenticate(data.authurl);
+                    return true;
+                }
+                if(!data.authneeded && parseInt(data.validate) === 1) {
+                    that.setStatus(rmlQueryTestParams.status.enabled);
+                    return true;
+                }
+
+                that.setStatus(rmlQueryTestParams.status.invalid);
+                return false;
+            });
+            return false;
+        }
+    }
+    ocs.rml.statusManager = new ocs.rml.AccountStatusManager();
+
+    $(document).ready(function($) {
+        ocs.rml.statusManager.hookevents();
     });
-    $('#rml_account_settings input').live('keyup', function () {
-        $('.rml-status-field.working').hide();
-        $('.rml-status-field.notvalid').hide();
-        $('.rml-status-field.unknown').show();
-    });
-    $('.action_query_test').live('click', function() {
-        var $metabox = $(this).closest('.rmlfields'),
-            $currentFields = $('.rmlfields-'+$('#remote_media_type').val()),
-            data = {
-                action: 'rmlQueryTest',
-                security: rmlQueryTestParams.nonce,
-                post_id: $('#post_ID').val(),
-                user_id: $currentFields.find('#remote_user_id').val(),
-                service_class: $currentFields.find('#service_class').val()
-            };
-
-        $('#rmlloading').css('display', 'inline-block');
-        $('#query_msg').html('');
-        $('.rml-status-field.working').hide();
-        $('.rml-status-field.notvalid').hide();
-        $('.rml-status-field.unknown').show();
-
-        if (data.user_id.length < 1) {
-            $('#rmlloading').hide();
-            $('.rml-status-field.notvalid').show();
-            $('.rml-status-field.working').hide();
-            $('.rml-status-field.unknown').hide();
-            $('#query_msg').html('<div class="dashicons dashicons-no ocs-3x ocs-red" style="margin-top: -3px; padding: 0 10px;"></div>');
-            return false;
-        }
-        $.post(rmlQueryTestParams.ajax_url, data, function(response) {
-            $('#rmlloading').hide();
-            data = $.parseJSON( response );
-            if(data.validate) {
-                $('.rml-status-field.working').show();
-                $('.rml-status-field.notvalid').hide();
-                $('.rml-status-field.unknown').hide();
-                $('#query_msg').html('<div class="dashicons dashicons-yes ocs-3x ocs-green" style="margin-top: -3px; padding: 0 10px;"></div>');
-                return true;
-            }
-            $('.rml-status-field.notvalid').show();
-            $('.rml-status-field.working').hide();
-            $('.rml-status-field.unknown').hide();
-            $('#query_msg').html('<div class="dashicons dashicons-no ocs-3x ocs-red" style="margin-top: -3px; padding: 0 10px;"></div>');
-            return false;
-        });
-        return false;
-    });
-});
 }(jQuery));

remote-medias-lite/trunk/assets/js/media-remote-query-test.min.js

@@ -1 @@
-!function(a){a(document).ready(function(a){a("#rml_service_selection,#rml_account_settings select").live("change",function(){a(".rml-status-field.working").hide(),a(".rml-status-field.notvalid").hide(),a(".rml-status-field.unknown").show()}),a("#rml_account_settings input").live("keyup",function(){a(".rml-status-field.working").hide(),a(".rml-status-field.notvalid").hide(),a(".rml-status-field.unknown").show()}),a(".action_query_test").live("click",function(){var b=(a(this).closest(".rmlfields"),a(".rmlfields-"+a("#remote_media_type").val())),c={action:"rmlQueryTest",security:rmlQueryTestParams.nonce,post_id:a("#post_ID").val(),user_id:b.find("#remote_user_id").val(),service_class:b.find("#service_class").val()};return a("#rmlloading").css("display","inline-block"),a("#query_msg").html(""),a(".rml-status-field.working").hide(),a(".rml-status-field.notvalid").hide(),a(".rml-status-field.unknown").show(),c.user_id.length<1?(a("#rmlloading").hide(),a(".rml-status-field.notvalid").show(),a(".rml-status-field.working").hide(),a(".rml-status-field.unknown").hide(),a("#query_msg").html('<div class="dashicons dashicons-no ocs-3x ocs-red" style="margin-top: -3px; padding: 0 10px;"></div>'),!1):(a.post(rmlQueryTestParams.ajax_url,c,function(b){return a("#rmlloading").hide(),c=a.parseJSON(b),c.validate?(a(".rml-status-field.working").show(),a(".rml-status-field.notvalid").hide(),a(".rml-status-field.unknown").hide(),a("#query_msg").html('<div class="dashicons dashicons-yes ocs-3x ocs-green" style="margin-top: -3px; padding: 0 10px;"></div>'),!0):(a(".rml-status-field.notvalid").show(),a(".rml-status-field.working").hide(),a(".rml-status-field.unknown").hide(),a("#query_msg").html('<div class="dashicons dashicons-no ocs-3x ocs-red" style="margin-top: -3px; padding: 0 10px;"></div>'),!1)}),!1)})})}(jQuery);
+window.ocs=window.ocs||{},ocs.rml=ocs.rml||{},function(a){"use strict";ocs.rml.AccountStatusManager=function(){this.init()},ocs.rml.AccountStatusManager.prototype={$statusField:a(".rml-status-field"),$querymsg:a("#query_msg"),$loading:a("#rmlloading"),$currentFields:null,authInterval:null,init:function(){},hookevents:function(){var b=this;a("#rml_service_selection,#rml_account_settings select").live("change",function(){b.setStatus("unknown")}),a("#rml_account_settings input").live("keyup",function(){b.setStatus("unknown")}),a(".action_query_test").live("click",function(){b.validate()})},fetchActiveFields:function(){this.$currentFields=a(".rmlfields-"+a("#remote_media_type").val())},getServiceClass:function(){return this.fetchActiveFields(),this.$currentFields.find("#service_class").val()||""},getPostId:function(){return a("#post_ID").val()},setStatus:function(b){var c=a("#rmlaccountstatus");c.html(b),this.$querymsg.html(""),b===rmlQueryTestParams.status.invalid&&this.$querymsg.html('<div class="dashicons dashicons-no ocs-3x ocs-red" style="margin-top: -3px; padding: 0 10px;"></div>'),b===rmlQueryTestParams.status.enabled&&this.$querymsg.html('<div class="dashicons dashicons-yes ocs-3x ocs-green" style="margin-top: -3px; padding: 0 10px;"></div>')},getCurrentSettings:function(){var b={},c=a(".rmlfields-"+a("#remote_media_type").val()).find("input");return a.each(c,function(){var c=this.name.indexOf("[",this.name.indexOf("[")+1)+1,d=this.name.indexOf("]",this.name.indexOf("]")+1),e=this.name;e=e.substr(c,d-c),b[e]=a(this).val()}),b},authenticate:function(a){var b,c=this;this.$loading.css("display","inline-block"),this.setStatus(rmlQueryTestParams.status.authProcessing),a&&(b=window.open(a,"rmlauthprocess","height=400,width=800"),this.authInterval=window.setInterval(function(){try{(null===b||b.closed)&&c.authdone(0)}catch(a){}},1e3))},authdone:function(b){var b=parseInt(b)||0;window.clearInterval(this.authInterval),this.$loading.hide(),1===b?(this.setStatus(rmlQueryTestParams.status.enabled),a(".rmlnotice").hide(),a("#rmlstatusbutton").html(rmlQueryTestParams.button.reauth)):this.setStatus(rmlQueryTestParams.status.authfailed),this.$loading.hide()},validate:function(){var b=this,c={action:"rmlQueryTest",security:rmlQueryTestParams.nonce,post_id:this.getPostId(),account:this.getCurrentSettings()};return b.$loading.css("display","inline-block"),a.post(rmlQueryTestParams.ajax_url,c,function(d){return b.$loading.hide(),c=a.parseJSON(d),c.authneeded&&c.authurl?(b.authenticate(c.authurl),!0):c.authneeded||1!==parseInt(c.validate)?(b.setStatus(rmlQueryTestParams.status.invalid),!1):(b.setStatus(rmlQueryTestParams.status.enabled),!0)}),!1}},ocs.rml.statusManager=new ocs.rml.AccountStatusManager,a(document).ready(function(){ocs.rml.statusManager.hookevents()})}(jQuery);

remote-medias-lite/trunk/lang/remote-medias-lite.pot

@@ -7 +7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: RemoteMediasLite 1.1.1\n"
+"Project-Id-Version: remote-medias-lite 1.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-29 15:40-0400\n"
+"POT-Creation-Date: 2015-03-26 22:35-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -18 +18 @@
 "Content-Transfer-Encoding: 8bit\n"
 
-#: remote-medias-libs.php:41
+#: bootstrap.php:33
 #, php-format
 msgid ""
@@ -25 +25 @@
 msgstr ""
 
-#: remote-medias-libs.php:43
+#: bootstrap.php:35 remote-medias-libs.php:13
 #, php-format
 msgid ""
@@ -81 +81 @@
 
 #: src/RemoteMediaExt/AccountPostType.php:51
+msgid "Remote library authentication needed. %sAuthenticate now%"
+msgstr ""
+
+#: src/RemoteMediaExt/AccountPostType.php:55
 msgid ""
 "Could not connect to remote Library. Please verify your remote library "
@@ -86 +90 @@
 msgstr ""
 
-#: src/RemoteMediaExt/AccountPostType.php:73
-#: src/RemoteMediaExt/AccountPostType.php:74
+#: src/RemoteMediaExt/AccountPostType.php:80
+#: src/RemoteMediaExt/AccountPostType.php:81
 msgid "Remote library settings updated."
 msgstr ""
 
-#: src/RemoteMediaExt/AccountPostType.php:76
+#: src/RemoteMediaExt/AccountPostType.php:83
 #, php-format
 msgid "Remote library settings restored to revision from %s"
 msgstr ""
 
-#: src/RemoteMediaExt/AccountPostType.php:77
+#: src/RemoteMediaExt/AccountPostType.php:84
 msgid "Remote library settings published."
 msgstr ""
 
-#: src/RemoteMediaExt/AccountPostType.php:78
+#: src/RemoteMediaExt/AccountPostType.php:85
 msgid "Remote library settings saved."
 msgstr ""
 
-#: src/RemoteMediaExt/AccountPostType.php:79
+#: src/RemoteMediaExt/AccountPostType.php:86
 msgid "Remote library settings submitted."
 msgstr ""
 
-#: src/RemoteMediaExt/AccountPostType.php:81
+#: src/RemoteMediaExt/AccountPostType.php:88
 #, php-format
 msgid "Remote library settings scheduled for: <strong>%1$s</strong>."
 msgstr ""
 
-#: src/RemoteMediaExt/AccountPostType.php:83
+#. //php.net/date
+#: src/RemoteMediaExt/AccountPostType.php:90
 msgid "M j, Y @ G:i"
 msgstr ""
 
-#: src/RemoteMediaExt/AccountPostType.php:85
+#: src/RemoteMediaExt/AccountPostType.php:92
 msgid "Remote library settings draft updated."
+msgstr ""
+
+#: src/RemoteMediaExt/Accounts/AbstractRemoteAccount.php:219
+#: src/RemoteMediaExt/Ajax/AjaxQueryValidation.php:25
+msgid "Enabled"
+msgstr ""
+
+#: src/RemoteMediaExt/Accounts/AbstractRemoteAccount.php:221
+msgid "Authenticate now"
+msgstr ""
+
+#: src/RemoteMediaExt/Accounts/AbstractRemoteAccount.php:223
+#: src/RemoteMediaExt/Ajax/AjaxQueryValidation.php:23
+msgid "Invalid"
+msgstr ""
+
+#: src/RemoteMediaExt/Accounts/AbstractRemoteAccount.php:225
+#: src/RemoteMediaExt/Accounts/AbstractRemoteAccount.php:228
+#: src/RemoteMediaExt/Ajax/AjaxQueryValidation.php:22
+msgid "Unknown"
 msgstr ""
 
@@ -138 +163 @@
 
 #: src/RemoteMediaExt/Accounts/Dailymotion/Service.php:14
-msgid "Dailymotion Basic"
+msgid "Dailymotion"
 msgstr ""
 
@@ -150 +175 @@
 
 #: src/RemoteMediaExt/Accounts/Flickr/Service.php:14
-msgid "Flickr Basic"
+msgid "Flickr"
 msgstr ""
 
@@ -161 +186 @@
 msgstr ""
 
+#: src/RemoteMediaExt/Accounts/Instagram/Service.php:14
+msgid "Instagram"
+msgstr ""
+
+#: src/RemoteMediaExt/Accounts/Instagram/Service.php:36
+msgid "Instagram Username"
+msgstr ""
+
+#: src/RemoteMediaExt/Accounts/Instagram/Service.php:41
+msgid "Insert the Instagram user for this library"
+msgstr ""
+
 #: src/RemoteMediaExt/Accounts/Vimeo/Service.php:14
-msgid "Vimeo Basic"
+msgid "Vimeo"
 msgstr ""
 
@@ -174 +211 @@
 
 #: src/RemoteMediaExt/Accounts/Youtube/Service.php:16
-msgid "Youtube Basic"
+msgid "Youtube"
 msgstr ""
 
@@ -185 +222 @@
 msgstr ""
 
-#: src/RemoteMediaExt/FRemoteMediaExt.php:139
+#: src/RemoteMediaExt/Ajax/AjaxQueryValidation.php:24
+msgid "Authenticating"
+msgstr ""
+
+#: src/RemoteMediaExt/Ajax/AjaxQueryValidation.php:26
+msgid "Authenticate Now"
+msgstr ""
+
+#: src/RemoteMediaExt/Ajax/AjaxQueryValidation.php:27
+msgid "Failed Auth"
+msgstr ""
+
+#: src/RemoteMediaExt/Ajax/AjaxQueryValidation.php:29
+msgid "Re-authenticate"
+msgstr ""
+
+#: src/RemoteMediaExt/FRemoteMediaExt.php:147
 msgid "New Menu Added"
 msgstr ""
 
-#: src/RemoteMediaExt/FRemoteMediaExt.php:140
+#: src/RemoteMediaExt/FRemoteMediaExt.php:148
 #, php-format
 msgid ""
@@ -196 +249 @@
 msgstr ""
 
-#: src/RemoteMediaExt/FRemoteMediaExt.php:151
+#: src/RemoteMediaExt/FRemoteMediaExt.php:159
 msgid "Media Manager Extended"
 msgstr ""
 
-#: src/RemoteMediaExt/FRemoteMediaExt.php:152
+#: src/RemoteMediaExt/FRemoteMediaExt.php:160
 #, php-format
 msgid ""
@@ -207 +260 @@
 msgstr ""
 
-#: src/RemoteMediaExt/FRemoteMediaExt.php:178
+#: src/RemoteMediaExt/FRemoteMediaExt.php:186
 msgid "Service Selection"
 msgstr ""
 
-#: src/RemoteMediaExt/FRemoteMediaExt.php:191
+#: src/RemoteMediaExt/FRemoteMediaExt.php:198
 msgid "Account Settings"
 msgstr ""
 
-#: src/RemoteMediaExt/FRemoteMediaExt.php:202
+#: src/RemoteMediaExt/FRemoteMediaExt.php:209
 msgid "Status & Actions"
 msgstr ""
 
-#: src/RemoteMediaExt/FRemoteMediaExt.php:220
+#: src/RemoteMediaExt/FRemoteMediaExt.php:227
 msgid "Remote Service"
 msgstr ""
 
-#: src/RemoteMediaExt/FRemoteMediaExt.php:227
+#: src/RemoteMediaExt/FRemoteMediaExt.php:234
 msgid "Choose the type of service you want to connect."
 msgstr ""
@@ -262 +315 @@
 
 #: vendor/loumray/wpforms/src/UploadLibrary.php:129
-#: views/admin/media-remote-attachment.php:27
+#: views/admin/media-remote-attachment.php:26
 msgid "Remove"
 msgstr ""
 
-#: views/admin/media-remote-attachment.php:31
+#: views/admin/media-remote-attachment.php:30
 msgid "Deselect"
 msgstr ""
 
-#: views/admin/media-remote-attachment.php:39
+#: views/admin/media-remote-attachment.php:37
 msgid "Caption this image&hellip;"
 msgstr ""
 
+#: views/admin/media-remote-attachment.php:41
+msgid "Describe this video&hellip;"
+msgstr ""
+
 #: views/admin/media-remote-attachment.php:43
-msgid "Describe this video&hellip;"
+msgid "Describe this audio file&hellip;"
 msgstr ""
 
 #: views/admin/media-remote-attachment.php:45
-msgid "Describe this audio file&hellip;"
-msgstr ""
-
-#: views/admin/media-remote-attachment.php:47
 msgid "Describe this media file&hellip;"
 msgstr ""
@@ -312 +365 @@
 msgstr ""
 
+#: views/admin/media-upload-instagram.php:11
+msgid "Get unlimited number of pictures with RML Instagram Pro"
+msgstr ""
+
+#: views/admin/media-upload-instagram.php:13
+msgid "Get the extension and unlock premium features &raquo;"
+msgstr ""
+
+#: views/admin/media-upload-instagram.php:16
+msgid "Add our RML Instagram Pro extension to unlock premium features."
+msgstr ""
+
 #: views/admin/media-upload-vimeo.php:11
 msgid "Upload videos directly to your Vimeo account"
@@ -330 +395 @@
 msgstr ""
 
-#: views/admin/metaboxes/status-actions.php:5
+#: views/admin/metaboxes/status-actions.php:9
 msgid "Account Status:"
 msgstr ""
 
-#: views/admin/metaboxes/status-actions.php:29
-msgid "Working"
-msgstr ""
-
-#: views/admin/metaboxes/status-actions.php:30
-msgid "Unknown"
-msgstr ""
-
-#: views/admin/metaboxes/status-actions.php:31
-msgid "Invalid"
-msgstr ""
-
-#: views/admin/metaboxes/status-actions.php:39
+#: views/admin/metaboxes/status-actions.php:27
 msgid "Validate"
 msgstr ""

remote-medias-lite/trunk/readme.txt

@@ -1 @@
-=== Remote Media Libraries ===
+=== Remote Media Libraries ===
 Contributors: loumray
-Tags: youtube, vimeo, vimeo pro, dailymotion, flickr, API, Media Manager, Extension, Integration, direct upload, private videos, remote medias libraries, media explorer, embeds
+Tags: youtube, vimeo, vimeo pro, dailymotion, flickr, API, Media Manager, Media Library Extension, Integration, direct upload, private videos, remote medias libraries, media explorer, embeded
 Requires at least: 3.5
-Tested up to: 4.0
+Tested up to: 4.2-beta1
 Stable tag: 1.1.2
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
-Remote Media Libraries gives you direct access to all medias accross the web directly from the Media Manager.
+Remote Media Libraries (RML) gives you access to third parties media libraries directly from the Wordpress Media Library.
 
 == Description ==
 
-Remote Media Libraries gives you access to your favorite content of youtube, vimeo, dailymotion, flickr directly into the media manager.
+Remote Media Libraries (RML) gives you access to your favorite content from Youtube, Vimeo, Dailymotion, Flickr and Instagram directly into the media library. The RML plugin makes it possible to navigate, search, and inserts remote media into you posts and pages. This will increased your page load time and also save on server bandwidth. 
 
-The plugin makes it possible to navigate and manage all your medias from all your favorite remote services directly from wordpress media manager.  
+You can create as many account as you want and they will show in the left sidebar of the Wordpress media library.  
 
-A LOT of service will be added for direct integration. Send us you favorite service and we will integrate it FAST.
-
-Also, it is possible to download cheaps add-ons that will let you direct upload your media files to 3rd party services and update your media content directly from your wordpress admin panel.
-
-= Supported Services =
+= Currently Integrated Services =
 
 * Youtube
@@ -26 +22 @@
 * Dailymotion
 * Flickr
+* Instagram
+
+= Vote for the next integration =
+
+We need your feedback to know which will be the next integration added to RML. Please take 1 minute to fill out this quick survey:
+
+<a href="http://onecodeshop.com/vote-for-the-next-integration/">Next integration survey »</a>
+
+= RML Pro versions =
+
+RML Pro versions let you access premium features:
+
+* Albums/lists filtering
+* Unlimited amount of media in the library
+* Secure private content
+* Upload from Wordpress media library to your remote service
+* And more ...
+
+More informations on RML pro versions:
+
+* <a href="http://onecodeshop.com/youtube-pro-remote-media-libraries/">RML Youtube Pro</a>
+* <a href="http://onecodeshop.com/flickr-pro-remote-media-libraries/">RML Flickr Pro</a>
+* <a href="http://onecodeshop.com/instagram-pro-remote-media-libraries/">RML Instagram Pro</a>
+
 
 = Upcoming Services =
 
-* Vimeo Pro (make your exclusive videos private right from WP admin)
-* Instagram
+* Amazon S3 Services
+* Amazon Cloud Front
+* Vimeo Pro (Upload capability)
+* DropBox
 * Tumblr
 * Photobucket
+* Facebook
 * Twitter
-* Amazon S3 Services
 * Cloud files
+* Pixabay
+* <a href="http://onecodeshop.com/vote-for-the-next-integration/">Vote for the next integration »</a>
 
 = Follow us! =
@@ -43 +67 @@
 * <a href="https://twitter.com/onecodeshop">twitter.com/onecodeshop</a>
 
-= Planned for Next Release =
+= Buy us a coffee! =
 
-* Youtube Search & public feeds
-* Flickr Latest public feed and favorites 
-* Instagram Basic Beta support
+We do work hard to bring you the best of the RML plugin. As normal programmers and designers we live on coffee, support us and buy us a coffee, you will make us happy :) Humm coffee ...
+
+<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=P9N89H4AJ5PCL">Buy us a coffee »</a>
 
 == Changelog ==
+= 1.2.0 =
+* Initial support of instagram
+* Update media library attachment template in media library to match WP behavior for local medias.
+* Added missing image size in  display settings
+* Fixed a bug that occured in the case that Youtube do not return any author
+* Makes plugin main script parsable by PHP 5.2 to fail gracefully and display a notice.
+* Extend plugin to support APIs that need authentication
+
 = 1.1.2 =
 * Fixed a bug causing bad edit links on re-activated Link Manager admin links page
@@ -66 +98 @@
 
 == Upgrade Notice ==
+= 1.2.0 =
+This version add instagram support and multiple fixes.
+
 = 1.1.1 =
 Improved support for remote medias images in Media Manager
@@ -77 +112 @@
 * WordPress 3.5 or greater
 * PHP version 5.3.3 or greater
+* PHP cURl module intsalled
 
 = Manual installation =

remote-medias-lite/trunk/remote-medias-libs.php

@@ -4 +4 @@
 Plugin URI: http://onecodeshop.com/
 Description: Integrates 3rd party medias to WP media manager
-Version: 1.1.2
+Version: 1.2.0
 Author: Team OneCodeShop.com
 Author URI: http://onecodeshop.com/
 */
-namespace WPRemoteMediaExt;
 
-use WPRemoteMediaExt\WPCore\admin\WPadminNotice;
-use WPRemoteMediaExt\WPCore\View;
-use WPRemoteMediaExt\WPCore\WPpluginTextDomain;
-use WPRemoteMediaExt\RemoteMediaExt\FRemoteMediaExt;
-use WPRemoteMediaExt\WPCore\WPplugin;
-
-require 'autoload.php';
-
-class PRemoteMedias extends WPplugin
+function ocsRmlPhpNotice()
 {
-
-    public static $instance;
-
-    public static function getInstance()
-    {
-        if (!isset(self::$instance)) {
-            self::$instance = new self();
-        }
-
-        return self::$instance;
-    }
-
-    public function __construct()
-    {
-        load_plugin_textdomain('remote-medias-lite', false, dirname(plugin_basename(__FILE__)).'/lang');
-
-        parent::__construct(__FILE__, 'Remote Media Libraries', 'remote-medias-lite');
-
-        $this->setReqWpVersion("3.5");
-        $this->setReqWPMsg(sprintf(__('%s <strong>Requirements failed.</strong> WP version must <strong>at least %s</strong>. You are using version '.$GLOBALS['wp_version'], 'remote-medias-lite'), $this->getName(), $this->reqWPVersion));
-        $this->setReqPhpVersion("5.3.3");
-        $this->setReqPHPMsg(sprintf(__('%s <strong>Requirements failed.</strong> PHP version must <strong>at least %s</strong>. You are using version '. PHP_VERSION, 'remote-medias-lite'), $this->getName(), $this->reqPHPVersion));
-               
-        $this->setMainFeature(FRemoteMediaExt::getInstance());
-        parent::init();
-    }
+    echo '<div class="message error"><p>'.sprintf(__('%s <strong>Requirements failed.</strong> PHP version must <strong>at least %s</strong>. You are using version '. PHP_VERSION, 'remote-medias-lite'), 'Remote Media Libraries', '5.3.3').'</p></div>';
 }
 
-$pwebremotemediasext = PRemoteMedias::getInstance();
-$pwebremotemediasext->register();
+/*
+ * Unfortunately, while grand daddy PHP 5.2 is still hanging around this check avoid PHP error upon PHP 5.2 activation. 
+ */
+if (version_compare(PHP_VERSION, '5.3.3', '>=')) {
+    require 'bootstrap.php';
+} else {
+    add_action('admin_notices', 'ocsRmlPhpNotice');
+}

remote-medias-lite/trunk/src/RemoteMediaExt/AccountPostType.php

@@ -46 +46 @@
     public function initAdminNotices()
     {
-        if (isset($_REQUEST['rmlmsg']) &&
-            absint($_REQUEST['rmlmsg']) === 1
-        ) {
-            $notice = new WPadminNotice(__("Could not connect to remote Library. Please verify your remote library settings. Only valid libraries are added to the media manager.", 'remote-medias-lite'), "message error");
-            $notice->register();
+        if (isset($_REQUEST['rmlmsg'])) {
+            switch(absint($_REQUEST['rmlmsg'])) {
+                case 1:
+                    $notice = new WPadminNotice(sprintf(__("Remote library authentication needed. %sAuthenticate now%", 'remote-medias-lite'), '<a class="action_query_test" href="#">', '</a>'), "message error rmlnotice");
+                    $notice->register();
+                    break;
+                case 2:
+                    $notice = new WPadminNotice(__("Could not connect to remote Library. Please verify your remote library settings. Only valid libraries are added to the media manager.", 'remote-medias-lite'), "message error");
+                    $notice->register();
+                    break;
+            }
+            
         }
     }

remote-medias-lite/trunk/src/RemoteMediaExt/Accounts/AbstractRemoteAccount.php

@@ -3 +3 @@
 
 use WPRemoteMediaExt\Guzzle\Http\Exception\ClientErrorResponseException;
+use WPRemoteMediaExt\RemoteMediaExt\Exception;
 
 abstract class AbstractRemoteAccount
 {
+    const STATUS_UNKNOWN    = 0;
+    const STATUS_AUTHNEEDED = 1;
+    const STATUS_INVALID    = 2;
+    const STATUS_ENABLED    = 10;
+
     protected $localID;
     protected $remoteID;
@@ -31 +37 @@
     }
 
+    public function setId($aid)
+    {
+        $this->localID = $aid;
+
+        return $this;
+    }
+    public function setType($type)
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
     public function getId()
     {
@@ -39 +58 @@
     {
         return is_a($this->service, get_class($service));
+    }
+
+    public function setServiceFromClass($serviceClass)
+    {
+        $serviceInstance = RemoteServiceFactory::create($serviceClass);
+        if (!is_null($serviceInstance) &&
+            $serviceInstance instanceof AbstractRemoteService
+        ) {
+            $this->setService($serviceInstance);
+        }
     }
 
@@ -52 +81 @@
             if (!empty($serviceClass)) {
                 $serviceClass = RemoteServiceFactory::retrieveClassName($serviceClass);
-
-                $this->setService(RemoteServiceFactory::create($serviceClass));
+                $this->setServiceFromClass($serviceClass);
             }
         }
@@ -61 +89 @@
 
     /*
-     * return false on failure true if success
+     * @return false on failure or no change update true on update
+     *
      */
     public function save()
     {
-        $this->validate();
-
+        $this->set('service_class', RemoteServiceFactory::getDbClassName(RemoteServiceFactory::getClass($this->type)));
         $return = update_post_meta($this->localID, 'remote_attr', $this->attributes);
         $return = update_post_meta($this->localID, 'remote_account_type', $this->type) && $return;
@@ -82 +110 @@
     }
 
+    public function getServiceNamespace()
+    {
+        $serviceclass = get_class($this->service);
+        return substr($serviceclass, 0, strrpos($serviceclass, '\\'));
+
+    }
+    
     public function getService()
     {
@@ -87 +122 @@
     }
 
-    public function get($name)
+    public function get($name, $default = null)
     {
         if ($name === null) {
@@ -97 +132 @@
         }
 
-        return isset($this->attributes[$name]) ? $this->attributes[$name] : null;
+        return isset($this->attributes[$name]) ? $this->attributes[$name] : $default;
     }
 
@@ -111 +146 @@
         if ($name == 'remote_account_type') {
             $this->type = $value;
-            $this->set('service_class', RemoteServiceFactory::getDbClassName(RemoteServiceFactory::getClass($this->type)));
             return $this;
         }
@@ -141 +175 @@
     }
 
+    public function isEnabled()
+    {
+        $isEnabled = $this->get('isEnabled', false);
+        if ($isEnabled === true) {
+            return true;
+        }
+
+        $isValid = $this->get('isValid', false);
+        $isAuthNeeded = $this->isAuthNeeded();
+        if ($isAuthNeeded === false &&
+            $isValid === true
+        ) {
+            return true;
+        }
+        return false;
+    }
+
+    public function isAuthNeeded()
+    {
+        if ($this->service instanceof AbstractAuthService) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function getAuthUrl()
+    {
+        if (!$this->isAuthNeeded() ||
+            !$this->service instanceof AbstractAuthService
+        ) {
+            return '';
+        }
+
+        return $this->service->getAuthUrl();
+    }
+
+    public function getStatusDisplay()
+    {
+        $status = $this->getStatus();
+        switch ($status) {
+            case self::STATUS_ENABLED:
+                return __('Enabled', 'remote-medias-lite');
+            case self::STATUS_AUTHNEEDED:
+                return __('Authenticate now', 'remote-medias-lite');
+            case self::STATUS_INVALID:
+                return __('Invalid', 'remote-medias-lite');
+            default:
+                return __('Unknown', 'remote-medias-lite');
+        }
+
+        return __('Unknown', 'remote-medias-lite');
+    }
+
+    public function getStatus()
+    {
+        if ($this->isEnabled()) {
+            return self::STATUS_ENABLED;
+        }
+
+        if ($this->isAuthNeeded()) {
+            return self::STATUS_AUTHNEEDED;
+        }
+
+        $isValid = $this->get('isValid');
+        if ($isValid === false) {
+            return self::STATUS_INVALID;
+        }
+        return self::STATUS_UNKNOWN;
+    }
+
+    /*
+    * @return 1 on validate, 0 on invalid params, -1 on error
+    */
     public function validate()
     {
-        if (!($this->service instanceof AbstractRemoteService)) {
-            return false;
-        }
-
-        $return = array();
-        $return['validate'] = false;
-        
+        $isValid = 0;
+        $this->set('isValid', false);
+
         try {
-            $return['validate'] = $this->service->validate($this);
+            $isServiceValid = $this->service->validate();
+            if ($isServiceValid === true) {
+                $this->set('isValid', true);
+                $isValid = 1;
+            }
         } catch (ClientErrorResponseException $e) {
-            $return['error'] = true;
-            $return['statuscode'] = $e->getResponse()->getStatusCode();
-            $return['msg']        = $e->getResponse()->getReasonPhrase();
+            $isValid = 0;
+        } catch (Exception\InvalidAuthParamException $e) {
+            $isValid = 0;
         } catch (\Exception $e) {
-            $return['error'] = true;
-            $return['statuscode'] = $e->getCode();
-            $return['msg']        = $e->getMessage();
-        }
-
-        $lastValidQuery = null;
-
-        if ($return['validate'] === true) {
-            $lastValidQuery =  $this->get('remote_user_id');
-            $this->set('isValid', true);
-        } else {
-            $this->set('isValid', false);
-        }
-
-        $this->set('last_valid_query', $lastValidQuery);
-
-        return $return['validate'];
+            error_log('RML error occured validating account '.$this->getId().': '.$e->getMessage());
+            $isValid = -1;
+        }
+
+        return $isValid;
     }
 }

remote-medias-lite/trunk/src/RemoteMediaExt/Accounts/AbstractRemoteMedia.php

@@ -105 +105 @@
             );
         }
-        $sizes['full'] = array('url' => $url);
+        $sizes['full'] = array(
+            'height'      => $height,
+            'width'       => $width,
+            'url'         => $url,
+            'orientation' => $height > $width ? 'portrait' : 'landscape',
+        );
 
         return $sizes;

remote-medias-lite/trunk/src/RemoteMediaExt/Accounts/AbstractRemoteService.php

@@ -25 +25 @@
     {
         $this->accountPostType = $postType;
+
+        return $this;
     }
 
@@ -30 +32 @@
     {
         $this->client = $client;
+
+        return $this;
     }
 
@@ -55 +59 @@
     {
         foreach ($this->fieldSet as $field) {
-            $field->attr('value', esc_attr($this->account->get($this->getSlug().'_'.$field->attr('id'))));
+            $value = $this->account->get($this->getSlug().'_'.$field->attr('id'));
+            $default = $field->attr('default');
+            if (is_null($value) && !is_null($default)) {
+                $value = $default;
+            }
+            $field->attr('value', esc_attr($value));
         }
         return $this->fieldSet;

remote-medias-lite/trunk/src/RemoteMediaExt/Accounts/Dailymotion/Service.php

@@ -12 +12 @@
     public function __construct()
     {
-        parent::__construct(__('Dailymotion Basic'), 'dailymotion');
+        parent::__construct(__('Dailymotion', 'remote-medias-lite'), 'dailymotion');
 
         $client = Client::factory();
@@ -38 +38 @@
             'class' => $this->getSlug(),
             'id' => 'remote_user_id',
-            'name' => 'account_meta['.$this->getSlug().'][remote_user_id]',
+            'name' => 'account_meta['.$this->getSlug().'][dailymotion_remote_user_id]',
             'desc' => __("Insert the Dailymotion User ID for this library", 'remote-medias-lite'),
         );
@@ -49 +49 @@
 
         $params = array(
-            'user_id' => $this->account->get('remote_user_id'),
+            'user_id' => $this->account->get('dailymotion_remote_user_id'),
             'fields'  => 'id,screenname,status,username'
         );
@@ -69 +69 @@
 
         $params = array(
-            'user_id' => $this->account->get('remote_user_id'),
+            'user_id' => $this->account->get('dailymotion_remote_user_id'),
             'fields'  => 'id,title,description,created_time,modified_time,owner,thumbnail_120_url,thumbnail_url,url'
         );
@@ -81 +81 @@
     {
         $params = array(
-            'user_id' => $this->account->get('remote_user_id'),
-            'fields'  => 'id,title,description,created_time,modified_time,owner,thumbnail_120_url,thumbnail_url,url'
+            'user_id' => $this->account->get('dailymotion_remote_user_id'),
+            'fields'  => 'id,title,description,created_time,modified_time,owner,thumbnail_120_url,thumbnail_url,url',
         );
         $command = $this->client->getCommand('UserVideosRequest', $params);
@@ -92 +92 @@
     public function getUserAttachments()
     {
+        $page = 1;
+        $perpage = 40;
+        $searchTerm = '';
+
+        if (isset($_POST['query']['posts_per_page'])) {
+            $perpage = absint($_POST['query']['posts_per_page']);
+        }
+        if (isset($_POST['query']['s'])) {
+            $searchTerm = sanitize_text_field($_POST['query']['s']);
+        }
+
         $response = $this->GetUserMedias();
         $medias = $response->getAll();
@@ -102 +113 @@
             $attachments[$i] = $remoteMedia->toMediaManagerAttachment();
         }
+
+        unset($attachments[count($attachments)-1]);
         return $attachments;
     }

remote-medias-lite/trunk/src/RemoteMediaExt/Accounts/Dailymotion/ServiceDescription.json

@@ -27 +27 @@
       "UserVideosRequest": {
         "httpMethod": "GET",
-        "uri": "user/{user_id}/videos?fields={fields}",
+        "uri": "user/{user_id}/videos",
         "summary": "Access the videos for a specific user",
         "class": "WPRemoteMediaExt\\Guzzle\\Service\\Command\\OperationCommand",
@@ -40 +40 @@
                 "fields": {
                     "type": "string",
-                    "location": "uri",
+                    "location": "query",
                     "default": "id,title",
                     "description": "Fields list. See http://www.dailymotion.com/doc/api/obj-video.html"
+                },
+                "page": {
+                    "type": "string",
+                    "location": "query",
+                    "default": "1"
+                },
+                "limit": {
+                    "type": "string",
+                    "location": "query",
+                    "default": "40"
                 }
             }

remote-medias-lite/trunk/src/RemoteMediaExt/Accounts/Flickr/Service.php

@@ -12 +12 @@
     public function __construct()
     {
-          parent::__construct(__('Flickr Basic'), 'flickr');
+          parent::__construct(__('Flickr', 'remote-medias-lite'), 'flickr');
 
           $client = Client::factory();
@@ -47 +47 @@
             'id' => 'remote_user_id',
             'placeholder' => 'XXXXXXXX@NXX',
-            'name' => 'account_meta['.$this->getSlug().'][remote_user_id]',
+            'name' => 'account_meta['.$this->getSlug().'][flickr_remote_user_id]',
             'desc' => __("Insert the Flickr User NSID for this library", 'remote-medias-lite'),
         );
@@ -56 +56 @@
     {
         $params = array(
-            'user_id' => $this->account->get('remote_user_id'),
+            'user_id' => $this->account->get('flickr_remote_user_id'),
         );
         $command = $this->client->getCommand('UserPublicPhotos', $params);
         $response = $this->client->execute($command);
-
-        return $command->getResponse()->isSuccessful();
+        
+        return $response->isSuccessful();
     }
 
@@ -68 +68 @@
 
         // $params = array(
-        //     'user_id' => $account->get('remote_user_id'),
+        //     'user_id' => $account->get('flickr_remote_user_id'),
         //     'request' => 'info'
         // );
@@ -77 +77 @@
     }
 
+    /*
+    *
+    * Per Flickr site:
+    *   Why do I only see 20 items in RSS feeds?
+    *   Flickr only shows the latest 20 items in a feed. Because of this, 
+    *   the first time you connect to a feed you will only see the most 
+    *   recent items. But if your RSS reader saves items (as most do) you 
+    *   will see more than 20 as the items build up over time.
+    *
+    * from: https://www.flickr.com/help/website/#109651
+    */
     public function getUserMedias()
     {
         $params = array(
-            'user_id' => $this->account->get('remote_user_id'),
+            'user_id' => $this->account->get('flickr_remote_user_id'),
         );
         $command = $this->client->getCommand('UserPublicPhotos', $params);

remote-medias-lite/trunk/src/RemoteMediaExt/Accounts/MetaBoxSaveAccount.php

@@ -28 +28 @@
             if (is_array($value)) {
                 foreach ($value as $typedata => $typevalue) {
-                    $account->set($key.'_'.$typedata, sanitize_text_field($typevalue));
+                    $account->set($typedata, sanitize_text_field($typevalue));
                 }
             } else {
@@ -35 +35 @@
         }
 
-        $account->set('remote_user_id', sanitize_text_field($_POST['account_meta'][$accountType]['remote_user_id']));
         $account->set('service_class', sanitize_text_field($_POST['account_meta'][$accountType]['service_class']));
+        $account->setServiceFromClass(stripslashes($account->get('service_class')));
 
+        $account->validate();
         $account->save();
 
-        $isValid = $account->get('isValid');
-        if (!$isValid) {
-            $_REQUEST['rmlmsg'] = 1;
+        $isEnabled = $account->isEnabled();
+
+        if (!$isEnabled) {
+            $_REQUEST['rmlmsg'] = $account->getStatus();
         } elseif (isset($_REQUEST['rmlmsg'])) {
             unset($_REQUEST['rmlmsg']);

remote-medias-lite/trunk/src/RemoteMediaExt/Accounts/RemoteAccountFactory.php

@@ -4 +4 @@
 class RemoteAccountFactory
 {
-    //TODO create by id and create by type
     public static function create($rmID)
     {
@@ -16 +15 @@
             $newaccount = new RemoteAccount();
             $newaccount->setService($service);
+            $newaccount->setType(RemoteServiceFactory::getType($serviceClass));
 
             return $newaccount;

remote-medias-lite/trunk/src/RemoteMediaExt/Accounts/RemoteMediaFactory.php

@@ -4 +4 @@
 class RemoteMediaFactory
 {
+    public static function createFromAccountid($accountId, $metadata = array())
+    {
+        $account = RemoteAccountFactory::create($accountId);
+        $baseNamespace = $account->getServiceNamespace();
+        $rmclass = $baseNamespace.'\\RemoteMedia';
+        if (class_exists($rmclass)) {
+            return new $rmclass($metadata);
+        }
+        return null;
+    }
+
     public static function create($subtype, $metadata = array())
     {

remote-medias-lite/trunk/src/RemoteMediaExt/Accounts/RemoteServiceFactory.php

@@ -68 +68 @@
         return null;
     }
+
+    public static function getType($class)
+    {
+        return array_search($class, self::$classes);
+    }
 }

remote-medias-lite/trunk/src/RemoteMediaExt/Accounts/Vimeo/Service.php

@@ -12 +12 @@
     public function __construct()
     {
-        parent::__construct(__('Vimeo Basic'), 'vimeo');
+        parent::__construct(__('Vimeo', 'remote-medias-lite'), 'vimeo');
 
         $client = Client::factory();
@@ -38 +38 @@
             'class' => $this->getSlug(),
             'id' => 'remote_user_id',
-            'name' => 'account_meta['.$this->getSlug().'][remote_user_id]',
+            'name' => 'account_meta['.$this->getSlug().'][vimeo_remote_user_id]',
             'desc' => __("Insert the Vimeo User ID for this library", 'remote-medias-lite'),
         );
@@ -48 +48 @@
 
         $params = array(
-            'user_id' => $this->account->get('remote_user_id'),
+            'user_id' => $this->account->get('vimeo_remote_user_id'),
             'request' => 'info'
         );
@@ -61 +61 @@
 
         $params = array(
-            'user_id' => $this->account->get('remote_user_id'),
+            'user_id' => $this->account->get('vimeo_remote_user_id'),
             'request' => 'info'
         );
@@ -70 +70 @@
     }
 
+    /*
+    * From https://developer.vimeo.com/apis/simple
+    * Simple API responses include up to 20 items per page.
+    *
+    * By adding the ?page parameter to the URL, you can retrieve up to 3 pages 
+    * of data. If you need more than the maximum of 60 items, you must use the 
+    * New API.
+    */
     public function getUserMedias()
     {
         $params = array(
-            'user_id' => $this->account->get('remote_user_id'),
+            'user_id' => $this->account->get('vimeo_remote_user_id'),
             'request' => 'videos'
         );
@@ -84 +92 @@
     public function getUserAttachments()
     {
+        $perpage = 40;
+        $searchTerm = '';
+
+        if (isset($_POST['query']['posts_per_page'])) {
+            $perpage = absint($_POST['query']['posts_per_page']);
+        }
+        if (isset($_POST['query']['s'])) {
+            $searchTerm = sanitize_text_field($_POST['query']['s']);
+        }
+
+        //Vimeo return 20 max items per page
         $response = $this->GetUserMedias();
         $medias = $response->getAll();
@@ -92 +111 @@
             $remoteMedia = new RemoteMedia($media);
             $remoteMedia->setAccount($this->getAccount());
-            $attachments[$i] = $remoteMedia->toMediaManagerAttachment();
+            $attachments[] = $remoteMedia->toMediaManagerAttachment();
         }
+        
         return $attachments;
     }

remote-medias-lite/trunk/src/RemoteMediaExt/Accounts/Vimeo/ServiceDescription.json

@@ -2 +2 @@
     "name": "Vimeo",
     "apiVersion": "2",
-    "description": "This API allows to connect with Vimeo web services",
+    "description": "This API allows to connect with Vimeo web services. From https://developer.vimeo.com/apis/simple",
     "operations": {
       "UserRequest": {
@@ -22 +22 @@
                     "description": "The data you want. Could be: info,videos,likes,appears_in,all_videos,subscriptions,albums,channels,groups",
                     "required": true
+                },
+                "page": {
+                    "type": "integer",
+                    "location": "query"
                 }
             }

remote-medias-lite/trunk/src/RemoteMediaExt/Accounts/Youtube/RemoteMedia.php

@@ -26 +26 @@
     {
         
-
         $attachment = array_merge(
             $this->getBasicAttachment(),
@@ -36 +35 @@
                 'link'        => $this->metadata['url'],
                 'alt'         => '',
-                'author'      => $this->metadata['author']['name'],
+                'author'      => isset($this->metadata['author']) && isset($this->metadata['author']['name']) ? $this->metadata['author']['name'] : '',
                 'description' => $this->metadata['content'],
                 'caption'     => "", //limit word count

remote-medias-lite/trunk/src/RemoteMediaExt/Accounts/Youtube/Service.php

@@ -14 +14 @@
     public function __construct()
     {
-        parent::__construct(__('Youtube Basic'), 'youtube');
+        parent::__construct(__('Youtube', 'remote-medias-lite'), 'youtube');
 
         $client = Client::factory();
@@ -40 +40 @@
             'class' => $this->getSlug(),
             'id' => 'remote_user_id',
-            'name' => 'account_meta['.$this->getSlug().'][remote_user_id]',
+            'name' => 'account_meta['.$this->getSlug().'][youtube_remote_user_id]',
             'desc' => __("Insert the Youtube User ID for this library", 'remote-medias-lite'),
         );
@@ -72 +72 @@
     {
         $params = array(
-            'user_id' => $this->account->get('remote_user_id'),
+            'user_id' => $this->account->get('youtube_remote_user_id'),
             'request' => 'info'
         );
@@ -85 +85 @@
     {
         $params = array(
-            'user_id' => $this->account->get('remote_user_id')
+            'user_id' => $this->account->get('youtube_remote_user_id')
         );
         $command = $this->client->getCommand($this->command, $params);
@@ -93 +93 @@
     }
 
-    public function getUserMedias()
+    public function getUserMedias($perpage = 40)
     {
         $params = array(
-            'user_id' => $this->account->get('remote_user_id')
+            'user_id' => $this->account->get('youtube_remote_user_id'),
+            'max-results' => $perpage,
         );
         $command = $this->client->getCommand($this->command, $params);
@@ -106 +107 @@
     public function getUserAttachments()
     {
-        $response = $this->GetUserMedias();
+        $perpage = 40;
+        $searchTerm = '';
+
+        if (isset($_POST['query']['posts_per_page'])) {
+            $perpage = absint($_POST['query']['posts_per_page']);
+        }
+        if (isset($_POST['query']['s'])) {
+            $searchTerm = sanitize_text_field($_POST['query']['s']);
+        }
+
+        $response = $this->GetUserMedias($perpage);
         $medias = $response->getAll();
 
@@ -116 +127 @@
             $attachments[$i] = $remoteMedia->toMediaManagerAttachment();
         }
+        unset($attachments[count($attachments)-1]);
         return $attachments;
     }

remote-medias-lite/trunk/src/RemoteMediaExt/Accounts/Youtube/ServiceDescription.json

@@ -16 +16 @@
                     "description": "The user id you want.",
                     "required": true
+                },
+                "max-results": {
+                    "type": "string",
+                    "location": "query",
+                    "default": 40
+                },
+                "start-index": {
+                    "type": "string",
+                    "location": "query",
+                    "default": 1
+                },
+                "orderby": {
+                    "type": "string",
+                    "location": "query",
+                    "default": "published"
                 }
             }

remote-medias-lite/trunk/src/RemoteMediaExt/Ajax/AjaxQueryAttachments.php

@@ -32 +32 @@
 
         } catch (ClientErrorResponseException $e) {
-            $return['success'] = true;
+            $return['success'] = false;
             $return['statuscode'] = $e->getResponse()->getStatusCode();
-            $return['msg']        = $e->getResponse()->getError();
+            $return['msg']        = $e->getResponse()->getMessage();
             wp_send_json($return);
         } catch (CurlException $e) {
@@ -43 +43 @@
         } catch (\Exception $e) {
             $return['success'] = false;
-            $return['statuscode'] = $e->getResponse()->getStatusCode();
-            $return['msg']        = $e->getResponse()->getReasonPhrase();
+            $return['statuscode'] = $e->getCode();
+            $return['msg']        = $e->getMessage();
             wp_send_json($return);
         }

remote-medias-lite/trunk/src/RemoteMediaExt/Ajax/AjaxQueryValidation.php

@@ -2 +2 @@
 namespace WPRemoteMediaExt\RemoteMediaExt\Ajax;
 
-use WPRemoteMediaExt\Guzzle\Http\Exception\ClientErrorResponseException;
-use WPRemoteMediaExt\RemoteMediaExt\Accounts\Vimeo\VimeoClient;
 use WPRemoteMediaExt\RemoteMediaExt\Accounts\RemoteAccountFactory;
+
 use WPRemoteMediaExt\WPCore\WPajaxCall;
 
@@ -16 +15 @@
     }
 
+    public function getScriptParams()
+    {
+        $params = parent::getScriptParams();
+
+        $params['status'] = array();
+        $params['status']['unknown'] = __('Unknown', 'remote-medias-lite');
+        $params['status']['invalid'] = __('Invalid', 'remote-medias-lite');
+        $params['status']['authProcessing'] = __('Authenticating', 'remote-medias-lite');
+        $params['status']['enabled'] = __('Enabled', 'remote-medias-lite');
+        $params['status']['authNeeded'] = __('Authenticate Now', 'remote-medias-lite');
+        $params['status']['authfailed'] = __('Failed Auth', 'remote-medias-lite');
+        $params['button'] = array();
+        $params['button']['reauth'] = __('Re-authenticate', 'remote-medias-lite');
+
+        return $params;
+    }
+
+    public function end($data)
+    {
+        echo json_encode($data);
+        die();
+    }
+
     public function callback($data)
     {
-        $return = array('error' => false);
+        $return = array(
+            'error' => false,
+            'validate' => false,
+            'authneeded' => false,
+            'authurl' => ''
+        );
 
-        $return['validate'] = false;
+        $data    = $_POST['account'];
+        $account = RemoteAccountFactory::createFromService(stripslashes(esc_attr($data['service_class'])));
 
-        $account = RemoteAccountFactory::createFromService(stripslashes(esc_attr($_POST['service_class'])));
+        if (is_null($account)) {
+            $return['error'] = true;
+            $return['msg'] = 'Service type class '.stripslashes(esc_attr($data['service_class'])).' unknown';
+            $this->end($return);
+        }
 
-        if (!is_null($account)) {
-            $account->set('remote_user_id', esc_attr($_POST['user_id']));
+        unset($data['service_class']);
+
+        if (empty($_POST['post_id'])) {
+            $return['error'] = true;
+            $return['msg']   = 'post_id parameter missing';
+            $this->end($return);
+        }
+
+        $account->setId(absint($_POST['post_id']));
+
+        //Apply all attributes to account
+        foreach ($data as $name => $value) {
+            $account->set(esc_attr($name), esc_attr($value));
+        }
+
+        $return['authneeded'] = $account->isAuthNeeded();
+        //If no auth needed validate credentials
+        if ($return['authneeded'] === false) {
+
             $return['validate'] = $account->validate();
-            $return['last_valid_query'] = $account->get('last_valid_query');
-        } else {
+            $this->end($return);
+        }
+
+        try {
+            //If auth needed, get Auth URL
+            $return['authurl'] = $account->getAuthUrl();
+        } catch (ClientErrorResponseException $e) {
             $return['error'] = true;
-            $return['msg'] = 'Service type class '.stripslashes(esc_attr($_POST['service_class'])).' unknown';
+            $return['msg']   = 'invalid remote library parmeters';
+        } catch (InvalidAuthParamException $e) {
+            $return['error'] = true;
+            $return['msg']   = 'invalid remote library parmeters';
+        } catch (\Exception $e) {
+            error_log('RML could not get Auth Url:'.$e->getMessage());
+            $return['error'] = true;
+            $return['msg']   = 'post_id parameter missing';
         }
         
-
-        echo htmlspecialchars(json_encode($return), ENT_NOQUOTES);
-        die(); // this is required to return a proper result
+        $this->end($return);
     }
 }

remote-medias-lite/trunk/src/RemoteMediaExt/Ajax/AjaxSendRemoteToEditor.php

@@ -19 +19 @@
         $html = "";
 
-        if (empty($jsattachment['subtype']) ||
+        if (empty($jsattachment['accountId']) ||
             empty($jsattachment['remotedata'])
         ) {
@@ -25 +25 @@
         }
 
-        $media = RemoteMediaFactory::create($jsattachment['subtype'], $jsattachment['remotedata']);
+        $accountId = absint($jsattachment['accountId']);
+        
+        $media = RemoteMediaFactory::createFromAccountid($accountId, $jsattachment['remotedata']);
 
         if (is_null($media)) {

remote-medias-lite/trunk/src/RemoteMediaExt/FRemoteMediaExt.php

@@ -17 +17 @@
 use WPRemoteMediaExt\RemoteMediaExt\Library\MediaTemplate;
 use WPRemoteMediaExt\RemoteMediaExt\Library\MediaSettings;
-use WPRemoteMediaExt\RemoteMediaExt\Library\MediaLibrarySection;
 
 use WPRemoteMediaExt\WPCore\admin\WPfeaturePointer;
@@ -33 +32 @@
     public static $instance;
 
-    protected $version = '1.1.2';
+    protected $version = '1.2.0';
     protected $accountPostType;
     protected $remoteServices = array();
@@ -86 +85 @@
         //Hook Flickr Support
         $service = new RemoteService\Flickr\Service();
+        $service->setBasePath($this->getBasePath());
+        $service->setAccountPostType($this->accountPostType);
+        $this->hook($service);
+        $this->addRemoteService($service);
+
+        //Hook Instagram Support
+        $service = new RemoteService\Instagram\Service();
         $service->setBasePath($this->getBasePath());
         $service->setAccountPostType($this->accountPostType);
@@ -123 +129 @@
 
         $this->hook(new MediaTemplate(new View($this->getViewsPath().'admin/media-remote-attachment.php')));
+        $this->hook(new MediaTemplate(new View($this->getViewsPath().'admin/media-friendly-banner.php')));
+        $this->addScript(new WPscriptAdmin(array('post.php' => array(), 'post-new.php' => array()), 'jquery-cookie', $this->getJsUrl().'jquery-cookie.min.js', $this->getJsUrl().'jquery-cookie.js', array('jquery'), $this->version));
         $this->addScript(new WPscriptAdmin(array('post.php' => array(), 'post-new.php' => array()), 'media-remote-ext', $this->getJsUrl().'media-remote-ext.min.js', $this->getJsUrl().'media-remote-ext.js', array('media-editor','media-views'), $this->version));
         $this->addStyle(new WPstyleAdmin(array(), 'media-remote-admin-css', $this->getCssUrl().'media-remote-admin.min.css', $this->getCssUrl().'media-remote-admin.css', array(), $this->version));
@@ -185 +193 @@
         $metabox = new MetaBoxService(
             new View(
-                $this->getViewsPath().'admin/metaboxes/basic-settings.php',
-                array('services' => $this->getRemoteServices())
+                $this->getViewsPath().'admin/metaboxes/basic-settings.php'
             ),
             'rml_account_settings',

remote-medias-lite/trunk/src/RemoteMediaExt/Library/MediaSettings.php

@@ -51 +51 @@
                     'type' => $remoteAccount->get('type'),
                     'title' => 'Insert '.$account->post_title,
+                    'filterable' => $remoteAccount->get('library_filterable', ''),
+                    'filters' => $remoteAccount->get('library_filters', ''),
+                    'remoteuploadable' => $remoteAccount->get('remoteuploadable', false),
+                    'uioptions' => $remoteAccount->get('uioptions', array())
                 );
             }

remote-medias-lite/trunk/vendor/autoload.php

@@ -5 +5 @@
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit5d42ae4508dec87ab775d81cc28eb958::getLoader();
+return ComposerAutoloaderInit0750d3f245670d325db99442641da17f::getLoader();

remote-medias-lite/trunk/vendor/composer/ClassLoader.php

@@ -55 +55 @@
     private $classMap = array();
 
+    private $classMapAuthoritative = false;
+
     public function getPrefixes()
     {
-        return call_user_func_array('array_merge', $this->prefixesPsr0);
+        if (!empty($this->prefixesPsr0)) {
+            return call_user_func_array('array_merge', $this->prefixesPsr0);
+        }
+
+        return array();
     }
 
@@ -246 +252 @@
 
     /**
+     * Turns off searching the prefix and fallback directories for classes
+     * that have not been registered with the class map.
+     *
+     * @param bool $classMapAuthoritative
+     */
+    public function setClassMapAuthoritative($classMapAuthoritative)
+    {
+        $this->classMapAuthoritative = $classMapAuthoritative;
+    }
+
+    /**
+     * Should class lookup fail if not found in the current class map?
+     *
+     * @return bool
+     */
+    public function isClassMapAuthoritative()
+    {
+        return $this->classMapAuthoritative;
+    }
+
+    /**
      * Registers this instance as an autoloader.
      *
@@ -295 +322 @@
         if (isset($this->classMap[$class])) {
             return $this->classMap[$class];
+        }
+        if ($this->classMapAuthoritative) {
+            return false;
         }
 

remote-medias-lite/trunk/vendor/composer/autoload_classmap.php

@@ -8 +8 @@
 return array(
     'WPRemoteMediaExt\\RemoteMediaExt\\AccountPostType' => $baseDir . '/src/RemoteMediaExt/AccountPostType.php',
+    'WPRemoteMediaExt\\RemoteMediaExt\\Accounts\\AbstractAuthService' => $baseDir . '/src/RemoteMediaExt/Accounts/AbstractAuthService.php',
     'WPRemoteMediaExt\\RemoteMediaExt\\Accounts\\AbstractRemoteAccount' => $baseDir . '/src/RemoteMediaExt/Accounts/AbstractRemoteAccount.php',
     'WPRemoteMediaExt\\RemoteMediaExt\\Accounts\\AbstractRemoteClient' => $baseDir . '/src/RemoteMediaExt/Accounts/AbstractRemoteClient.php',
@@ -18 +19 @@
     'WPRemoteMediaExt\\RemoteMediaExt\\Accounts\\Flickr\\RemoteMedia' => $baseDir . '/src/RemoteMediaExt/Accounts/Flickr/RemoteMedia.php',
     'WPRemoteMediaExt\\RemoteMediaExt\\Accounts\\Flickr\\Service' => $baseDir . '/src/RemoteMediaExt/Accounts/Flickr/Service.php',
+    'WPRemoteMediaExt\\RemoteMediaExt\\Accounts\\Instagram\\Client' => $baseDir . '/src/RemoteMediaExt/Accounts/Instagram/Client.php',
+    'WPRemoteMediaExt\\RemoteMediaExt\\Accounts\\Instagram\\RemoteMedia' => $baseDir . '/src/RemoteMediaExt/Accounts/Instagram/RemoteMedia.php',
+    'WPRemoteMediaExt\\RemoteMediaExt\\Accounts\\Instagram\\Response' => $baseDir . '/src/RemoteMediaExt/Accounts/Instagram/Response.php',
+    'WPRemoteMediaExt\\RemoteMediaExt\\Accounts\\Instagram\\Service' => $baseDir . '/src/RemoteMediaExt/Accounts/Instagram/Service.php',
     'WPRemoteMediaExt\\RemoteMediaExt\\Accounts\\MetaBoxSaveAccount' => $baseDir . '/src/RemoteMediaExt/Accounts/MetaBoxSaveAccount.php',
     'WPRemoteMediaExt\\RemoteMediaExt\\Accounts\\MetaBoxService' => $baseDir . '/src/RemoteMediaExt/Accounts/MetaBoxService.php',
@@ -35 +40 @@
     'WPRemoteMediaExt\\RemoteMediaExt\\Ajax\\AjaxSendRemoteToEditor' => $baseDir . '/src/RemoteMediaExt/Ajax/AjaxSendRemoteToEditor.php',
     'WPRemoteMediaExt\\RemoteMediaExt\\Ajax\\AjaxUserInfo' => $baseDir . '/src/RemoteMediaExt/Ajax/AjaxUserInfo.php',
+    'WPRemoteMediaExt\\RemoteMediaExt\\Exception\\InvalidAuthParamException' => $baseDir . '/src/RemoteMediaExt/Exception/InvalidAuthParamException.php',
     'WPRemoteMediaExt\\RemoteMediaExt\\FRemoteMediaExt' => $baseDir . '/src/RemoteMediaExt/FRemoteMediaExt.php',
     'WPRemoteMediaExt\\RemoteMediaExt\\Library\\MediaArraySettings' => $baseDir . '/src/RemoteMediaExt/Library/MediaArraySettings.php',

remote-medias-lite/trunk/vendor/composer/autoload_real.php

@@ -3 +3 @@
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit5d42ae4508dec87ab775d81cc28eb958
+class ComposerAutoloaderInit0750d3f245670d325db99442641da17f
 {
     private static $loader;
@@ -20 +20 @@
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit5d42ae4508dec87ab775d81cc28eb958', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit0750d3f245670d325db99442641da17f', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit5d42ae4508dec87ab775d81cc28eb958', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit0750d3f245670d325db99442641da17f', 'loadClassLoader'));
 
         $map = require __DIR__ . '/autoload_namespaces.php';
@@ -45 +45 @@
 }
 
-function composerRequire5d42ae4508dec87ab775d81cc28eb958($file)
+function composerRequire0750d3f245670d325db99442641da17f($file)
 {
     require $file;

remote-medias-lite/trunk/vendor/guzzle/guzzle/src/Guzzle/Http/Curl/CurlMulti.php

@@ -226 +226 @@
             $this->checkCurlResult($mrc);
             $this->processMessages();
+
             if ($active && curl_multi_select($this->multiHandle, $selectTimeout) === -1) {
                 // Perform a usleep if a select returns -1: https://bugs.php.net/bug.php?id=61141

remote-medias-lite/trunk/views/admin/media-remote-attachment.php

@@ -2 +2 @@
 ?>
 <script type="text/html" id="tmpl-attachment-remote">
-  <div class="attachment-preview js--select-attachment type-{{ data.type }} subtype-{{ data.subtype }} {{ data.orientation }}">
-      <# if ( data.uploading ) { #>
-                <div class="media-progress-bar"><div></div></div>
-            <# } else if ( 'image' === data.type ) { #>
-                <div class="thumbnail">
-                    <div class="centered">
-                        <img src="{{ data.size.url }}" draggable="false" />
-                    </div>
-                </div>
-            <# } else if ('remote' === data.type) { #>
-                <div class="thumbnail">
-                    <div class="centered">
-                        <img src="{{ data.icon }}" draggable="false" />
-                    </div>
+    <div class="attachment-preview js--select-attachment type-{{ data.type }} subtype-{{ data.subtype }} {{ data.orientation }}">
+        <div class="thumbnail">
+            <# if ( data.uploading ) { #>
+                <div class="media-progress-bar"><div style="width: {{ data.percent }}%"></div></div>
+            <# } else if ( 'image' === data.type && data.sizes ) { #>
+                <div class="centered">
+                    <img src="{{ data.size.url }}" draggable="false" alt="" />
                 </div>
             <# } else { #>
-                <img src="{{ data.icon }}" class="icon" draggable="false" />
+                <div class="centered">
+                    <# if ( data.image && data.image.src && data.image.src !== data.icon ) { #>
+                        <img src="{{ data.image.src }}" class="thumbnail" draggable="false" />
+                    <# } else { #>
+                        <img src="{{ data.icon }}" class="icon" draggable="false" />
+                    <# } #>
+                </div>
                 <div class="filename">
                     <div>{{ data.filename }}</div>
                 </div>
             <# } #>
-
-            <# if ( data.buttons.close ) { #>
-                <a class="close media-modal-icon" href="#" title="<?php _e('Remove'); ?>"></a>
-            <# } #>
-
-            <# if ( data.buttons.check ) { #>
-                <a class="check" href="#" title="<?php _e('Deselect'); ?>"><div class="media-modal-icon"></div></a>
-            <# } #>
         </div>
-        <#
-        var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly';
-        if ( data.describe ) { #>
-            <# if ( 'image' === data.type ) { #>
-                <input type="text" value="{{ data.caption }}" class="describe" data-setting="caption"
-                    placeholder="<?php esc_attr_e('Caption this image&hellip;'); ?>" {{ maybeReadOnly }} />
-            <# } else { #>
-                <input type="text" value="{{ data.title }}" class="describe" data-setting="title"
-                    <# if ( 'video' === data.type ) { #>
-                        placeholder="<?php esc_attr_e('Describe this video&hellip;'); ?>"
-                    <# } else if ( 'audio' === data.type ) { #>
-                        placeholder="<?php esc_attr_e('Describe this audio file&hellip;'); ?>"
-                    <# } else { #>
-                        placeholder="<?php esc_attr_e('Describe this media file&hellip;'); ?>"
-                    <# } #> {{ maybeReadOnly }} />
-            <# } #>
+        <# if ( data.buttons.close ) { #>
+            <a class="close media-modal-icon" href="#" title="<?php esc_attr_e('Remove'); ?>"></a>
         <# } #>
+    </div>
+    <# if ( data.buttons.check ) { #>
+        <a class="check" href="#" title="<?php esc_attr_e('Deselect'); ?>" tabindex="-1"><div class="media-modal-icon"></div></a>
+    <# } #>
+    <#
+    var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly';
+    if ( data.describe ) {
+        if ( 'image' === data.type ) { #>
+            <input type="text" value="{{ data.caption }}" class="describe" data-setting="caption"
+                placeholder="<?php esc_attr_e('Caption this image&hellip;'); ?>" {{ maybeReadOnly }} />
+        <# } else { #>
+            <input type="text" value="{{ data.title }}" class="describe" data-setting="title"
+                <# if ( 'video' === data.type ) { #>
+                    placeholder="<?php esc_attr_e('Describe this video&hellip;'); ?>"
+                <# } else if ( 'audio' === data.type ) { #>
+                    placeholder="<?php esc_attr_e('Describe this audio file&hellip;'); ?>"
+                <# } else { #>
+                    placeholder="<?php esc_attr_e('Describe this media file&hellip;'); ?>"
+                <# } #> {{ maybeReadOnly }} />
+        <# }
+    } #>
 </script>

remote-medias-lite/trunk/views/admin/metaboxes/basic-settings.php

@@ -5 +5 @@
 //$metabox
 //$account
-//$services
 echo $hidden_nonce;
+
+$rml = \WPRemoteMediaExt\RemoteMediaExt\FRemoteMediaExt::getInstance();
+$services = $rml->getRemoteServices();
 
 foreach ($services as $service) {
@@ -22 +24 @@
     <?php
 }
-?>

remote-medias-lite/trunk/views/admin/metaboxes/status-actions.php

@@ -1 @@
-<div class="rml-status-box">
+<?php
+use \WPRemoteMediaExt\RemoteMediaExt\Accounts\AbstractRemoteAccount;
+
+?>
+<div id="rml-status-box" class="rml-status-box">
 <div class="rml-status-minor">
     <div class="rml-status-actions">
         <div class="misc-pub-section">
-            <label for="account_status"><?php _e('Account Status:','remote-medias-lite'); ?></label>
+            <label for="account_status"><?php _e('Account Status:', 'remote-medias-lite'); ?></label>
+            <?php
+            $status        = $account->getStatus();
+            $statusDisplay = $account->getStatusDisplay();
+            if ($status === AbstractRemoteAccount::STATUS_AUTHNEEDED) {
+                $statusDisplay = '<a class="action_query_test" href="#">'.$statusDisplay.'</a>';
+            }
             
-            <?php
-            $workingStyle = "";
-            $unknownStyle = "";
-            $invalidStyle = "";
-            $status = $account->get('isValid');
-            //working
-            if ($status === true) {
-                $workingStyle = '';
-                $unknownStyle = 'style="display: none"';
-                $invalidStyle = 'style="display: none"';
-            //unknown
-            } elseif (is_null($status)) {
-                $workingStyle = 'style="display: none"';
-                $unknownStyle = '';
-                $invalidStyle = 'style="display: none"';
-            //invalid
-            } else {
-                $workingStyle = 'style="display: none"';
-                $unknownStyle = 'style="display: none"';
-                $invalidStyle = '';
-            }
             ?>
-            <span class="rml-status-field working" <?php echo $workingStyle; ?>><?php _e('Working', 'remote-medias-lite'); ?></span>
-            <span class="rml-status-field unknown" <?php echo $unknownStyle; ?>><?php _e('Unknown', 'remote-medias-lite'); ?></span>
-            <span class="rml-status-field notvalid" <?php echo $invalidStyle; ?>><?php _e('Invalid', 'remote-medias-lite'); ?></span>
+            <span id="rmlaccountstatus" class="rml-status-field"><?php echo $statusDisplay; ?></span>
         </div>
     </div>
@@ -37 +24 @@
         <span id="query_msg"></span>
         <div id="rmlloading" class="spinner ocs-inline-loading"></div>
-        <a href="#" class="button button-large action_query_test"><?php _e('Validate', 'remote-medias-lite'); ?></a>
+        <?php
+        $buttonText = __('Validate', 'remote-medias-lite');
+        // if ($account->isAuthNeeded() && $account->isEnabled()) {
+        //     $buttonText = __('Re-authenticate', 'remote-medias-lite');
+        // }
+        ?>
+        <a id="rmlstatusbutton" href="#" class="button button-large action_query_test"><?php echo $buttonText; ?></a>
     </div>
     <div class="clear"></div>