Auto works

Author: mreishman

core/html/changelog.html

@@ -1,4 +1,20 @@
 <ul>
+	<li>
+		Version 4.1.2
+		<ul>
+			<li>
+				Features
+				<ul>
+					<li>
+						Added option for auto get repo name from poll requests (Only works with poll type 2)
+					</li>
+					<li>
+						Added option for auto get repo type from poll requests (Only works with poll type 2)
+					</li>
+				</ul>
+			</li>
+		</ul>
+	</li>
 	<li>
 		Version 4.1.1
 		<ul>

core/php/configStatic.php

@@ -2,7 +2,7 @@
 <?php
 
 $configStatic = array(
-  'version'   => '4.1.1',
+  'version'   => '4.1.2',
   'lastCheck'   => '12-14-2018',
   'newestVersion' => '3.3.4',
   'versionList' => array(

core/php/functions/gitBranchName.php

@@ -186,6 +186,31 @@ function getBranchStats($location)
 	return substr($branchStats, 0, strpos($branchStats, "}"));
 }
 
+function getRepo($location)
+{
+	$function = "git --git-dir=".escapeshellarg($location).".git config --get remote.origin.url";
+	$repoName = trim(shell_exec($function));
+	$secondHalf = basename($repoName, ".git");
+	$repoName = implode("", explode($secondHalf.".git", $repoName));
+	$firstHalf = basename($repoName);
+	return $firstHalf."/".$secondHalf;
+}
+
+function getGitType($location)
+{
+	$function = "git --git-dir=".escapeshellarg($location).".git config --get remote.origin.url";
+	$gitType = trim(shell_exec($function));
+	if(strpos($gitType, "github.com"))
+	{
+		return "github";
+	}
+	elseif(strpos($gitType, "gitlab"))
+	{
+		return "gitlab";
+	}
+	return false;
+}
+
 $pollType = null;
 if(isset($_POST['pollType']))
 {
@@ -280,6 +305,14 @@ function getBranchStats($location)
 				{
 					$websiteBase = str_replace("gitBranchName.php", "", $value["urlHit"]);
 				}
+				if($value["githubRepo"] === "auto")
+				{
+					$value["githubRepo"] = getRepo($value["Folder"]);
+				}
+				if($value["gitType"] === "auto")
+				{
+					$value["gitType"] = getGitType($value["Folder"]);
+				}
 				$response["info"][$key] = array(
 					'isHere' => true,
 					'branch' 	=> getBranchName($value['Folder']),

core/php/functions/watchlistFunctions.php

@@ -103,18 +103,24 @@ function generateWatchlistBlock($defaultArray, $arrayKeys, $key = "{{key}}", $it
 	 			if(!empty($item))
 	 			{
 					$stringToReturn .=	"
-						<option value=\"github\" ";
-						if($varValue === "github")
-						{
-							$stringToReturn .= " selected ";
-						}
-						$stringToReturn .= " >GitHub</option>
-						<option value=\"gitlab\" ";
-						if($varValue === "gitlab")
-						{
-							$stringToReturn .= "selected";
-						}
-						$stringToReturn .= ">GitLab</option>";
+					<option value=\"auto\" ";
+					if($varValue === "auto")
+					{
+						$stringToReturn .= " selected ";
+					}
+					$stringToReturn .= " >Auto (v2 Only)</option>
+					<option value=\"github\" ";
+					if($varValue === "github")
+					{
+						$stringToReturn .= " selected ";
+					}
+					$stringToReturn .= " >GitHub</option>
+					<option value=\"gitlab\" ";
+					if($varValue === "gitlab")
+					{
+						$stringToReturn .= "selected";
+					}
+					$stringToReturn .= ">GitLab</option>";
 				}
 		 		else
 		 		{

core/php/templateFiles/watchListServer.php

@@ -30,12 +30,14 @@
 				</div>
 				<span class="leftSpacingserverNames" > Git Repo:</span> <input disabled="true" class='inputWidth300' type='text' value='Name of your github repo: username/repo'>
 				<br>
+				<span>Put "auto" to automatically get the repo config on poll</span>
+				<br>
  				<span class="leftSpacingserverNames" > Branch List:</span> <input disabled="true" class='inputWidth300' type='text' value='Compare branches list example: master , develop'>
 				<br>
 				<span class="leftSpacingserverNames" > Git Type:</span>
 				<select disabled="true" class='inputWidth300' >
- 					<option value="local" >github</option>
- 					<option value="external" >gitlab</option>
+ 					<option value="github" >github</option>
+ 					<option value="gitlab" >gitlab</option>
  				</select>
  				<br>
  				<span class="leftSpacingserverNames" > Custom Git:</span> <input disabled="true" class='inputWidth300' type='text' value='Custom url for git. Empty = default'>