Added Chat system #927

new message sound
version change to beta 500
DB change for version 500
Lots of other things

api/functions/api-functions.php

@@ -120,6 +120,15 @@ function createDB($path, $filename)
     		`auth_service`	TEXT DEFAULT \'internal\'
     	);');
 		// Create Tokens
+		$createDB->query('CREATE TABLE `chatroom` (
+    		`id`	INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE,
+    		`username`	TEXT,
+    		`gravatar`	TEXT,
+    		`uid`	TEXT,
+            `date` DATE,
+            `ip` TEXT,
+            `message` TEXT
+    	);');
 		$createDB->query('CREATE TABLE `tokens` (
     		`id`	INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE,
     		`token`	TEXT UNIQUE,

api/functions/organizr-functions.php

@@ -70,7 +70,8 @@ function organizrSpecialSettings()
 			'authDebug' => $GLOBALS['authDebug'],
 			'minimalLoginScreen' => $GLOBALS['minimalLoginScreen'],
 			'unsortedTabs' => $GLOBALS['unsortedTabs'],
-			'authBackend' => $GLOBALS['authBackend']
+			'authBackend' => $GLOBALS['authBackend'],
+			'newMessageSound' => $GLOBALS['newMessageSound'],
 		)
 	);
 }

api/functions/static-globals.php

@@ -1,7 +1,7 @@
 <?php
 // ===================================
 // Organizr Version
-$GLOBALS['installedVersion'] = '2.0.0-beta.200';
+$GLOBALS['installedVersion'] = '2.0.0-beta.500';
 // ===================================
 // Quick php Version check
 $GLOBALS['minimumPHP'] = '7.0.0';

api/functions/upgrade-functions.php

@@ -12,6 +12,13 @@ function upgradeCheck()
 		$oldVer = $versionCheck;
 	}
 	// End Upgrade check start for version above
+	// Upgrade check start for version below
+	$versionCheck = '2.0.0-beta-500';
+	if ($compare->lessThan($oldVer, $versionCheck)) {
+		$updateDB = true;
+		$oldVer = $versionCheck;
+	}
+	// End Upgrade check start for version above
 	if ($updateDB == true) {
 		//return 'Upgraded Needed - Current Version '.$oldVer.' - New Version: '.$versionCheck;
 		// Upgrade database to latest version

css/organizr.css

@@ -1140,4 +1140,11 @@ img.img-chooser {
 }
 .fc-scroller .simplebar-track.horizontal {
     display: none;
+}
+.chat-main-box {
+    height: calc(100vh - 40px);
+}
+.chat-list,
+.chatonline {
+    height: calc(100vh - 130px) !important;
 }

index.php

@@ -114,6 +114,7 @@
     <div class="login-area hidden"></div>
     <div class="p-0" id="page-wrapper">
         <div class="organizr-area"></div>
+        <div class="plugin-listing p-0 hidden"></div>
         <div class="internal-listing p-0 hidden"></div>
         <div class="iFrame-listing p-0 hidden"></div>
     </div>
@@ -176,6 +177,7 @@
 <script src="js/custom.min.js?v=<?php echo $GLOBALS['installedVersion']; ?>"></script>
 <script id="custom-theme-javascript"></script>
 <script id="custom-javascript"></script>
+<script src="https://js.pusher.com/4.1/pusher.min.js"></script>
 <?php echo pluginFiles('js'); ?>
 </body>
 

js/functions.js

@@ -246,7 +246,8 @@ function reloadOrganizr(){
 }
 function hideFrames(){
 	$(".iFrame-listing div[class^='frame-container']").addClass("hidden").removeClass('show');
-	$(".internal-listing div[class^='internal-container']").addClass("hidden").removeClass('show');
+    $(".internal-listing div[class^='internal-container']").addClass("hidden").removeClass('show');
+    $(".plugin-listing div[class^='plugin-container']").addClass("hidden").removeClass('show');
 }
 function closeSideMenu(){
 	$('.fix-header').removeClass('show-sidebar');
@@ -261,6 +262,7 @@ function swapDisplay(type){
 			$('.iFrame-listing').addClass('hidden').removeClass('show');
 			$('.internal-listing').addClass('show').removeClass('hidden');
 			$('.login-area').addClass('hidden').removeClass('show');
+            $('.plugin-listing').addClass('hidden').removeClass('show');
 			//$('body').removeClass('fix-header');
 			break;
 		case 'iframe':
@@ -268,6 +270,7 @@ function swapDisplay(type){
 			$('.iFrame-listing').addClass('show').removeClass('hidden');
 			$('.internal-listing').addClass('hidden').removeClass('show');
 			$('.login-area').addClass('hidden').removeClass('show');
+            $('.plugin-listing').addClass('hidden').removeClass('show');
 			//$('body').addClass('fix-header');
 			break;
 		case 'login':
@@ -275,12 +278,19 @@ function swapDisplay(type){
 			$('.iFrame-listing').addClass('hidden').removeClass('show');
 			$('.internal-listing').addClass('hidden').removeClass('show');
 			$('.login-area').addClass('show').removeClass('hidden');
+            $('.plugin-listing').addClass('hidden').removeClass('show');
 			if(activeInfo.settings.misc.minimalLoginScreen == true){
                 $('.sidebar').addClass('hidden');
                 $('.navbar').addClass('hidden');
                 $('#pagewrapper').addClass('hidden');
             }
 			break;
+        case 'plugin':
+            $('.iFrame-listing').addClass('hidden').removeClass('show');
+            $('.internal-listing').addClass('hidden').removeClass('show');
+            $('.login-area').addClass('hidden').removeClass('show');
+            $('.plugin-listing').addClass('show').removeClass('hidden');
+            break;
 		default:
 	}
 }
@@ -307,8 +317,10 @@ function switchTab(tab, type){
         closeSideMenu();
         removeMenuActive();
         toggleParentActive(tab);
-        setHash(tab);
         swapBodyClass(tab);
+    }
+    if(type !== 2 && type !== 'plugin'){
+        setHash(tab);
     }
 	switch (type) {
 		case 0:
@@ -357,6 +369,10 @@ function switchTab(tab, type){
 		case 'popout':
 			popTab(cleanClass(tab), type);
 			break;
+        case 'plugin':
+            swapDisplay('plugin');
+            $('#container-plugin-'+tab).addClass("show").removeClass('hidden');
+            break;
 		default:
 			console.error('Tab Function: Action not set');
 	}
@@ -1656,7 +1672,7 @@ function userMenu(user){
 	if (user.data.user.loggedin === true) {
 		menuList += `
 			<li class="dropdown">
-				<a class="dropdown-toggle profile-pic" data-toggle="dropdown" href="javascript:void(0)"><img alt="" class="img-circle" src="`+user.data.user.image+`" width="36"><b class="hidden-xs">`+user.data.user.username+`</b><span class="caret"></span></a>
+				<a class="dropdown-toggle profile-pic" data-toggle="dropdown" href="javascript:void(0)"><img alt="" class="img-circle profile-image" src="`+user.data.user.image+`" width="36"><b class="hidden-xs">`+user.data.user.username+`</b><span class="caret"></span></a>
 				<ul class="dropdown-menu dropdown-user animated flipInY">
 					<li>
 						<div class="dw-user-box">
@@ -1678,7 +1694,7 @@ function userMenu(user){
 	}else{
 		menuList += `
 			<li class="dropdown">
-					<a class="dropdown-toggle profile-pic" data-toggle="dropdown" href="javascript:void(0)"><img alt="" class="img-circle" src="`+user.data.user.image+`" width="36"><b class="hidden-xs">`+user.data.user.username+`</b><span class="caret"></span></a>
+					<a class="dropdown-toggle profile-pic" data-toggle="dropdown" href="javascript:void(0)"><img alt="" class="img-circle profile-image" src="`+user.data.user.image+`" width="36"><b class="hidden-xs">`+user.data.user.username+`</b><span class="caret"></span></a>
 					<ul class="dropdown-menu dropdown-user animated flipInY">
 						<li>
 							<div class="dw-user-box">

js/version.json

@@ -82,5 +82,12 @@
     "new": "Homepage Test Button on some modules|Smaller Nav bar|Recent Item Limits|Nav buttons on sliders|Settings save revamped|Ombi user import on register|Test iFrame buttons|Ombi auth for requesting|Favicon support|Ping Support|New Alert Styles|New Lockout Timeout system",
     "fixed": "Calendar Alt Title|Deluge Hide/Seed|More DDNS workarounds|Homepage auth issues|Deluge no results|PHPMailer plugin fixes|Wizard auto login",
     "notes": "Calendar has Today Button now"
+  },
+  "2.0.0-beta.500": {
+    "date": "2018-08-31 23:59",
+    "title": "A Bunch of things since last real release",
+    "new": "Chat System - Powered by Pusher|Keyboard Shortcuts|Fullscreen button|Icon and Image selector for tabs|Multiple Tautulli SSO|Pagination to search|Redirect added to error page|Auth Debug toggle|Custom CSS and JS for themes|Theme Marketplace|Plugin Marketplace|Calendar Sorting|Email user from user mgmt|Tab sort for unsorted|Cache image size option",
+    "fixed": "Deluge Test Button|PHP5.6 Error|Sonarr local cert|Plex Invite error codes|Email center fixes #891|Fixed log out issues|Fixed Cookie issues - Use any domain you want now",
+    "notes": "Lots of small fixes"
   }
 }