Merge branch 'v2-develop' of https://github.com/causefx/Organizr into v2-develop

.gitignore

@@ -48,7 +48,8 @@ Temporary Items
 
 # Files from my local computer
 php_errors.log
-
+# Backup Files
+.pydio_id
 # =========================
 # Organizr files
 # =========================
@@ -95,3 +96,4 @@ css/themes/*.css
 !css/themes/Blue.css
 *sonflix*
 plugins/images/cache/*.jpg
+testdata*

api/functions/homepage-connect-functions.php

@@ -275,8 +275,8 @@ function resolvePlexItem($item) {
             $plexItem['ratingKey'] = (string)$item['parentRatingKey'];
             $plexItem['thumb'] = ($item['parentThumb'] ? (string)$item['parentThumb'] : (string)$item['grandparentThumb']);
             $plexItem['key'] = (string)$item['ratingKey'] . "-list";
-            $plexItem['nowPlayingThumb'] = (string)$item['art'];
-            $plexItem['nowPlayingKey'] = (string)$item['ratingKey'] . "-np";
+            $plexItem['nowPlayingThumb'] = (string)$item['grandparentArt'];
+            $plexItem['nowPlayingKey'] = (string)$item['grandparentRatingKey'] . "-np";
             $plexItem['nowPlayingTitle'] = (string)$item['grandparentTitle'].' - '.(string)$item['title'];
             $plexItem['nowPlayingBottom'] = 'S'.(string)$item['parentIndex'].' · E'.(string)$item['index'];
             $plexItem['metadataKey'] = (string)$item['grandparentRatingKey'];
@@ -303,7 +303,7 @@ function resolvePlexItem($item) {
             $plexItem['thumb'] = (string)$item['thumb'];
             $plexItem['key'] = (string)$item['ratingKey'] . "-list";
 			$plexItem['nowPlayingThumb'] = ($item['parentThumb']) ? (string)$item['parentThumb'] :  (string)$item['art'];
-            $plexItem['nowPlayingKey'] = (string)$item['ratingKey'] . "-np";
+            $plexItem['nowPlayingKey'] = (string)$item['parentRatingKey'] . "-np";
             $plexItem['nowPlayingTitle'] = (string)$item['grandparentTitle'].' - '.(string)$item['title'];
             $plexItem['nowPlayingBottom'] = (string)$item['parentTitle'];
             $plexItem['metadataKey'] = isset($item['grandparentRatingKey']) ? (string)$item['grandparentRatingKey'] : (string)$item['parentRatingKey'];
@@ -828,7 +828,7 @@ function getRadarrCalendar($array,$number){
 			array_push($gotCalendar, array(
 				"id" => "Radarr-".$number."-".$i,
 				"title" => $movieName,
-				"start" => $child['physicalRelease'],
+				"start" => $physicalRelease,
 				"className" => "bg-calendar movieID--".$movieID,
 				"imagetype" => "film ".$downloaded,
 			));

api/functions/organizr-functions.php

@@ -593,7 +593,7 @@ function getImages(){
     $dirname = dirname(__DIR__,2).DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR.'tabs'.DIRECTORY_SEPARATOR;
     $path = 'plugins/images/tabs/';
     $images = scandir($dirname);
-    $ignore = Array(".", "..", "._.DS_Store", ".DS_Store");
+    $ignore = Array(".", "..", "._.DS_Store", ".DS_Store", ".pydio_id");
     $allIcons = array();
     foreach($images as $image){
         if(!in_array($image, $ignore)) {

api/pages/login.php

@@ -4,7 +4,7 @@ $pageLogin = '
 <script>
 </script>
 <section id="wrapper" class="login-register">
-  <div class="login-box login-sidebar">
+  <div class="login-box login-sidebar animated slideInRight">
     <div class="white-box">
       <form class="form-horizontal form-material" id="loginform" onsubmit="return false;">
         <a href="javascript:void(0)" class="text-center db" id="login-logo">'.logoOrText().'</a>

api/pages/settings.php

@@ -126,7 +126,7 @@ $pageSettings = '
                             </li>
                             <li onclick="changeSettingsMenu(\'Settings::System Settings::Logs\');loadSettingsPage(\'api/?v1/settings/settings/logs\',\'#settings-settings-logs\',\'Log Viewer\');" role="presentation" class=""><a href="#settings-settings-logs" aria-controls="home" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-receipt"></i></span><span class="hidden-xs" lang="en"> Logs</span></a>
                             </li>
-                            <li onclick="changeSettingsMenu(\'Settings::System Settings::Updates\')" role="presentation" class=""><a href="#settings-settings-updates" aria-controls="profile" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-package"></i></span> <span class="hidden-xs" lang="en">Updates</span></a>
+                            <li onclick="changeSettingsMenu(\'Settings::System Settings::Updates\')" role="presentation" class=""><a id="update-button" href="#settings-settings-updates" aria-controls="profile" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-package"></i></span> <span class="hidden-xs" lang="en">Updates</span></a>
                             </li>
                             <li onclick="changeSettingsMenu(\'Settings::System Settings::Donate\')" role="presentation" class=""><a href="#settings-settings-donate" aria-controls="profile" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-money"></i></span> <span class="hidden-xs" lang="en">Donate</span></a>
                             </li>

index.php

@@ -120,7 +120,7 @@
 	<script src="js/jquery-lang.js"></script>
 	<script src="js/jquery-ui.min.js"></script>
 	<script src="js/jquery.serializeToJSON.js"></script>
-	<script src="js/lazyload.min.js"></script>
+	<script src="js/lazyload.min2.js"></script>
 	<script src="js/clipboard.js"></script>
 	<script src="js/emulatetab.joelpurra.js"></script>
 	<script src="plugins/bower_components/blockUI/jquery.blockUI.js"></script>

js/custom.js

@@ -65,135 +65,24 @@ $(document).ready(function () {
     $(this).keypress(function (e) {
         idleTime = 0;
     });
+    myLazyLoad = new LazyLoad({
+        elements_selector: ".lazyload"
+    });
 });
 function pageLoad(){
 	"use strict";
     //Start Organizr
     $(function () {
-        $('#side-menu').metisMenu();
         if($('#preloader:visible').length == 1){
             $("#preloader").fadeOut();
         }
-        lazyload();
-    });
-    $(".colorpicker").asColorPicker({
-        mode: 'complex',
-        color: {
-            format: false,
-            alphaConvert: false
-        }
+        //lazyload();
+        //let lazy = lazyload();
+        //lazy = '';
+        //$(".lazyload").lazyload();
+        myLazyLoad.update();
     });
-    $(function () {
-        $(".metadata-actors").owlCarousel({
-          autoplay: true,
-          slideSpeed : 300,
-          paginationSpeed : 400,
-          margin:40,
-          nav:false,
-          autoplay:true,
-          dots:false,
-          responsive:{
-              0:{
-                  items:2
-              },
-              500:{
-                  items:3
-              },
-              650:{
-                  items:4
-              },
-              800:{
-                  items:5
-              },
-              950:{
-                  items:6
-              },
-              992:{
-                  items:4
-              },
-              1250:{
-                  items:5
-              },
-              1400:{
-                  items:6
-              },
-              1550:{
-                  items:7
-              },
-              1700:{
-                  items:8
-              },
-              1850:{
-                  items:9
-              }
-          },
-          //singleItem:true
 
-          // "singleItem:true" is a shortcut for:
-           items : 1,
-          // itemsDesktop : false,
-          // itemsDesktopSmall : false,
-          // itemsTablet: false,
-          // itemsMobile : false
-
-      });
-        $('.recent-items').owlCarousel({
-    	    margin:40,
-    	    nav:false,
-    		autoplay:false,
-            dots:false,
-    	    responsive:{
-    	        0:{
-    	            items:2
-    	        },
-    	        500:{
-    	            items:3
-    	        },
-    	        650:{
-    	            items:4
-    	        },
-    	        800:{
-    	            items:5
-    	        },
-    	        950:{
-    	            items:6
-    	        },
-    	        1100:{
-    	            items:7
-    	        },
-    	        1250:{
-    	            items:8
-    	        },
-    	        1400:{
-    	            items:9
-    	        },
-    	        1550:{
-    	            items:10
-    	        },
-    	        1700:{
-    	            items:11
-    	        },
-    	        1850:{
-    	            items:12
-    	        },
-    	        2000:{
-    	            items:13
-    	        },
-    	        2150:{
-    	            items:14
-    	        },
-    	        2300:{
-    	            items:15
-    	        },
-    	        2450:{
-    	            items:16
-    	        }
-    	    }
-    	})
-    });
-
-
-    /* ===== Theme Settings ===== */
 
 
 
@@ -274,43 +163,13 @@ function pageLoad(){
         });
     });
 
-    /* ===== Task Initialization ===== */
-
-    $(".list-task li label").on("click", function () {
-        $(this).toggleClass("task-done");
-    });
-    $(".settings_box a").on("click", function () {
-        $("ul.theme_color").toggleClass("theme_block");
-    });
-
     /* ===== Collepsible Toggle ===== */
 
     $(".collapseble").on("click", function () {
         $(".collapseblebox").fadeToggle(350);
     });
 
-    /* ===== Sidebar ===== */
 
-    $('.slimscrollright').slimScroll({
-        height: '100%',
-        position: 'right',
-        size: "5px",
-        color: '#dcdcdc'
-    });
-    $('.slimscrollsidebar').slimScroll({
-        height: '100%',
-        position: 'left',
-        size: "6px",
-        color: 'rgba(0,0,0,0.5)'
-    });
-    if(bowser.mobile !== true){
-        $('.inbox-center').slimScroll({
-            height: '100%',
-            position: 'right',
-            size: "5px",
-            color: '#dcdcdc'
-        });
-    }
     /* ===== Resize all elements ===== */
 
 
@@ -331,9 +190,6 @@ function pageLoad(){
         this is for close icon when navigation open in mobile view
     ================================================================= */
 
-    $(".navbar-toggle").on("click", function () {
-        $(".navbar-toggle i").toggleClass("ti-menu").addClass("ti-close");
-    });
 
     /* magnific stuff */
     $('.image-popup-vertical-fit').magnificPopup({
@@ -476,7 +332,31 @@ function pageLoad(){
         type: 'ajax'
     });
 }
+/* ===== Sidebar ===== */
 
+$('.slimscrollright').slimScroll({
+    height: '100%',
+    position: 'right',
+    size: "5px",
+    color: '#dcdcdc'
+});
+$('.slimscrollsidebar').slimScroll({
+    height: '100%',
+    position: 'left',
+    size: "6px",
+    color: 'rgba(0,0,0,0.5)'
+});
+if(bowser.mobile !== true){
+    $('.inbox-center').slimScroll({
+        height: '100%',
+        position: 'right',
+        size: "5px",
+        color: '#dcdcdc'
+    });
+}
+$(".navbar-toggle").on("click", function () {
+    $(".navbar-toggle i").toggleClass("ti-menu").addClass("ti-close");
+});
 /* ===== Login and Recover Password ===== */
 $(document).on("click", "#to-recover", function(e) {
     $("#loginform").slideUp();
@@ -1619,7 +1499,51 @@ $(document).on("click", ".metadata-get", function(e) {
 		var response = JSON.parse(data);
         $('.'+uid+'-metadata-info').html('');
 		$('.'+uid+'-metadata-info').html(buildMetadata(response.data, source));
-        $('.'+uid).trigger('click')
+        $('.'+uid).trigger('click');
+        $(".metadata-actors").owlCarousel({
+            autoplay: true,
+            slideSpeed : 300,
+            paginationSpeed : 400,
+            margin:40,
+            nav:false,
+            autoplay:true,
+            dots:false,
+            responsive:{
+                0:{
+                    items:2
+                },
+                500:{
+                    items:3
+                },
+                650:{
+                    items:4
+                },
+                800:{
+                    items:5
+                },
+                950:{
+                    items:6
+                },
+                992:{
+                    items:4
+                },
+                1250:{
+                    items:5
+                },
+                1400:{
+                    items:6
+                },
+                1550:{
+                    items:7
+                },
+                1700:{
+                    items:8
+                },
+                1850:{
+                    items:9
+                }
+            }
+        });
 	}).fail(function(xhr) {
 		console.error("Organizr Function: API Connection Failed");
 	});

js/functions.js

@@ -784,7 +784,13 @@ function buildCustomizeAppearance(){
 	organizrAPI('GET','api/?v1/customize/appearance').success(function(data) {
 		var response = JSON.parse(data);
 		$('#customize-appearance-form').html(buildFormGroup(response.data));
-		;
+		$(".colorpicker").asColorPicker({
+	        mode: 'complex',
+	        color: {
+	            format: false,
+	            alphaConvert: false
+	        }
+	    });
 	}).fail(function(xhr) {
 		console.error("Organizr Function: API Connection Failed");
 	});
@@ -1030,6 +1036,7 @@ function tabProcess(arrayItems) {
 				}else{
 					$(menuList).prependTo($('.category-'+v.category_id));
 				}
+				$('#side-menu').metisMenu({ toggle: false });
 			}
 		});
 		getDefault(defaultTabName,defaultTabType);
@@ -1202,7 +1209,7 @@ function buildCategoryEditorItem(array){
 		var tabCount = array.tabs.reduce(function (n, category) {
 		    return n + (category.category_id == v.category_id);
 		}, 0);
-		var disabledDefault = (v.category_id == 0) ? 'disabled' : '';
+		var disabledDefault = (v.default == 1) ? 'disabled' : '';
 		var disabledDelete = (tabCount > 0 || v.default == 1 || v.category_id == 0) ? 'disabled' : '';
 		var defaultIcon = (v.default == 1) ? 'icon-user-following' : 'icon-user-follow';
 		var defaultColor = (v.default == 1) ? 'btn-info disabled' : 'btn-warning';
@@ -1385,7 +1392,7 @@ function updateCheck(){
 		}
 		if(latest !== currentVersion){
 			console.log('Update Function: Update to '+latest+' is available');
-			message(window.lang.translate('Update Available'),latest+' '+window.lang.translate('is available, goto')+' <a href="javascript:void(0)" onclick="tabActions(event,\'Settings\',0);$.toast().reset(\'all\');"><span lang="en">Update Tab</span></a>','bottom-right','#FFF','update','60000');
+			message(window.lang.translate('Update Available'),latest+' '+window.lang.translate('is available, goto')+' <a href="javascript:void(0)" onclick="tabActions(event,\'Settings\',0);$.toast().reset(\'all\');$(\'#update-button\').click()"><span lang="en">Update Tab</span></a>','bottom-right','#FFF','update','60000');
 		}
 		$('#githubVersions').html(buildVersion(reverseObject(json)));
 	}).fail(function(xhr) {
@@ -1790,6 +1797,14 @@ function errorPage(error=null){
 			local('set','error',urlParams.get('error'));
 		}
 	}
+	if ( window.location !== window.parent.location ) {
+		var iframeError = local('get', 'error');
+		parent.errorPage(iframeError);
+		console.log(iframeError);
+		console.log('iframe error page');
+		$('html').html('');
+	  	return false;
+	}
 	if(local('get', 'error')){
 		//show error page
 		$('.error-page').html(buildErrorPage(local('get', 'error')));
@@ -1974,7 +1989,7 @@ function buildStream(array, type){
 	<div id="`+type+`Streams">
 		<div class="el-element-overlay">
 		    <div class="col-md-12">
-		        <h4 class="pull-left" lang="en">Active `+toUpper(type)+` Stream(s): </h4><h4 class="pull-left">&nbsp;<span class="label label-info m-l-5">`+streams+`</span></h4>
+		        <h4 class="pull-left" lang="en">Active `+toUpper(type)+` Streams: </h4><h4 class="pull-left">&nbsp;<span class="label label-info m-l-5">`+streams+`</span></h4>
 		        <hr>
 		    </div>
 			<div class="clearfix"></div>
@@ -2365,7 +2380,7 @@ function buildMetadata(array, source){
 		var hasGenre = (typeof v.metadata.genres !== 'string') ? true : false;
 		if(hasActor){
 			$.each(v.metadata.actors, function(i,v) {
-				actors += '<div class="item lazyload recent-poster" data-src="'+v.thumb+'" alt="'+v.name+'" ><span class="elip recent-title p-5">'+v.name+'<br><small class="font-light">'+v.role+'</small></span></div>';
+				actors += '<div class="item lazyload recent-poster" data-src="'+(v.thumb.replace("http://", "https://"))+'" alt="'+v.name+'" ><span class="elip recent-title p-5">'+v.name+'<br><small class="font-light">'+v.role+'</small></span></div>';
 			});
 		}
 		if(hasGenre){
@@ -2485,6 +2500,59 @@ function homepageRecent(type, timeout=30000){
 		var response = JSON.parse(data);
 		document.getElementById('homepageOrder'+type+'recent').innerHTML = '';
 		$('#homepageOrder'+type+'recent').html(buildRecent(response.data, type));
+		$('.recent-items').owlCarousel({
+    	    margin:40,
+    	    nav:false,
+    		autoplay:false,
+            dots:false,
+    	    responsive:{
+    	        0:{
+    	            items:2
+    	        },
+    	        500:{
+    	            items:3
+    	        },
+    	        650:{
+    	            items:4
+    	        },
+    	        800:{
+    	            items:5
+    	        },
+    	        950:{
+    	            items:6
+    	        },
+    	        1100:{
+    	            items:7
+    	        },
+    	        1250:{
+    	            items:8
+    	        },
+    	        1400:{
+    	            items:9
+    	        },
+    	        1550:{
+    	            items:10
+    	        },
+    	        1700:{
+    	            items:11
+    	        },
+    	        1850:{
+    	            items:12
+    	        },
+    	        2000:{
+    	            items:13
+    	        },
+    	        2150:{
+    	            items:14
+    	        },
+    	        2300:{
+    	            items:15
+    	        },
+    	        2450:{
+    	            items:16
+    	        }
+    	    }
+    	})
 	}).fail(function(xhr) {
 		console.error("Organizr Function: API Connection Failed");
 	});

plugins/bower_components/sidebar-nav/dist/sidebar-nav.js

@@ -58,9 +58,9 @@
 
                 //$(this).parent("li").toggleClass("active").children("ul").collapse("toggle");
                 $(this).parent("li").toggleClass("active").children("ul").collapse("toggle");
-                //if ($toggle) {
-                //    $(this).parent("li").siblings().removeClass("active").children("ul.in").collapse("hide");
-                //}
+                if ($toggle) {
+                    $(this).parent("li").siblings().removeClass("active").children("ul.in").collapse("hide");
+                }
 
             });
         },