dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade - Source Code: Minor adjustments to interface.

Browse Source
This commit is contained in:
fusionate
2024-04-18 11:51:13 -06:00
parent cffe54a136
commit 7b6bdb6fb1
2 changed files with 37 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/upgrade/index.php
+13 -17
View File
@@ -17,7 +17,7 @@
The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2008-2023
Portions created by the Initial Developer are Copyright (C) 2008-2024
the Initial Developer. All Rights Reserved.
Contributor(s):
@@ -192,10 +192,10 @@
echo " </td>\n";
echo " <td width='70%' class='vtable' style='height: 50px; cursor: pointer;'>\n";
echo " <div style='float: left; clear: both;'>\n";
echo " <input type='checkbox' id='view_optional' onclick=\"event.stopPropagation(); document.getElementById('do_source').checked = !document.getElementById('do_source').checked; (!document.getElementById('do_source').checked ? $('.do_optional_app').prop('checked', false) : null); if (!$(this).prop('checked')) { $('.do_optional_app').prop('checked', false); } else { $('#tr_applications').slideDown('fast'); $('.do_optional_app').prop('checked', true); }\">\n";
echo " <input type='checkbox' id='view_source_code_options' onclick=\"event.stopPropagation(); if (!$(this).prop('checked')) { $('#do_source').prop('checked', false); $('.do_optional_app').prop('checked', false); } else { $('#tr_applications').slideDown('fast'); $('#do_source').prop('checked', true); $('.do_optional_app').prop('checked', true); }\">\n";
echo " </div>\n";
echo " <div style='overflow: hidden;'>\n";
echo " <span onclick=\"event.stopPropagation(); $('#tr_applications').slideToggle('fast');\">&nbsp;&nbsp;".$text['description-all_applications']." (".$repos_count.")</span>\n";
echo " <span onclick=\"event.stopPropagation(); $('#tr_applications').slideToggle('fast');\">&nbsp;&nbsp;".$text['description-update_all_source_files']." (".$repos_count.")</span>\n";
echo " </div>\n";
echo " </td>\n";
echo "</tr>\n";
@@ -204,16 +204,13 @@
echo "<div id='tr_applications' style='display: none;'>\n";
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr onclick=\"if (document.getElementById('do_source')) { document.getElementById('do_source').checked = !document.getElementById('do_source').checked; }\">\n";
echo "<tr onclick=\"if (document.getElementById('do_source')) { document.getElementById('do_source').checked = !document.getElementById('do_source').checked; if (document.getElementById('do_source').checked == false) { document.getElementById('view_source_code_options').checked = false; } }\">\n";
echo " <td width='30%' class='vncell' style='vertical-align: middle;'>\n";
echo " ".$text['message-upgrade_manually']."\n";
echo " ".(isset($_SESSION['theme']['title']['text']) ?$_SESSION['theme']['title']['text'] : 'FusionPBX')."\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";
echo " <div style='float: left; clear: both;'>\n";
echo " <input type='checkbox' name='action[upgrade_source]' id='do_source' value='1' onclick=\"event.stopPropagation();\">\n";
echo " </div>\n";
echo " <div style='overflow: hidden;'>\n";
echo " &nbsp;&nbsp;".$text['description-upgrade_source']."<br />\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(); if (this.checked == false) { document.getElementById('view_source_code_options').checked = false; }\">\n";
echo " &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);
@@ -222,12 +219,11 @@
$git_current_commit = $git_current_commit[0];
if (!is_numeric($git_current_branch)) {
echo "<span style='font-weight: 600;'>".software::version()."</span>\n";
echo " <span style='font-weight: 600;'>".software::version()."</span>\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 " <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 " </div>\n";
echo " </td>\n";
echo "</tr>\n";
echo "</table>\n";
@@ -237,16 +233,16 @@
$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 "<tr onclick=\"if (document.getElementById('do_".$app['app']."')) { document.getElementById('do_".$app['app']."').checked = !document.getElementById('do_".$app['app']."').checked; if (document.getElementById('do_".$app['app']."').checked == false) { document.getElementById('view_source_code_options').checked = false; } }\">\n";
echo " <td width='30%' class='vncell' style='vertical-align: middle;'>\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";
echo " <input type='checkbox' name='action[optional_apps][]' class='do_optional_app' id='do_".$app['app']."' value='".$app['app']."' onclick=\"event.stopPropagation(); if (this.checked == false) { document.getElementById('view_source_code_options').checked = false; }\"> &nbsp;".$app['description']."<br />\n";
}
else {
echo " <i class='fas fa-ban mr-3' style='opacity: 0.4;'></i> &nbsp;".$app['description']."<br>\n";
echo " <i class='fas fa-ban mr-3' style='opacity: 0.3; margin: 0 1px;'></i> ".$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";