Merge pull request #1079 from causefx/v1-develop

V1 develop

.idea/php.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpIncludePathManager">
+    <include_path>
+      <path value="$PROJECT_DIR$/vendor/guzzlehttp/guzzle" />
+      <path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
+      <path value="$PROJECT_DIR$/vendor/kryptonit3/sonarr" />
+      <path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" />
+      <path value="$PROJECT_DIR$/vendor/kryptonit3/sickrage" />
+      <path value="$PROJECT_DIR$/vendor/composer" />
+      <path value="$PROJECT_DIR$/vendor/kryptonit3/couchpotato" />
+      <path value="$PROJECT_DIR$/vendor/psr/http-message" />
+      <path value="$PROJECT_DIR$/vendor/sparkpost/sparkpost" />
+      <path value="$PROJECT_DIR$/vendor/lcobucci/jwt" />
+      <path value="$PROJECT_DIR$/vendor/php-http/guzzle6-adapter" />
+      <path value="$PROJECT_DIR$/vendor/php-http/discovery" />
+      <path value="$PROJECT_DIR$/vendor/php-http/httplug" />
+      <path value="$PROJECT_DIR$/vendor/php-http/promise" />
+      <path value="$PROJECT_DIR$/vendor/php-http/message" />
+      <path value="$PROJECT_DIR$/vendor/clue/stream-filter" />
+      <path value="$PROJECT_DIR$/vendor/php-http/message-factory" />
+      <path value="$PROJECT_DIR$/vendor/phpmailer/phpmailer" />
+    </include_path>
+  </component>
+</project>

config/configDefaults.php

@@ -92,7 +92,7 @@ return array(
 	"homePageAuthNeeded" => false,
 	"homepageCustomHTML1" => "",
 	"homepageCustomHTML1Auth" => false,
-	"git_branch" => "master",
+	"git_branch" => "v1-master",
 	"git_check" => true,
 	"speedTest" => false,
 	"smtpHostType" => "tls",
@@ -146,7 +146,7 @@ return array(
 	"homepageOrdertransmisson" => '15',
 	'requestedUserOnly' => 'true',
 	'emailTemplateCSS' => '',
-	'emailTempateLogo' => 'https://raw.githubusercontent.com/causefx/Organizr/master/images/organizr-logo-h.png',
+	'emailTempateLogo' => 'https://raw.githubusercontent.com/causefx/Organizr/v1-master/images/organizr-logo-h.png',
 	'emailTemplateResetPassword' => '
 	<h2>Hey there {user}!</h2><br />
 	Looks like you forgot your password.  Well, I got you...  Here is your new password: {password}<br />

functions.php

@@ -2,7 +2,7 @@
 
 // ===================================
 // Define Version
- define('INSTALLEDVERSION', '1.80');
+ define('INSTALLEDVERSION', '1.90');
 // ===================================
 $debugOrganizr = true;
 if($debugOrganizr == true && file_exists('debug.php')){ require_once('debug.php'); }
@@ -124,7 +124,7 @@ if (function_exists('ldap_connect')) :
 				writeLog("success", "LDAP authentication success");
 				return true;
 			} else {
-				writeLog("error", "LDPA could not authenticate");
+				writeLog("error", "LDAP could not authenticate");
 				return false;
 			}
 		}
@@ -2549,7 +2549,16 @@ function deleteDatabase() {
 }
 
 // Upgrade the installation
-function upgradeInstall($branch = 'master') {
+function upgradeInstall($branch = 'v1-master') {
+	if ($branch == 'master'){
+		$branch = 'v1-master';
+	}
+	if ($branch == 'develop'){
+		$branch = 'v1-develop';
+	}
+	if ($branch == 'cero-dev'){
+		$branch = 'v1-develop';
+	}
     function downloadFile($url, $path){
         ini_set('max_execution_time',0);
         $folderPath = "upgrade/";

lang/en.ini

@@ -231,7 +231,7 @@ AUTHBACKEND = "Select backend to use"
 AUTHBACKENDCREATE = "Should accounts be created in Organizr if successfully authenticated against backend"
 AUTHBACKENDHOST = "http(s)://192.168.1.100"
 AUTHBACKENDPORT = "Backend Port (eg 21 for FTP, 389 for LDAP, 8096 for Emby)"
-AUTHBACKENDDOMAIN = "Basi Domain to use for LDAP"
+AUTHBACKENDDOMAIN = "Base Domain to use for LDAP"
 PLEX_USERNAME = "Plex Username"
 PLEX_PASSWORD = "Plex Password"
 BOTH = "Plus Other"

settings.php

@@ -819,9 +819,9 @@ $userTypes = array(
 	'Admin' => 'admin',
 );
 $branchTypes = array(
-	'Master' => 'master',
-	'Develop' => 'develop',
-	'Pre-Develop' => 'cero-dev',
+	'Master' => 'v1-master',
+	'Develop' => 'v1-develop',
+	'Pre-Develop' => 'v1-develop',
 );
 $refreshSeconds = array(
 	'1 sec' => '1000',
@@ -2733,7 +2733,7 @@ echo buildSettings(
 
                                                                 <div class="panel-body">
 
-                                                                    <p><?php echo $language->translate("TRANSLATIONS_ABOUT");?> <a href="https://github.com/causefx/Organizr/tree/develop/lang" target="_blank">Github Develop Branch</a></p>
+                                                                    <p><?php echo $language->translate("TRANSLATIONS_ABOUT");?> <a href="https://github.com/causefx/Organizr/tree/v1-develop/lang" target="_blank">Github Develop Branch</a></p>
 
                                                                 </div>
 
@@ -4115,10 +4115,10 @@ echo buildSettings(
 
                             $(infoTabNew).html("<br/><h4><strong><?php echo $language->translate("WHATS_NEW");?> " + githubVersion + "</strong></h4><strong><?php echo $language->translate("TITLE");?>: </strong>" + githubName + " <br/><strong><?php echo $language->translate("CHANGES");?>: </strong>" + githubDescription);
                             <?php if (extension_loaded("ZIP")){?>
-                            $(infoTabDownload).html("<br/><form style=\"display:initial;\" id=\"upgradeOrg\" method=\"post\" onsubmit=\"performUpdate(); ajax_request(\'POST\', \'upgradeInstall\'); return false;\"><input type=\"hidden\" name=\"action\" value=\"upgrade\" /><button class=\"btn waves btn-labeled btn-success text-uppercase waves-effect waves-float\" type=\"submit\"><span class=\"btn-label\"><i class=\"fa fa-refresh\"></i></span><?php echo $language->translate("AUTO_UPGRADE");?></button></form> <a href='https://github.com/causefx/Organizr/archive/master.zip' target='_blank' type='button' class='btn waves btn-labeled btn-success text-uppercase waves-effect waves-float'><span class='btn-label'><i class='fa fa-download'></i></span>Organizr v." + githubVersion + "</a>");
+                            $(infoTabDownload).html("<br/><form style=\"display:initial;\" id=\"upgradeOrg\" method=\"post\" onsubmit=\"performUpdate(); ajax_request(\'POST\', \'upgradeInstall\'); return false;\"><input type=\"hidden\" name=\"action\" value=\"upgrade\" /><button class=\"btn waves btn-labeled btn-success text-uppercase waves-effect waves-float\" type=\"submit\"><span class=\"btn-label\"><i class=\"fa fa-refresh\"></i></span><?php echo $language->translate("AUTO_UPGRADE");?></button></form> <a href='https://github.com/causefx/Organizr/archive/v1-master.zip' target='_blank' type='button' class='btn waves btn-labeled btn-success text-uppercase waves-effect waves-float'><span class='btn-label'><i class='fa fa-download'></i></span>Organizr v." + githubVersion + "</a>");
                             $( "p[id^='upgrade']" ).toggle();
                             <?php }else{ ?>
-                            $(infoTabDownload).html("<br/><a href='https://github.com/causefx/Organizr/archive/master.zip' target='_blank' type='button' class='btn waves btn-labeled btn-success text-uppercase waves-effect waves-float'><span class='btn-label'><i class='fa fa-download'></i></span>Organizr v." + githubVersion + "</a>");
+                            $(infoTabDownload).html("<br/><a href='https://github.com/causefx/Organizr/archive/v1-master.zip' target='_blank' type='button' class='btn waves btn-labeled btn-success text-uppercase waves-effect waves-float'><span class='btn-label'><i class='fa fa-download'></i></span>Organizr v." + githubVersion + "</a>");
                             $( "p[id^='upgrade']" ).toggle();
                             <?php } ?>
                         }else if(currentVersion === githubVersion){