more function moving

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

lib/Froxlor/Api/Commands/Admins.php

@@ -260,14 +260,14 @@ class Admins extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEnt
 				}
 
 				if ($password == '') {
-					$password = \Froxlor\System::generatePassword();
+					$password = \Froxlor\System\Crypt::generatePassword();
 				}
 
 				$_theme = Settings::Get('panel.default_theme');
 
 				$ins_data = array(
 					'loginname' => $loginname,
-					'password' => \Froxlor\System::makeCryptPassword($password),
+					'password' => \Froxlor\System\Crypt::makeCryptPassword($password),
 					'name' => $name,
 					'email' => $email,
 					'lang' => $def_language,
@@ -530,7 +530,7 @@ class Admins extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEnt
 
 					if ($password != '') {
 						$password = validatePassword($password, true);
-						$password = \Froxlor\System::makeCryptPassword($password);
+						$password = \Froxlor\System\Crypt::makeCryptPassword($password);
 					} else {
 						$password = $result['password'];
 					}

lib/Froxlor/Api/Commands/Customers.php

@@ -378,7 +378,7 @@ class Customers extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resource
 					}
 
 					if ($password == '') {
-						$password = \Froxlor\System::generatePassword();
+						$password = \Froxlor\System\Crypt::generatePassword();
 					}
 
 					$_theme = Settings::Get('panel.default_theme');
@@ -386,7 +386,7 @@ class Customers extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resource
 					$ins_data = array(
 						'adminid' => $this->getUserDetail('adminid'),
 						'loginname' => $loginname,
-						'passwd' => \Froxlor\System::makeCryptPassword($password),
+						'passwd' => \Froxlor\System\Crypt::makeCryptPassword($password),
 						'name' => $name,
 						'firstname' => $firstname,
 						'gender' => $gender,
@@ -552,7 +552,7 @@ class Customers extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resource
 					Database::pexecute($ins_stmt, $ins_data, true, true);
 
 					inserttask('1');
-					$cryptPassword = \Froxlor\System::makeCryptPassword($password);
+					$cryptPassword = \Froxlor\System\Crypt::makeCryptPassword($password);
 					// add FTP-User
 					// @fixme use Ftp-ApiCommand later
 					$ins_stmt = Database::prepare("
@@ -941,7 +941,7 @@ class Customers extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resource
 
 		if ($password != '') {
 			$password = validatePassword($password, true);
-			$password = \Froxlor\System::makeCryptPassword($password);
+			$password = \Froxlor\System\Crypt::makeCryptPassword($password);
 		} else {
 			$password = $result['password'];
 		}

lib/Froxlor/Api/Commands/EmailAccounts.php

@@ -122,7 +122,7 @@ class EmailAccounts extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Reso
 			}
 
 			// encrypt the password
-			$cryptPassword = \Froxlor\System::makeCryptPassword($password);
+			$cryptPassword = \Froxlor\System\Crypt::makeCryptPassword($password);
 
 			$email_user = substr($email_full, 0, strrpos($email_full, "@"));
 			$email_domain = substr($email_full, strrpos($email_full, "@") + 1);
@@ -347,7 +347,7 @@ class EmailAccounts extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Reso
 				standard_error('passwordshouldnotbeusername', '', true);
 			}
 			$password = validatePassword($password, true);
-			$cryptPassword = \Froxlor\System::makeCryptPassword($password);
+			$cryptPassword = \Froxlor\System\Crypt::makeCryptPassword($password);
 			$upd_query .= (Settings::Get('system.mailpwcleartext') == '1' ? "`password` = :password, " : '') . "`password_enc`= :password_enc";
 			$upd_params['password_enc'] = $cryptPassword;
 			if (Settings::Get('system.mailpwcleartext') == '1') {

lib/Froxlor/Api/Commands/Ftps.php

@@ -129,7 +129,7 @@ class Ftps extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEntit
 				standard_error('passwordshouldnotbeusername', '', true);
 			} else {
 				$path = \Froxlor\FileDir::makeCorrectDir($customer['documentroot'] . '/' . $path);
-				$cryptPassword = \Froxlor\System::makeCryptPassword($password);
+				$cryptPassword = \Froxlor\System\Crypt::makeCryptPassword($password);
 
 				$stmt = Database::prepare("INSERT INTO `" . TABLE_FTP_USERS . "`
 						(`customerid`, `username`, `description`, `password`, `homedir`, `login_enabled`, `uid`, `gid`, `shell`)
@@ -358,7 +358,7 @@ class Ftps extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEntit
 			if ($password == $result['username']) {
 				standard_error('passwordshouldnotbeusername', '', true);
 			}
-			$cryptPassword = \Froxlor\System::makeCryptPassword($password);
+			$cryptPassword = \Froxlor\System\Crypt::makeCryptPassword($password);
 
 			$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
 				SET `password` = :password

lib/Froxlor/Settings/Store.php

@@ -179,7 +179,7 @@ class Store
 				 * when fielddata[cronmodule] is set, this means enable/disable a cronjob
 				 */
 				if (isset($fielddata['cronmodule']) && $fielddata['cronmodule'] != '') {
-					toggleCronStatus($fielddata['cronmodule'], $newfieldvalue);
+					\Froxlor\System\Cronjob::toggleCronStatus($fielddata['cronmodule'], $newfieldvalue);
 				}
 
 				/*

lib/Froxlor/System/Cronjob.php

@@ -0,0 +1,194 @@
+<?php
+namespace Froxlor\System;
+
+use Froxlor\Settings;
+use Froxlor\Database\Database;
+
+class Cronjob
+{
+
+	public static function getCronjobsLastRun()
+	{
+		global $lng;
+
+		$query = "SELECT `lastrun`, `desc_lng_key` FROM `" . TABLE_PANEL_CRONRUNS . "` WHERE `isactive` = '1' ORDER BY `cronfile` ASC";
+		$result = Database::query($query);
+
+		$cronjobs_last_run = '';
+		while ($row = $result->fetch(\PDO::FETCH_ASSOC)) {
+
+			$lastrun = $lng['cronjobs']['notyetrun'];
+			if ($row['lastrun'] > 0) {
+				$lastrun = date('d.m.Y H:i:s', $row['lastrun']);
+			}
+
+			$text = $lng['crondesc'][$row['desc_lng_key']];
+			$value = $lastrun;
+
+			eval("\$cronjobs_last_run .= \"" . getTemplate("index/overview_item") . "\";");
+		}
+
+		return $cronjobs_last_run;
+	}
+
+	public static function toggleCronStatus($module = null, $isactive = 0)
+	{
+		if ($isactive != 1) {
+			$isactive = 0;
+		}
+
+		$upd_stmt = Database::prepare("
+		UPDATE `" . TABLE_PANEL_CRONRUNS . "` SET `isactive` = :active WHERE `module` = :module");
+		Database::pexecute($upd_stmt, array(
+			'active' => $isactive,
+			'module' => $module
+		));
+	}
+
+	public static function getOutstandingTasks()
+	{
+		global $lng;
+
+		$query = "SELECT * FROM `" . TABLE_PANEL_TASKS . "` ORDER BY `type` ASC";
+		$result = Database::query($query);
+
+		$value = '<ul class="cronjobtask">';
+		$tasks = '';
+		while ($row = $result->fetch(\PDO::FETCH_ASSOC)) {
+
+			if ($row['data'] != '') {
+				$row['data'] = json_decode($row['data'], true);
+			}
+
+			// rebuilding webserver-configuration
+			if ($row['type'] == '1') {
+				$task_desc = $lng['tasks']['rebuild_webserverconfig'];
+			} // adding new user/
+			elseif ($row['type'] == '2') {
+				$loginname = '';
+				if (is_array($row['data'])) {
+					$loginname = $row['data']['loginname'];
+				}
+				$task_desc = $lng['tasks']['adding_customer'];
+				$task_desc = str_replace('%loginname%', $loginname, $task_desc);
+			} // rebuilding bind-configuration
+			elseif ($row['type'] == '4') {
+				$task_desc = $lng['tasks']['rebuild_bindconfig'];
+			} // creating ftp-user directory
+			elseif ($row['type'] == '5') {
+				$task_desc = $lng['tasks']['creating_ftpdir'];
+			} // deleting user-files
+			elseif ($row['type'] == '6') {
+				$loginname = '';
+				if (is_array($row['data'])) {
+					$loginname = $row['data']['loginname'];
+				}
+				$task_desc = $lng['tasks']['deleting_customerfiles'];
+				$task_desc = str_replace('%loginname%', $loginname, $task_desc);
+			} // deleting email-account
+			elseif ($row['type'] == '7') {
+				$task_desc = $lng['tasks']['remove_emailacc_files'];
+			} // deleting ftp-account
+			elseif ($row['type'] == '8') {
+				$task_desc = $lng['tasks']['remove_ftpacc_files'];
+			} // Set FS - quota
+			elseif ($row['type'] == '10') {
+				$task_desc = $lng['tasks']['diskspace_set_quota'];
+			} // deleting user-files
+			elseif ($row['type'] == '20') {
+				$loginname = '';
+				if (is_array($row['data'])) {
+					$loginname = $row['data']['loginname'];
+				}
+				$task_desc = $lng['tasks']['backup_customerfiles'];
+				$task_desc = str_replace('%loginname%', $loginname, $task_desc);
+			} // re-generating of cron.d-file
+			elseif ($row['type'] == '99') {
+				$task_desc = $lng['tasks']['regenerating_crond'];
+			} // unknown
+			else {
+				$task_desc = "ERROR: Unknown task type '" . $row['type'] . "'";
+			}
+
+			if ($task_desc != '') {
+				$tasks .= '<li>' . $task_desc . '</li>';
+			}
+		}
+
+		if (trim($tasks) == '') {
+			$value .= '<li>' . $lng['tasks']['noneoutstanding'] . '</li>';
+		} else {
+			$value .= $tasks;
+		}
+
+		$value .= '</ul>';
+		$text = $lng['tasks']['outstanding_tasks'];
+		eval("\$outstanding_tasks = \"" . getTemplate("index/overview_item") . "\";");
+
+		return $outstanding_tasks;
+	}
+
+	/**
+	 * Cronjob function to end a cronjob in a critical condition
+	 * but not without sending a notification mail to the admin
+	 *
+	 * @param string $message
+	 * @param string $subject
+	 *
+	 * @return void
+	 */
+	public static function dieWithMail($message, $subject = "[froxlor] Cronjob error")
+	{
+		if (Settings::Get('system.send_cron_errors') == '1') {
+
+			$_mail = new \PHPMailer\PHPMailer\PHPMailer(true);
+			$_mail->CharSet = "UTF-8";
+
+			if (Settings::Get('system.mail_use_smtp')) {
+				$_mail->isSMTP();
+				$_mail->Host = Settings::Get('system.mail_smtp_host');
+				$_mail->SMTPAuth = Settings::Get('system.mail_smtp_auth') == '1' ? true : false;
+				$_mail->Username = Settings::Get('system.mail_smtp_user');
+				$_mail->Password = Settings::Get('system.mail_smtp_passwd');
+				if (Settings::Get('system.mail_smtp_usetls')) {
+					$_mail->SMTPSecure = 'tls';
+				} else {
+					$_mail->SMTPAutoTLS = false;
+				}
+				$_mail->Port = Settings::Get('system.mail_smtp_port');
+			}
+
+			if (\PHPMailer\PHPMailer\PHPMailer::ValidateAddress(Settings::Get('panel.adminmail')) !== false) {
+				// set return-to address and custom sender-name, see #76
+				$_mail->SetFrom(Settings::Get('panel.adminmail'), Settings::Get('panel.adminmail_defname'));
+				if (Settings::Get('panel.adminmail_return') != '') {
+					$_mail->AddReplyTo(Settings::Get('panel.adminmail_return'), Settings::Get('panel.adminmail_defname'));
+				}
+			}
+
+			$_mailerror = false;
+			$mailerr_msg = "";
+			try {
+				$_mail->Subject = $subject;
+				$_mail->AltBody = $message;
+				$_mail->MsgHTML(nl2br($message));
+				$_mail->AddAddress(Settings::Get('panel.adminmail'), Settings::Get('panel.adminmail_defname'));
+				$_mail->Send();
+			} catch (\PHPMailer\PHPMailer\Exception $e) {
+				$mailerr_msg = $e->errorMessage();
+				$_mailerror = true;
+			} catch (\Exception $e) {
+				$mailerr_msg = $e->getMessage();
+				$_mailerror = true;
+			}
+
+			$_mail->ClearAddresses();
+
+			if ($_mailerror) {
+				echo 'Error sending mail: ' . $mailerr_msg . "\n";
+			}
+		}
+
+		die($message);
+	}
+}

lib/Froxlor/System/Crypt.php

@@ -3,14 +3,14 @@ namespace Froxlor\System;
 
 use Froxlor\Settings;
 
-class System
+class Crypt
 {
 
 	/**
 	 * Generates a random password
 	 *
 	 * @param boolean $isSalt
-	 *        	optional, create a hash for a salt used in \Froxlor\System::makeCryptPassword because crypt() does not like some special characters in its salts, default is false
+	 *        	optional, create a hash for a salt used in \Froxlor\System\Crypt::makeCryptPassword because crypt() does not like some special characters in its salts, default is false
 	 */
 	public static function generatePassword($isSalt = false)
 	{
@@ -137,68 +137,4 @@ class System
 
 		return $available_pwdhashes;
 	}
-
-	/**
-	 * Cronjob function to end a cronjob in a critical condition
-	 * but not without sending a notification mail to the admin
-	 *
-	 * @param string $message
-	 * @param string $subject
-	 *
-	 * @return void
-	 */
-	public static function dieWithMail($message, $subject = "[froxlor] Cronjob error")
-	{
-		if (Settings::Get('system.send_cron_errors') == '1') {
-
-			$_mail = new \PHPMailer\PHPMailer\PHPMailer(true);
-			$_mail->CharSet = "UTF-8";
-
-			if (Settings::Get('system.mail_use_smtp')) {
-				$_mail->isSMTP();
-				$_mail->Host = Settings::Get('system.mail_smtp_host');
-				$_mail->SMTPAuth = Settings::Get('system.mail_smtp_auth') == '1' ? true : false;
-				$_mail->Username = Settings::Get('system.mail_smtp_user');
-				$_mail->Password = Settings::Get('system.mail_smtp_passwd');
-				if (Settings::Get('system.mail_smtp_usetls')) {
-					$_mail->SMTPSecure = 'tls';
-				} else {
-					$_mail->SMTPAutoTLS = false;
-				}
-				$_mail->Port = Settings::Get('system.mail_smtp_port');
-			}
-
-			if (\PHPMailer\PHPMailer\PHPMailer::ValidateAddress(Settings::Get('panel.adminmail')) !== false) {
-				// set return-to address and custom sender-name, see #76
-				$_mail->SetFrom(Settings::Get('panel.adminmail'), Settings::Get('panel.adminmail_defname'));
-				if (Settings::Get('panel.adminmail_return') != '') {
-					$_mail->AddReplyTo(Settings::Get('panel.adminmail_return'), Settings::Get('panel.adminmail_defname'));
-				}
-			}
-
-			$_mailerror = false;
-			$mailerr_msg = "";
-			try {
-				$_mail->Subject = $subject;
-				$_mail->AltBody = $message;
-				$_mail->MsgHTML(nl2br($message));
-				$_mail->AddAddress(Settings::Get('panel.adminmail'), Settings::Get('panel.adminmail_defname'));
-				$_mail->Send();
-			} catch (\PHPMailer\PHPMailer\Exception $e) {
-				$mailerr_msg = $e->errorMessage();
-				$_mailerror = true;
-			} catch (\Exception $e) {
-				$mailerr_msg = $e->getMessage();
-				$_mailerror = true;
-			}
-
-			$_mail->ClearAddresses();
-
-			if ($_mailerror) {
-				echo 'Error sending mail: ' . $mailerr_msg . "\n";
-			}
-		}
-
-		die($message);
-	}
 }