Upgrade - Source Code: Offer optional apps source update.

core/upgrade/app_languages.php

@@ -200,6 +200,56 @@ $text['message-upgrade_source']['zh-cn'] = "源文件更新";
 $text['message-upgrade_source']['ja-jp'] = "ソースファイルが更新されました";
 $text['message-upgrade_source']['ko-kr'] = "소스 파일이 업데이트되었습니다";
 
+$text['message-optional_apps_upgrade_source']['en-us'] = "Optional Apps Source Files Updated";
+$text['message-optional_apps_upgrade_source']['en-gb'] = "Optional Apps Source Files Updated";
+$text['message-optional_apps_upgrade_source']['ar-eg'] = "تم تحديث ملفات مصدر التطبيق الاختيارية";
+$text['message-optional_apps_upgrade_source']['de-at'] = "Optionale Anwendungsquelldateien aktualisiert";
+$text['message-optional_apps_upgrade_source']['de-ch'] = "Optionale Anwendungsquelldateien aktualisiert";
+$text['message-optional_apps_upgrade_source']['de-de'] = "Optionale Anwendungsquelldateien aktualisiert";
+$text['message-optional_apps_upgrade_source']['el-gr'] = "Τα προαιρετικά αρχεία προέλευσης εφαρμογής ενημερώθηκαν";
+$text['message-optional_apps_upgrade_source']['es-cl'] = "Archivos fuente de aplicaciones opcionales actualizados";
+$text['message-optional_apps_upgrade_source']['es-mx'] = "Archivos fuente de aplicaciones opcionales actualizados";
+$text['message-optional_apps_upgrade_source']['fr-ca'] = "Fichiers sources d'application facultatifs mis à jour";
+$text['message-optional_apps_upgrade_source']['fr-fr'] = "Fichiers sources d'application facultatifs mis à jour";
+$text['message-optional_apps_upgrade_source']['he-il'] = "קבצי מקור יישומים אופציונליים עודכנו";
+$text['message-optional_apps_upgrade_source']['it-it'] = "File di origine dell'applicazione facoltativi aggiornati";
+$text['message-optional_apps_upgrade_source']['nl-nl'] = "Optionele applicatiebronbestanden bijgewerkt";
+$text['message-optional_apps_upgrade_source']['pl-pl'] = "Zaktualizowano opcjonalne pliki źródłowe aplikacji";
+$text['message-optional_apps_upgrade_source']['pt-br'] = "Arquivos opcionais de origem do aplicativo atualizados";
+$text['message-optional_apps_upgrade_source']['pt-pt'] = "Arquivos opcionais de origem do aplicativo atualizados";
+$text['message-optional_apps_upgrade_source']['ro-ro'] = "Fișierele sursă opționale ale aplicației au fost actualizate";
+$text['message-optional_apps_upgrade_source']['ru-ru'] = "Обновлены дополнительные исходные файлы приложения.";
+$text['message-optional_apps_upgrade_source']['sv-se'] = "Valfria programkällfiler uppdaterade";
+$text['message-optional_apps_upgrade_source']['uk-ua'] = "Оновлено додаткові вихідні файли програми";
+$text['message-optional_apps_upgrade_source']['zh-cn'] = "更新了可选的应用程序源文件";
+$text['message-optional_apps_upgrade_source']['ja-jp'] = "オプションのアプリケーション ソース ファイルが更新されました";
+$text['message-optional_apps_upgrade_source']['ko-kr'] = "선택적 애플리케이션 소스 파일이 업데이트되었습니다.";
+
+$text['message-upgrade_manually']['en-us'] = "Upgrade Manually";
+$text['message-upgrade_manually']['en-gb'] = "Upgrade Manually";
+$text['message-upgrade_manually']['ar-eg'] = "الترقية يدويًا";
+$text['message-upgrade_manually']['de-at'] = "Manuell aktualisieren";
+$text['message-upgrade_manually']['de-ch'] = "Manuell aktualisieren";
+$text['message-upgrade_manually']['de-de'] = "Manuell aktualisieren";
+$text['message-upgrade_manually']['el-gr'] = "Αναβάθμιση χειροκίνητα";
+$text['message-upgrade_manually']['es-cl'] = "Actualizar manualmente";
+$text['message-upgrade_manually']['es-mx'] = "Actualizar manualmente";
+$text['message-upgrade_manually']['fr-ca'] = "Mettre à niveau manuellement";
+$text['message-upgrade_manually']['fr-fr'] = "Mettre à niveau manuellement";
+$text['message-upgrade_manually']['he-il'] = "שדרג באופן ידני";
+$text['message-upgrade_manually']['it-it'] = "Aggiorna manualmente";
+$text['message-upgrade_manually']['nl-nl'] = "Handmatig upgraden";
+$text['message-upgrade_manually']['pl-pl'] = "Uaktualnij ręcznie";
+$text['message-upgrade_manually']['pt-br'] = "Atualizar manualmente";
+$text['message-upgrade_manually']['pt-pt'] = "Atualizar manualmente";
+$text['message-upgrade_manually']['ro-ro'] = "Actualizați manual";
+$text['message-upgrade_manually']['ru-ru'] = "Обновить вручную";
+$text['message-upgrade_manually']['sv-se'] = "Uppgradera manuellt";
+$text['message-upgrade_manually']['uk-ua'] = "Оновити вручну";
+$text['message-upgrade_manually']['zh-cn'] = "手动升级";
+$text['message-upgrade_manually']['ja-jp'] = "手動でアップグレードする";
+$text['message-upgrade_manually']['ko-kr'] = "수동으로 업그레이드";
+
 $text['message-upgrade_schema']['en-us'] = "Schema Verified";
 $text['message-upgrade_schema']['en-gb'] = "Schema Verified";
 $text['message-upgrade_schema']['ar-eg'] = "تم التحقق من المخطط";
@@ -350,26 +400,30 @@ $text['label-upgrade_source']['zh-cn'] = "源代码";
 $text['label-upgrade_source']['ja-jp'] = "ソースコード";
 $text['label-upgrade_source']['ko-kr'] = "소스 코드";
 
-$text['label-update_apps']['en-us'] = "App Source Code";
-$text['label-update_apps']['en-gb'] = "App Source Code";
-$text['label-update_apps']['ar-eg'] = "";
-$text['label-update_apps']['de-at'] = "Quellcode"; //copied from de-de
-$text['label-update_apps']['de-ch'] = "Quellcode"; //copied from de-de
-$text['label-update_apps']['de-de'] = "Quellcode";
-$text['label-update_apps']['es-cl'] = "Código Fuente";
-$text['label-update_apps']['es-mx'] = "Código Fuente"; //copied from es-cl
-$text['label-update_apps']['fr-ca'] = "Code Source"; //copied from fr-fr
-$text['label-update_apps']['fr-fr'] = "Code Source";
-$text['label-update_apps']['he-il'] = "";
-$text['label-update_apps']['it-it'] = "Codice Sorgente";
-$text['label-update_apps']['nl-nl'] = "";
-$text['label-update_apps']['pl-pl'] = "Kod źródłowy";
-$text['label-update_apps']['pt-br'] = "Código Fonte"; //copied from pt-pt
-$text['label-update_apps']['pt-pt'] = "Source Code";
-$text['label-update_apps']['ro-ro'] = "";
-$text['label-update_apps']['ru-ru'] = "Исходный код";
-$text['label-update_apps']['sv-se'] = "Källkod";
-$text['label-update_apps']['uk-ua'] = "Вихідний код";
+$text['label-optional_apps']['en-us'] = "Optional Apps";
+$text['label-optional_apps']['en-gb'] = "Optional Apps";
+$text['label-optional_apps']['ar-eg'] = "التطبيقات الاختيارية";
+$text['label-optional_apps']['de-at'] = "Optionale Apps";
+$text['label-optional_apps']['de-ch'] = "Optionale Apps";
+$text['label-optional_apps']['de-de'] = "Optionale Apps";
+$text['label-optional_apps']['el-gr'] = "Προαιρετικές εφαρμογές";
+$text['label-optional_apps']['es-cl'] = "Aplicaciones opcionales";
+$text['label-optional_apps']['es-mx'] = "Aplicaciones opcionales";
+$text['label-optional_apps']['fr-ca'] = "Applications facultatives";
+$text['label-optional_apps']['fr-fr'] = "Applications facultatives";
+$text['label-optional_apps']['he-il'] = "אפליקציות אופציונליות";
+$text['label-optional_apps']['it-it'] = "App opzionali";
+$text['label-optional_apps']['nl-nl'] = "Optionele apps";
+$text['label-optional_apps']['pl-pl'] = "Opcjonalne aplikacje";
+$text['label-optional_apps']['pt-br'] = "Aplicativos opcionais";
+$text['label-optional_apps']['pt-pt'] = "Aplicativos opcionais";
+$text['label-optional_apps']['ro-ro'] = "Aplicații opționale";
+$text['label-optional_apps']['ru-ru'] = "Дополнительные приложения";
+$text['label-optional_apps']['sv-se'] = "Valfria appar";
+$text['label-optional_apps']['uk-ua'] = "Додаткові програми";
+$text['label-optional_apps']['zh-cn'] = "可选应用程序";
+$text['label-optional_apps']['ja-jp'] = "オプションのアプリ";
+$text['label-optional_apps']['ko-kr'] = "선택적 앱";
 
 $text['label-upgrade_schema']['en-us'] = "Schema";
 $text['label-upgrade_schema']['en-gb'] = "Schema";

core/upgrade/index.php

@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <[email protected]>
-	Portions created by the Initial Developer are Copyright (C) 2008-2022
+	Portions created by the Initial Developer are Copyright (C) 2008-2023
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -51,7 +51,7 @@
 	$message_timeout = 4*1000;
 
 //process the http post
-	if (sizeof($_POST) > 0) {
+	if (!empty($_POST) && @sizeof($_POST) > 0) {
 
 		//get the action options: source, schema, app_defaults, menu_defaults, permisisons
 		$action = $_POST['action'];
@@ -71,33 +71,30 @@
 			}
 		}
 
-		//run app source updates
-		if (!empty($action["update_apps"]) && permission_exists("upgrade_source")) {
-			$app_updates = $_POST['app_list'];
+		//run optional app source updates
+		if (!empty($action["optional_apps"]) && permission_exists("upgrade_source")) {
 
 			$updateable_repos = git_find_repos($_SERVER["PROJECT_ROOT"]."/app");
 
-			if (is_array($app_updates)) {
-				$apps_updated = true;
+			$apps_updated = $apps_failed = 0;
+			if (is_array($action["optional_apps"])) {
 				foreach ($updateable_repos as $repo => $apps) {
-					if (array_search(basename($repo), $app_updates) !== false) {
+					if (array_search(basename($repo), $action["optional_apps"]) !== false) {
 						$git_result = git_pull($repo);
-						$_SESSION["response"]["update_apps"][basename($repo)] = $git_result['message'];
+						if ($git_result['result']) {
+							$_SESSION["response"]["optional_apps"][basename($repo)] = $git_result['message'];
+							$apps_updated++;
+						}
+						else {
+							$apps_failed++;
+						}
 					}
-
-					if (!$git_result['result']) {
-						$apps_updated = false;
-					}
-
 				}
 			}
 
-			if ($apps_updated) {
-				message::add($text['message-upgrade_source'], null, $message_timeout);
-			}
-			else {
-				message::add($text['message-upgrade_source_failed'], 'negative', $message_timeout);
-			}
+			if ($apps_updated != 0) { message::add($text['message-optional_apps_upgrade_source'], null, $message_timeout); }
+			if ($apps_failed != 0) { message::add($text['message-optional_apps_upgrade_source_failed'], 'negative', $message_timeout); }
+
 		}
 
 		//load an array of the database schema and compare it with the active database
@@ -169,100 +166,73 @@
 
 	if (permission_exists("upgrade_source") && !is_dir("/usr/share/examples/fusionpbx") && is_writeable($_SERVER["PROJECT_ROOT"]."/.git")) {
 		echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-		echo "<tr onclick=\"document.getElementById('do_source').checked = !document.getElementById('do_source').checked;\">\n";
-		echo "	<td width='30%' class='vncell' style='vertical-align:middle;'>\n";
+		echo "<tr onclick=\"document.getElementById('do_source').checked = !document.getElementById('do_source').checked; (!document.getElementById('do_source').checked ? $('.do_optional_app').prop('checked', false) : null); $('#tr_optional_apps').slideToggle('fast');\">\n";
+		echo "	<td width='30%' class='vncellreq' style='vertical-align:middle;'>\n";
 		echo "		<div style='".$step_container_style."'><span style='".$step_number_style."'>".$step."</span></div>";
-		echo "		".$text['label-upgrade_source'];
+		echo "		".$text['label-upgrade_source']."\n";
 		echo "	</td>\n";
 		echo "	<td width='70%' class='vtable' style='height: 50px; cursor: pointer;'>\n";
-		echo "		<input type='checkbox' name='action[upgrade_source]' id='do_source' value='1' onclick=\"event.stopPropagation();\"> &nbsp;".$text['description-upgrade_source']."<br />\n";
-
-		// show current git version info
+		echo "		<input type='checkbox' name='action[upgrade_source]' id='do_source' value='1' onclick=\"event.stopPropagation(); $('#tr_optional_apps').slideToggle('fast'); (!document.getElementById('do_source').checked ? $('.do_optional_app').prop('checked', false) : null);\"> &nbsp;".$text['description-upgrade_source']."<br />\n";
+		//show current git version info
 		chdir($_SERVER["PROJECT_ROOT"]);
 		exec("git rev-parse --abbrev-ref HEAD 2>&1", $git_current_branch, $branch_return_value);
 		$git_current_branch = $git_current_branch[0];
 		exec("git log --pretty=format:'%H' -n 1 2>&1", $git_current_commit, $commit_return_value);
 		$git_current_commit = $git_current_commit[0];
-		if (($branch_return_value == 0) && ($commit_return_value == 0)) {
-			echo $text['label-git_branch'].' '.$git_current_branch." \n";
-			//echo $text['label-git_commit'].' '." ";
-			echo "<a href='https://github.com/fusionpbx/fusionpbx/compare/";
-			echo $git_current_commit . "..." . "$git_current_branch' target='_blank' onclick=\"event.stopPropagation();\"> \n";
-			echo $git_current_commit . "</a><br />\n";
-			echo "</a>";
+		if (!is_numeric($git_current_branch)) {
+			echo "	<span style='font-weight: 600;'>".software::version()."</span>&nbsp;\n";
+		}
+		if ($branch_return_value == 0 && $commit_return_value == 0) {
+			echo "	<a href='https://github.com/fusionpbx/fusionpbx/compare/".$git_current_commit."...".$git_current_branch."' target='_blank' title='".$git_current_commit."' onclick=\"event.stopPropagation();\"><i>".$git_current_branch."</i></a>";
 		}
-
 		echo "	</td>\n";
 		echo "</tr>\n";
 		echo "</table>\n";
 
-		$step++;
-
-		// find and show apps
-
+		//find and show optional apps with repos
 		$updateable_repos = git_find_repos($_SERVER["PROJECT_ROOT"]."/app");
-
-		echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-		echo "<tr onclick=\"document.getElementById('do_apps').checked = !document.getElementById('do_apps').checked; $('#tr_app_updates').slideToggle('fast');\">\n";
-		echo "	<td width='30%' class='vncell' style='vertical-align:middle;'>\n";
-		echo "		<div style='".$step_container_style."'><span style='".$step_number_style."'>".$step."</span></div>";
-		echo "		".$text['label-update_apps'];
-		echo "	</td>\n";
-		echo "	<td width='70%' class='vtable' style='height: 50px; cursor: pointer;'>\n";
-		echo "		<input type='checkbox' name='action[update_apps]' id='do_apps' value='1' onclick=\"event.stopPropagation(); $('#tr_app_updates').slideToggle('fast');\"> &nbsp;".$text['description-update_apps']."\n";
-		echo "</a>";
-		echo "	</td>\n";
-		echo "</tr>\n";
-		echo "</table>\n";
-
-
-		echo "<div id='tr_app_updates' style='display: none;'>\n";
-		echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-		echo "<tr>\n";
-		echo "	<td width='30%' class='vncell' style='vertical-align:middle;'>\n";
-		echo "		<div style='".$step_container_style."'><span style='".$step_number_style."'>".$step."B</span></div>";
-		echo "		Apps";
-		echo "	</td>\n";
-		echo "	<td width='70%' class='vtable' style='height: 50px;'>\n";
-
-
-
-		foreach ($updateable_repos as $repo => $apps) {
+		if (!empty($updateable_repos) && is_array($updateable_repos) && @sizeof($updateable_repos) != 0) {
+			foreach ($updateable_repos as $app_path => $repo) {
+				$x = 0;
+				include $app_path.'/app_config.php';
+				$updateable_repos[$app_path]['app'] = $repo[0];
+				$updateable_repos[$app_path]['name'] = $apps[$x]['name'];
+				$updateable_repos[$app_path]['uuid'] = $apps[$x]['uuid'];
+				$updateable_repos[$app_path]['version'] = $apps[$x]['version'];
+				$updateable_repos[$app_path]['description'] = $apps[$x]['description'][$_SESSION['domain']['language']['code']];
+				unset($apps, $updateable_repos[$app_path][0]);
+			}
+		}
+		echo "<div id='tr_optional_apps' style='display: none;'>\n";
+		foreach ($updateable_repos as $repo => $app) {
 			$repo_info = git_repo_info($repo);
-
-			$repo_name = basename($repo);
-
-			if (!$repo_info) {
-				continue;
+			$pull_method = substr($repo_info['url'], 0, 4) == 'http' ? 'http' : 'ssh';
+			if (!$repo_info) { continue; }
+			echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
+			echo "<tr onclick=\"if (document.getElementById('do_".$app['app']."')) { document.getElementById('do_".$app['app']."').checked = !document.getElementById('do_".$app['app']."').checked; }\">\n";
+			echo "	<td width='30%' class='vncell' style='vertical-align: top;'>\n";
+			echo "		".$app['name']."\n";
+			echo "	</td>\n";
+			echo "	<td width='70%' class='vtable' style='height: 50px; cursor: ".($pull_method == 'http' ? "pointer;'" : "help;' title=\"".$text['message-upgrade_manually'].": ".$repo_info['url']."\"").">\n";
+			if ($pull_method == 'http') {
+				echo "	<input type='checkbox' name='action[optional_apps][]' class='do_optional_app' id='do_".$app['app']."' value='".$app['app']."' onclick=\"event.stopPropagation();\"> &nbsp;".$app['description']."<br />\n";
 			}
-
-			// if (!is_writeable($repo_info['path']."/.git")) {
-			// 	continue;
-			// }
-
-			echo "		<input type='checkbox' name='app_list[]' id='do_apps' value='".$repo_name."'> &nbsp;".$repo_name."<br />\n";
-			echo $text['label-git_branch']." ".$repo_info['branch']."\n";
-			echo "<a href='".$repo_info['url']."/compare/";
-			echo $repo_info['commit'] . "...".$repo_info['branch']." 'target='_blank'> \n";
-			echo $repo_info['commit'] . "</a><br />\n";
-			echo "Apps: ".implode(", ",$apps)."<br />\n";
-			echo "</a>";
-			
-
+			else {
+				echo "	<i class='fas fa-ban mr-3' style='opacity: 0.4;'></i> &nbsp;".$app['description']."<br>\n";
+			}
+			echo "		<span style='font-weight: 600;'>".$app['version']."</span>&nbsp;&nbsp;<i><a href='".str_replace(['git@','.com:'],['https://','.com/'], $repo_info['url'])."/compare/".$repo_info['commit']."...".$repo_info['branch']." 'target='_blank' title='".$repo_info['commit']."'>".$repo_info['branch']."</i></a>\n";
+			echo "	</td>\n";
+			echo "</tr>\n";
+			echo "</table>\n";
 		}
-
-		echo "	</td>\n";
-		echo "</tr>\n";
-		echo "</table>\n";
 		echo "</div>\n";
-
 		$step++;
 	}
 
 	if (permission_exists("upgrade_schema")) {
 		echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 		echo "<tr onclick=\"document.getElementById('do_schema').checked = !document.getElementById('do_schema').checked; (!document.getElementById('do_schema').checked ? $('#do_data_types').prop('checked', false) : null); $('#tr_data_types').slideToggle('fast');\">\n";
-		echo "	<td width='30%' class='vncell' style='vertical-align:middle;'>\n";
+		echo "	<td width='30%' class='vncellreq' style='vertical-align:middle;'>\n";
 		echo "		<div style='".$step_container_style."'><span style='".$step_number_style."'>".$step."</span></div>";
 		echo "		".$text['label-upgrade_schema'];
 		echo "	</td>\n";
@@ -276,7 +246,6 @@
 		echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 		echo "<tr onclick=\"document.getElementById('do_data_types').checked = !document.getElementById('do_data_types').checked;\">\n";
 		echo "	<td width='30%' class='vncell' style='vertical-align:middle;'>\n";
-		echo "		<div style='".$step_container_style."'><span style='".$step_number_style." letter-spacing: -0.06em;'>".$step."B</span></div>";
 		echo "		".$text['label-upgrade_data_types'];
 		echo "	</td>\n";
 		echo "	<td width='70%' class='vtable' style='height: 50px; cursor: pointer;'>\n";
@@ -291,7 +260,7 @@
 	if (permission_exists("upgrade_apps")) {
 		echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 		echo "<tr onclick=\"document.getElementById('do_apps').checked = !document.getElementById('do_apps').checked;\">\n";
-		echo "	<td width='30%' class='vncell' style='vertical-align:middle;'>\n";
+		echo "	<td width='30%' class='vncellreq' style='vertical-align:middle;'>\n";
 		echo "		<div style='".$step_container_style."'><span style='".$step_number_style."'>".$step."</span></div>";
 		echo "		".$text['label-upgrade_apps'];
 		echo "	</td>\n";
@@ -306,7 +275,7 @@
 	if (permission_exists("menu_restore")) {
 		echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 		echo "<tr onclick=\"document.getElementById('do_menu').checked = !document.getElementById('do_menu').checked; $('#sel_menu').fadeToggle('fast');\">\n";
-		echo "	<td width='30%' class='vncell' style='vertical-align:middle;'>\n";
+		echo "	<td width='30%' class='vncellreq' style='vertical-align:middle;'>\n";
 		echo "		<div style='".$step_container_style."'><span style='".$step_number_style."'>".$step."</span></div>";
 		echo "		".$text['label-upgrade_menu'];
 		echo "	</td>\n";
@@ -338,7 +307,7 @@
 	if (permission_exists("group_edit")) {
 		echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 		echo "<tr onclick=\"document.getElementById('do_permissions').checked = !document.getElementById('do_permissions').checked;\">\n";
-		echo "	<td width='30%' class='vncell' style='vertical-align:middle;'>\n";
+		echo "	<td width='30%' class='vncellreq' style='vertical-align:middle;'>\n";
 		echo "		<div style='".$step_container_style."'><span style='".$step_number_style."'>".$step."</span></div>";
 		echo "		".$text['label-upgrade_permissions'];
 		echo "	</td>\n";
@@ -357,14 +326,15 @@
 		foreach($_SESSION["response"] as $part => $response){
 			echo "<b>".$text["label-results"]." - ".$text["label-${part}"];
 			echo "</b><br /><br />";
-			if ($part == "update_apps") {
-				echo "<pre>";
+			if ($part == "optional_apps") {
 				foreach ($response as $app_name => $app_response) {
+					echo "<strong>".$app_name."</strong><br>\n";
+					echo "<pre>\n";
 					foreach ($app_response as $response_line) {
-						echo $app_name.": ".htmlspecialchars($response_line) . "\n";
+						echo htmlspecialchars($response_line) . "\n";
 					}
+					echo "</pre>\n";
 				}
-				echo "</pre>";
 			}
 			elseif (is_array($response)) {
 				echo "<pre>";
@@ -382,4 +352,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
+?>