maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

major refactoring of almost all files

Browse Source
This commit is contained in:
envoyr
2022-04-28 20:48:00 +02:00
parent a2e95b960f
commit 4f4c71d79b
285 changed files with 21716 additions and 18766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/Froxlor/Install/Install.php
View File

@@ -11,21 +11,22 @@
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you can also view it online at
* http://files.froxlor.org/misc/COPYING.txt
* https://files.froxlor.org/misc/COPYING.txt
*
* @copyright the authors
* @author Froxlor team <team@froxlor.org>
* @license http://files.froxlor.org/misc/COPYING.txt GPLv2
* @license https://files.froxlor.org/misc/COPYING.txt GPLv2
*/
namespace Froxlor\Install;
use Froxlor\UI\Panel\UI;
use Froxlor\UI\Request;
class Install
{
@@ -39,7 +40,7 @@ class Install
public function __construct()
{
$this->step = \Froxlor\UI\Request::get('step');
$this->step = Request::get('step');
$this->phpVersion = phpversion();
$this->loadedExtensions = get_loaded_extensions();
@@ -51,29 +52,21 @@ class Install
{
// check for required extensions
foreach ($this->requiredExtensions as $requiredExtension) {
if (in_array($requiredExtension, $this->loadedExtensions)) continue;
if (in_array($requiredExtension, $this->loadedExtensions)) {
continue;
}
$this->criticals['missing_extensions'][] = $requiredExtension;
}
// check for suggested extensions
foreach ($this->suggestedExtensions as $suggestedExtension) {
if (in_array($suggestedExtension, $this->loadedExtensions)) continue;
if (in_array($suggestedExtension, $this->loadedExtensions)) {
continue;
}
$this->suggestions['missing_extensions'][] = $suggestedExtension;
}
}
public function getPreflightText(): string
{
if (version_compare($this->requiredVersion, PHP_VERSION, "<")) {
$text = 'Your system is running with PHP ' . $this->phpVersion;
} else {
$text = 'Your system is running a lower version than PHP ' . $this->requiredVersion;
$this->criticals[] = 'Update your current PHP Version from ' . $this->phpVersion . ' to ' . $this->requiredVersion . ' or higher';
}
return $text;
}
public function handle()
{
$formfield = require dirname(__DIR__, 3) . '/lib/formfields/install/formfield.install.php';
@@ -106,4 +99,16 @@ class Install
// output view
UI::twigOutputBuffer();
}
public function getPreflightText(): string
{
if (version_compare($this->requiredVersion, PHP_VERSION, "<")) {
$text = 'Your system is running with PHP ' . $this->phpVersion;
} else {
$text = 'Your system is running a lower version than PHP ' . $this->requiredVersion;
$this->criticals[] = 'Update your current PHP Version from ' . $this->phpVersion . ' to ' . $this->requiredVersion . ' or higher';
}
return $text;
}
}

11
lib/Froxlor/Install/Update.php
View File

@@ -11,16 +11,16 @@
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you can also view it online at
* http://files.froxlor.org/misc/COPYING.txt
* https://files.froxlor.org/misc/COPYING.txt
*
* @copyright the authors
* @author Froxlor team <team@froxlor.org>
* @license http://files.froxlor.org/misc/COPYING.txt GPLv2
* @license https://files.froxlor.org/misc/COPYING.txt GPLv2
*/
namespace Froxlor\Install;
@@ -37,7 +37,7 @@ class Update
*
* @param string $task
* @param bool $needs_status (if false, a linebreak will be added)
*
*
* @return void
*/
public static function showUpdateStep($task = null, $needs_status = true)
@@ -64,7 +64,7 @@ class Update
* @param int $status (0 = success, 1 = warning, 2 = failure)
* @param string $message
* @param string $additional_info
*
*
* @return string formatted output and log-entry
*/
public static function lastStepStatus(int $status = -1, string $message = '', string $additional_info = '')
@@ -75,7 +75,6 @@ class Update
$update_tasks[$task_counter]['result_desc'] = $additional_info ?? '';
switch ($status) {
case 0:
break;
case 1: