diff --git a/admin_apcuinfo.php b/admin_apcuinfo.php index a0b0f937..d7854d65 100644 --- a/admin_apcuinfo.php +++ b/admin_apcuinfo.php @@ -87,7 +87,7 @@ if ($page == 'showinfo') { $hits = $cache['num_hits'] . @sprintf(" (%.1f%%)", $cache['num_hits'] * 100 / ($cache['num_hits'] + $cache['num_misses'])); $misses = $cache['num_misses'] . @sprintf(" (%.1f%%)", $cache['num_misses'] * 100 / ($cache['num_hits'] + $cache['num_misses'])); - // Fragementation: (freeseg - 1) / total_seg + // Fragmentation: (freeseg - 1) / total_seg $nseg = $freeseg = $fragsize = $freetotal = 0; for ($i = 0; $i < $mem['num_seg']; $i ++) { $ptr = 0; diff --git a/admin_opcacheinfo.php b/admin_opcacheinfo.php index b6afbb51..85b8a8f3 100644 --- a/admin_opcacheinfo.php +++ b/admin_opcacheinfo.php @@ -22,7 +22,7 @@ require './lib/init.php'; if ($action == 'reset' && function_exists('opcache_reset') && $userinfo['change_serversettings'] == '1') { opcache_reset(); - $log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "reseted OPcache"); + $log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_INFO, "reset OPcache"); header('Location: ' . $linker->getLink(array( 'section' => 'opcacheinfo', 'page' => 'showinfo' diff --git a/api_keys.php b/api_keys.php index 0c3126e5..1a110ce4 100644 --- a/api_keys.php +++ b/api_keys.php @@ -127,7 +127,7 @@ if ($action == 'delete') { $log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed api::api_keys"); -// select all my (accessable) certificates +// select all my (accessible) certificates $keys_stmt_query = "SELECT ak.*, c.loginname, a.loginname as adminname FROM `" . TABLE_API_KEYS . "` ak LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` c ON `c`.`customerid` = `ak`.`customerid` diff --git a/install/lib/class.FroxlorInstall.php b/install/lib/class.FroxlorInstall.php index 350e4277..b8eb2dcc 100644 --- a/install/lib/class.FroxlorInstall.php +++ b/install/lib/class.FroxlorInstall.php @@ -123,7 +123,7 @@ class FroxlorInstall if ((isset($_POST['installstep']) && $_POST['installstep'] == '1') || (isset($_GET['check']) && $_GET['check'] == '1')) { $pagetitle = $this->_lng['install']['title']; if ($this->_checkPostData()) { - // ceck data and create userdata etc.etc.etc. + // check data and create userdata etc.etc.etc. $result = $this->_doInstall(); } elseif (isset($_GET['check']) && $_GET['check'] == '1') { // gather data @@ -739,7 +739,7 @@ class FroxlorInstall } if ($tables_exist) { - // tell whats going on + // tell what's going on $content .= $this->_status_message('begin', $this->_lng['install']['backup_old_db']); // create temporary backup-filename diff --git a/install/lng/english.lng.php b/install/lng/english.lng.php index 69c06ced..e6e126c5 100644 --- a/install/lng/english.lng.php +++ b/install/lng/english.lng.php @@ -23,7 +23,7 @@ $lng['requirements']['notfound'] = 'not found'; $lng['requirements']['notinstalled'] = 'not installed'; $lng['requirements']['activated'] = 'enabled'; $lng['requirements']['phpversion'] = 'PHP version >= 7.0'; -$lng['requirements']['newerphpprefered'] = 'Good, but php-7.1 is prefered.'; +$lng['requirements']['newerphpprefered'] = 'Good, but php-7.1 is preferred.'; $lng['requirements']['phppdo'] = 'PHP PDO extension and PDO-MySQL driver...'; $lng['requirements']['phpsession'] = 'PHP session-extension...'; $lng['requirements']['phpctype'] = 'PHP ctype-extension...'; @@ -39,7 +39,7 @@ $lng['requirements']['phpjson'] = 'PHP json-extension...'; $lng['requirements']['bcmathdescription'] = 'Traffic-calculation related functions will not work correctly!'; $lng['requirements']['zipdescription'] = 'The auto-update feature requires the zip extension.'; $lng['requirements']['openbasedir'] = 'open_basedir...'; -$lng['requirements']['openbasedirenabled'] = 'Froxlor will not work properly with open_basedir enabled. Please disable open_basedir for Froxlor in the coresponding php.ini'; +$lng['requirements']['openbasedirenabled'] = 'Froxlor will not work properly with open_basedir enabled. Please disable open_basedir for Froxlor in the corresponding php.ini'; $lng['requirements']['mysqldump'] = 'MySQL dump tool'; $lng['requirements']['mysqldumpmissing'] = 'Automatic backup of possible existing database is not possible. Please install mysql-client tools'; $lng['requirements']['diedbecauseofrequirements'] = 'Cannot install Froxlor without these requirements! Try to fix them and retry.'; diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 4a1ed614..156541f3 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -2505,7 +2505,7 @@ if (\Froxlor\Froxlor::isFroxlorVersion('0.9.30')) { showUpdateStep("Updating from 0.9.30 to 0.9.31-dev1", true); lastStepStatus(0); - showUpdateStep("Removing unsused tables"); + showUpdateStep("Removing unused tables"); Database::query("DROP TABLE IF EXISTS `ipsandports_docrootsettings`;"); Database::query("DROP TABLE IF EXISTS `domain_docrootsettings`;"); lastStepStatus(0); @@ -2856,7 +2856,7 @@ if (\Froxlor\Froxlor::isFroxlorVersion('0.9.32-rc1')) { Settings::AddNew("system.croncmdline", $croncmdline); // add task to generate cron.d-file \Froxlor\System\Cronjob::inserttask('99'); - // silenty add the auto-update setting - we do not want everybody to know and use this + // silently add the auto-update setting - we do not want everybody to know and use this // as it is a very dangerous setting Settings::AddNew("system.cron_allowautoupdate", 0); lastStepStatus(0); @@ -3872,7 +3872,7 @@ opcache.interned_strings_buffer'); if (\Froxlor\Froxlor::isDatabaseVersion('201801110')) { - showUpdateStep("Adding php-fpm php PATH setting for envrironment"); + showUpdateStep("Adding php-fpm php PATH setting for environment"); Settings::AddNew("phpfpm.envpath", '/usr/local/bin:/usr/bin:/bin'); lastStepStatus(0); diff --git a/install/updates/preconfig.php b/install/updates/preconfig.php index e0f601c5..66c29416 100644 --- a/install/updates/preconfig.php +++ b/install/updates/preconfig.php @@ -19,7 +19,7 @@ * Function getPreConfig * * outputs various content before the update process - * can be continued (askes for agreement whatever is being asked) + * can be continued (asks for agreement whatever is being asked) * * @param string $current_version * @param int $current_db_version diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php index 122114c1..848f032d 100644 --- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php +++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php @@ -414,7 +414,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c if (Settings::Get('system.webserver') == 'apache2') { $has_preconfig = true; - $description = 'Froxlor now supports the new Apache 2.4. Please be aware that you need to load additional apache-modules in ordner to use it.
'; + $description = 'Froxlor now supports the new Apache 2.4. Please be aware that you need to load additional apache-modules in order to use it.
'; $description .= '
LoadModule authz_core_module modules/mod_authz_core.so
 					LoadModule authz_host_module modules/mod_authz_host.so

'; $question = 'Do you want to enable the Apache-2.4 modification?: '; diff --git a/lib/Froxlor/Api/Commands/Certificates.php b/lib/Froxlor/Api/Commands/Certificates.php index ee79ab74..69ffc718 100644 --- a/lib/Froxlor/Api/Commands/Certificates.php +++ b/lib/Froxlor/Api/Commands/Certificates.php @@ -189,7 +189,7 @@ class Certificates extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resou */ public function listing() { - // select all my (accessable) certificates + // select all my (accessible) certificates $certs_stmt_query = "SELECT s.*, d.domain, d.letsencrypt, c.customerid, c.loginname FROM `" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "` s LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` d ON `d`.`id` = `s`.`domainid` @@ -237,7 +237,7 @@ class Certificates extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resou */ public function listingCount() { - // select all my (accessable) certificates + // select all my (accessible) certificates $certs_stmt_query = "SELECT COUNT(*) as num_certs FROM `" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "` s LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` d ON `d`.`id` = `s`.`domainid` diff --git a/lib/Froxlor/Api/Commands/CustomerBackups.php b/lib/Froxlor/Api/Commands/CustomerBackups.php index bd74dac3..84941cec 100644 --- a/lib/Froxlor/Api/Commands/CustomerBackups.php +++ b/lib/Froxlor/Api/Commands/CustomerBackups.php @@ -23,7 +23,7 @@ class CustomerBackups extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Re { /** - * check whether backup is enabled systemwide and if accessable for customer (hide_options) + * check whether backup is enabled systemwide and if accessible for customer (hide_options) * * @throws \Exception */ diff --git a/lib/Froxlor/Api/Commands/Customers.php b/lib/Froxlor/Api/Commands/Customers.php index f9bbedf0..05749ca1 100644 --- a/lib/Froxlor/Api/Commands/Customers.php +++ b/lib/Froxlor/Api/Commands/Customers.php @@ -316,9 +316,9 @@ class Customers extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resource * @param bool $perlenabled * optional, whether to allow usage of Perl/CGI, default 0 (false) * @param bool $dnsenabled - * optional, wether to allow usage of the DNS editor (requires activated nameserver in settings), default 0 (false) + * optional, whether to allow usage of the DNS editor (requires activated nameserver in settings), default 0 (false) * @param bool $logviewenabled - * optional, wether to allow acccess to webserver access/error-logs, default 0 (false) + * optional, whether to allow access to webserver access/error-logs, default 0 (false) * @param bool $store_defaultindex * optional, whether to store the default index file to customers homedir * @param int $hosting_plan_id @@ -923,9 +923,9 @@ class Customers extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resource * @param bool $perlenabled * optional, whether to allow usage of Perl/CGI, default 0 (false) * @param bool $dnsenabled - * optional, ether to allow usage of the DNS editor (requires activated nameserver in settings), default 0 (false) + * optional, whether to allow usage of the DNS editor (requires activated nameserver in settings), default 0 (false) * @param bool $logviewenabled - * optional, ether to allow acccess to webserver access/error-logs, default 0 (false) + * optional, whether to allow access to webserver access/error-logs, default 0 (false) * @param string $theme * optional, change theme * diff --git a/lib/Froxlor/Api/Commands/DirOptions.php b/lib/Froxlor/Api/Commands/DirOptions.php index 8fb44e9a..fc54f0cb 100644 --- a/lib/Froxlor/Api/Commands/DirOptions.php +++ b/lib/Froxlor/Api/Commands/DirOptions.php @@ -322,7 +322,7 @@ class DirOptions extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resourc } /** - * returns the total number of accessable directory options + * returns the total number of accessible directory options * * @param int $customerid * optional, admin-only, select directory-protections of a specific customer by id diff --git a/lib/Froxlor/Api/Commands/DirProtections.php b/lib/Froxlor/Api/Commands/DirProtections.php index b79785ef..241592d2 100644 --- a/lib/Froxlor/Api/Commands/DirProtections.php +++ b/lib/Froxlor/Api/Commands/DirProtections.php @@ -305,7 +305,7 @@ class DirProtections extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Res } /** - * returns the total number of accessable directory protections + * returns the total number of accessible directory protections * * @param int $customerid * optional, admin-only, select directory-protections of a specific customer by id diff --git a/lib/Froxlor/Api/Commands/Domains.php b/lib/Froxlor/Api/Commands/Domains.php index 45366c97..72dc7c09 100644 --- a/lib/Froxlor/Api/Commands/Domains.php +++ b/lib/Froxlor/Api/Commands/Domains.php @@ -77,7 +77,7 @@ class Domains extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEn } /** - * returns the total number of accessable domains + * returns the total number of accessible domains * * @access admin * @throws \Exception diff --git a/lib/Froxlor/Api/Commands/Emails.php b/lib/Froxlor/Api/Commands/Emails.php index 924fe90e..699533c7 100644 --- a/lib/Froxlor/Api/Commands/Emails.php +++ b/lib/Froxlor/Api/Commands/Emails.php @@ -326,7 +326,7 @@ class Emails extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEnt } /** - * returns the total number of accessable email addresses + * returns the total number of accessible email addresses * * @param int $customerid * optional, admin-only, select email addresses of a specific customer by id diff --git a/lib/Froxlor/Api/Commands/FpmDaemons.php b/lib/Froxlor/Api/Commands/FpmDaemons.php index ba757dc0..52192591 100644 --- a/lib/Froxlor/Api/Commands/FpmDaemons.php +++ b/lib/Froxlor/Api/Commands/FpmDaemons.php @@ -79,7 +79,7 @@ class FpmDaemons extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resourc } /** - * returns the total number of accessable fpm daemons + * returns the total number of accessible fpm daemons * * @access admin * @throws \Exception diff --git a/lib/Froxlor/Api/Commands/Ftps.php b/lib/Froxlor/Api/Commands/Ftps.php index 486a1854..1e30bd4c 100644 --- a/lib/Froxlor/Api/Commands/Ftps.php +++ b/lib/Froxlor/Api/Commands/Ftps.php @@ -62,7 +62,7 @@ class Ftps extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEntit if (($this->getUserDetail('ftps_used') < $this->getUserDetail('ftps') || $this->getUserDetail('ftps') == '-1') || $this->isAdmin() && $is_defaultuser == 1) { - // required paramters + // required parameters $path = $this->getParam('path'); $password = $this->getParam('ftp_password'); @@ -512,7 +512,7 @@ class Ftps extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEntit } /** - * returns the total number of accessable ftp accounts + * returns the total number of accessible ftp accounts * * @param int $customerid * optional, admin-only, select ftp-users of a specific customer by id diff --git a/lib/Froxlor/Api/Commands/HostingPlans.php b/lib/Froxlor/Api/Commands/HostingPlans.php index ca3a76bc..68373d52 100644 --- a/lib/Froxlor/Api/Commands/HostingPlans.php +++ b/lib/Froxlor/Api/Commands/HostingPlans.php @@ -66,7 +66,7 @@ class HostingPlans extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resou } /** - * returns the total number of accessable hosting plans + * returns the total number of accessible hosting plans * * @access admin * @throws \Exception @@ -182,9 +182,9 @@ class HostingPlans extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resou * @param bool $perlenabled * optional, whether to allow usage of Perl/CGI, default 0 (false) * @param bool $dnsenabled - * optional, ether to allow usage of the DNS editor (requires activated nameserver in settings), default 0 (false) + * optional, whether to allow usage of the DNS editor (requires activated nameserver in settings), default 0 (false) * @param bool $logviewenabled - * optional, ether to allow acccess to webserver access/error-logs, default 0 (false) + * optional, whether to allow access to webserver access/error-logs, default 0 (false) * * @access admin * @throws \Exception @@ -309,9 +309,9 @@ class HostingPlans extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resou * @param bool $perlenabled * optional, whether to allow usage of Perl/CGI, default 0 (false) * @param bool $dnsenabled - * optional, ether to allow usage of the DNS editor (requires activated nameserver in settings), default 0 (false) + * optional, either to allow usage of the DNS editor (requires activated nameserver in settings), default 0 (false) * @param bool $logviewenabled - * optional, ether to allow acccess to webserver access/error-logs, default 0 (false) + * optional, either to allow access to webserver access/error-logs, default 0 (false) * * @access admin * @throws \Exception diff --git a/lib/Froxlor/Api/Commands/IpsAndPorts.php b/lib/Froxlor/Api/Commands/IpsAndPorts.php index 40531c0f..4f8fd1e4 100644 --- a/lib/Froxlor/Api/Commands/IpsAndPorts.php +++ b/lib/Froxlor/Api/Commands/IpsAndPorts.php @@ -65,7 +65,7 @@ class IpsAndPorts extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resour } /** - * returns the total number of accessable ip/port entries + * returns the total number of accessible ip/port entries * * @access admin * @throws \Exception diff --git a/lib/Froxlor/Api/Commands/Mysqls.php b/lib/Froxlor/Api/Commands/Mysqls.php index e4f61d47..19d95d6f 100644 --- a/lib/Froxlor/Api/Commands/Mysqls.php +++ b/lib/Froxlor/Api/Commands/Mysqls.php @@ -46,7 +46,7 @@ class Mysqls extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEnt */ public function add() { - // required paramters + // required parameters $password = $this->getParam('mysql_password'); // parameters @@ -314,7 +314,7 @@ class Mysqls extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEnt )); $id = $result['id']; - // paramters + // parameters $password = $this->getParam('mysql_password', true, ''); $databasedescription = $this->getParam('description', true, $result['description']); @@ -437,7 +437,7 @@ class Mysqls extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEnt } /** - * returns the total number of accessable databases + * returns the total number of accessible databases * * @param int $customerid * optional, admin-only, select dbs of a specific customer by id diff --git a/lib/Froxlor/Api/Commands/PhpSettings.php b/lib/Froxlor/Api/Commands/PhpSettings.php index 9d3ca362..5f0be1ee 100644 --- a/lib/Froxlor/Api/Commands/PhpSettings.php +++ b/lib/Froxlor/Api/Commands/PhpSettings.php @@ -122,7 +122,7 @@ class PhpSettings extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resour } /** - * returns the total number of accessable php-setting entries + * returns the total number of accessible php-setting entries * * @access admin * @throws \Exception diff --git a/lib/Froxlor/Api/Commands/SubDomains.php b/lib/Froxlor/Api/Commands/SubDomains.php index 3c09c6f8..cb861f9f 100644 --- a/lib/Froxlor/Api/Commands/SubDomains.php +++ b/lib/Froxlor/Api/Commands/SubDomains.php @@ -810,7 +810,7 @@ class SubDomains extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resourc } /** - * returns the total number of accessable subdomain entries + * returns the total number of accessible subdomain entries * * @param int $customerid * optional, admin-only, select (sub)domains of a specific customer by id diff --git a/lib/Froxlor/Bulk/BulkAction.php b/lib/Froxlor/Bulk/BulkAction.php index 457ef46b..fdfca799 100644 --- a/lib/Froxlor/Bulk/BulkAction.php +++ b/lib/Froxlor/Bulk/BulkAction.php @@ -150,7 +150,7 @@ abstract class BulkAction /** * reads in the csv import file and returns an array with - * all the entites to be imported + * all the entities to be imported * * @param string $separator * diff --git a/lib/Froxlor/Cli/Action/ConfigServicesAction.php b/lib/Froxlor/Cli/Action/ConfigServicesAction.php index 464e54df..a425ac3d 100644 --- a/lib/Froxlor/Cli/Action/ConfigServicesAction.php +++ b/lib/Froxlor/Cli/Action/ConfigServicesAction.php @@ -402,7 +402,7 @@ class ConfigServicesAction extends \Froxlor\Cli\Action } elseif (! file_exists($this->_args["froxlor-dir"])) { throw new \Exception("Given froxlor directory cannot be found ('" . $this->_args["froxlor-dir"] . "')"); } elseif (! is_readable($this->_args["froxlor-dir"])) { - throw new \Exception("Given froxlor direcotry cannot be read ('" . $this->_args["froxlor-dir"] . "')"); + throw new \Exception("Given froxlor directory cannot be read ('" . $this->_args["froxlor-dir"] . "')"); } } } diff --git a/lib/Froxlor/Cli/Action/SwitchServerIpAction.php b/lib/Froxlor/Cli/Action/SwitchServerIpAction.php index d4213eb4..fe6719a5 100644 --- a/lib/Froxlor/Cli/Action/SwitchServerIpAction.php +++ b/lib/Froxlor/Cli/Action/SwitchServerIpAction.php @@ -62,7 +62,7 @@ class SwitchServerIpAction extends \Froxlor\Cli\Action $ip_list = $this->_args['switch']; if (empty($ip_list) || is_bool($ip_list)) { - throw new \Exception("No paramters given for --switch action."); + throw new \Exception("No parameters given for --switch action."); } $ips_to_switch = array(); @@ -179,7 +179,7 @@ class SwitchServerIpAction extends \Froxlor\Cli\Action } elseif (! file_exists($this->_args["froxlor-dir"])) { throw new \Exception("Given froxlor directory cannot be found ('" . $this->_args["froxlor-dir"] . "')"); } elseif (! is_readable($this->_args["froxlor-dir"])) { - throw new \Exception("Given froxlor direcotry cannot be read ('" . $this->_args["froxlor-dir"] . "')"); + throw new \Exception("Given froxlor directory cannot be read ('" . $this->_args["froxlor-dir"] . "')"); } } } diff --git a/lib/Froxlor/Config/ConfigDaemon.php b/lib/Froxlor/Config/ConfigDaemon.php index f1de8b0e..1172519e 100644 --- a/lib/Froxlor/Config/ConfigDaemon.php +++ b/lib/Froxlor/Config/ConfigDaemon.php @@ -55,7 +55,7 @@ class ConfigDaemon private $isparsed = false; /** - * Sub - area of the full - XML only holding the daemon - data we are interessted in + * Sub - area of the full - XML only holding the daemon - data we are interested in * * @var \SimpleXMLElement */ diff --git a/lib/Froxlor/Cron/Http/Apache.php b/lib/Froxlor/Cron/Http/Apache.php index 9d3bb71c..9a1efe9f 100644 --- a/lib/Froxlor/Cron/Http/Apache.php +++ b/lib/Froxlor/Cron/Http/Apache.php @@ -826,7 +826,7 @@ class Apache extends HttpConfigBase // After inserting the AWStats information, // be sure to build the awstats conf file as well // and chown it using $awstats_params, #258 - // Bug 960 + Bug 970 : Use full $domain instead of custom $awstats_params as following classes depend on the informations + // Bug 960 + Bug 970 : Use full $domain instead of custom $awstats_params as following classes depend on the information \Froxlor\Http\Statistics::createAWStatsConf(Settings::Get('system.logfiles_directory') . $domain['loginname'] . $speciallogfile . '-access.log', $domain['domain'], $alias . $server_alias, $domain['customerroot'], $domain); } } diff --git a/lib/Froxlor/Cron/Http/ConfigIO.php b/lib/Froxlor/Cron/Http/ConfigIO.php index 55002285..2859b103 100644 --- a/lib/Froxlor/Cron/Http/ConfigIO.php +++ b/lib/Froxlor/Cron/Http/ConfigIO.php @@ -287,7 +287,7 @@ class ConfigIO } /** - * returns a file/direcotry from the settings and checks whether it exists + * returns a file/directory from the settings and checks whether it exists * * @param string $group * settings-group diff --git a/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php b/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php index 858b3f29..dc83ff19 100644 --- a/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php +++ b/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php @@ -287,7 +287,7 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron $our_ips = Domain::getIpsOfDomain($domain_id); foreach ($loop_domains as $idx => $domain) { $cronlog->logAction(FroxlorLogger::CRON_ACTION, LOG_INFO, "Validating DNS of " . $domain); - // ips accordint to NS + // ips according to NS $domain_ips = PhpHelper::gethostbynamel6($domain); if ($domain_ips == false || count(array_intersect($our_ips, $domain_ips)) <= 0) { // no common ips... diff --git a/lib/Froxlor/Cron/Http/Lighttpd.php b/lib/Froxlor/Cron/Http/Lighttpd.php index 5d9f6b5e..d6a08d6e 100644 --- a/lib/Froxlor/Cron/Http/Lighttpd.php +++ b/lib/Froxlor/Cron/Http/Lighttpd.php @@ -678,7 +678,7 @@ class Lighttpd extends HttpConfigBase // After inserting the AWStats information, // be sure to build the awstats conf file as well // and chown it using $awstats_params, #258 - // Bug 960 + Bug 970 : Use full $domain instead of custom $awstats_params as following classes depend on the informations + // Bug 960 + Bug 970 : Use full $domain instead of custom $awstats_params as following classes depend on the information \Froxlor\Http\Statistics::createAWStatsConf(Settings::Get('system.logfiles_directory') . $domain['loginname'] . $speciallogfile . '-access.log', $domain['domain'], $alias . $server_alias, $domain['customerroot'], $domain); } } diff --git a/lib/Froxlor/Cron/Http/Nginx.php b/lib/Froxlor/Cron/Http/Nginx.php index 8d51c0b6..e7fcc416 100644 --- a/lib/Froxlor/Cron/Http/Nginx.php +++ b/lib/Froxlor/Cron/Http/Nginx.php @@ -1153,7 +1153,7 @@ class Nginx extends HttpConfigBase // After inserting the AWStats information, // be sure to build the awstats conf file as well // and chown it using $awstats_params, #258 - // Bug 960 + Bug 970 : Use full $domain instead of custom $awstats_params as following classes depend on the informations + // Bug 960 + Bug 970 : Use full $domain instead of custom $awstats_params as following classes depend on the information \Froxlor\Http\Statistics::createAWStatsConf(Settings::Get('system.logfiles_directory') . $domain['loginname'] . $speciallogfile . '-access.log', $domain['domain'], $alias . $server_alias, $domain['customerroot'], $domain); } } diff --git a/lib/Froxlor/Cron/Http/Php/Fcgid.php b/lib/Froxlor/Cron/Http/Php/Fcgid.php index 410261e3..2cc74869 100644 --- a/lib/Froxlor/Cron/Http/Php/Fcgid.php +++ b/lib/Froxlor/Cron/Http/Php/Fcgid.php @@ -94,7 +94,7 @@ class Fcgid // Set Binary $starter_file .= "exec " . $phpconfig['binary'] . " -c " . escapeshellarg($this->getConfigDir()) . "\n"; - // remove +i attibute, so starter can be overwritten + // remove +i attribute, so starter can be overwritten if (file_exists($this->getStarterFile())) { \Froxlor\FileDir::removeImmutable($this->getStarterFile()); } diff --git a/lib/Froxlor/Cron/Traffic/TrafficCron.php b/lib/Froxlor/Cron/Traffic/TrafficCron.php index e11b2d08..4d291caa 100644 --- a/lib/Froxlor/Cron/Traffic/TrafficCron.php +++ b/lib/Froxlor/Cron/Traffic/TrafficCron.php @@ -69,7 +69,7 @@ class TrafficCron extends \Froxlor\Cron\FroxlorCron } /** - * TRAFFIC AND DISKUSAGE MESSURE + * TRAFFIC AND DISKUSAGE MEASURE */ \Froxlor\FroxlorLogger::getInstanceOf()->logAction(\Froxlor\FroxlorLogger::CRON_ACTION, LOG_INFO, 'Traffic run started...'); $admin_traffic = array(); diff --git a/lib/Froxlor/Database/Database.php b/lib/Froxlor/Database/Database.php index d0791148..fd498dee 100644 --- a/lib/Froxlor/Database/Database.php +++ b/lib/Froxlor/Database/Database.php @@ -165,7 +165,7 @@ class Database } /** - * returns the sql-access data as array using indeces + * returns the sql-access data as array using indices * 'user', 'passwd' and 'host'. * Returns false if not enabled * diff --git a/lib/Froxlor/FileDir.php b/lib/Froxlor/FileDir.php index d7a5e55c..60251b0d 100644 --- a/lib/Froxlor/FileDir.php +++ b/lib/Froxlor/FileDir.php @@ -370,7 +370,7 @@ class FileDir * @param * integer uid The uid which must match the found directories * @param - * integer gid The gid which must match the found direcotries + * integer gid The gid which must match the found directories * @param * string value the value for the input-field * @@ -461,7 +461,7 @@ class FileDir * @param int $uid * the uid which must match the found directories * @param int $gid - * the gid which must match the found direcotries + * the gid which must match the found directories * * @return array Array of found valid paths */ diff --git a/lib/Froxlor/FroxlorLogger.php b/lib/Froxlor/FroxlorLogger.php index f44e4e15..d64e8550 100644 --- a/lib/Froxlor/FroxlorLogger.php +++ b/lib/Froxlor/FroxlorLogger.php @@ -157,7 +157,7 @@ class FroxlorLogger echo "[" . $this->getLogLevelDesc($type) . "] " . $text . PHP_EOL; } - // warnings, errors and critical mesages WILL be logged + // warnings, errors and critical messages WILL be logged if (Settings::Get('logger.log_cron') == '0' && $action == \Froxlor\FroxlorLogger::CRON_ACTION && $type > LOG_WARNING) { return; } diff --git a/lib/Froxlor/SImExporter.php b/lib/Froxlor/SImExporter.php index 5a549f97..91ba149f 100644 --- a/lib/Froxlor/SImExporter.php +++ b/lib/Froxlor/SImExporter.php @@ -118,7 +118,7 @@ class SImExporter if ($_sha != sha1(var_export($_data, true))) { throw new \Exception("SHA check of import data failed. Unable to import."); } - // do not import version info - but we need that to possibily update settings + // do not import version info - but we need that to possibly update settings // when there were changes in the variable-name or similar unset($_data['panel.version']); unset($_data['panel.db_version']); diff --git a/lib/Froxlor/System/Crypt.php b/lib/Froxlor/System/Crypt.php index 7f2a9e17..34b5a771 100644 --- a/lib/Froxlor/System/Crypt.php +++ b/lib/Froxlor/System/Crypt.php @@ -59,20 +59,20 @@ class Crypt } /** - * Make crypted password from clear text password + * Make encrypted password from clear text password * * @author Michal Wojcik * @author Michael Kaufmann * @author Froxlor team (2010-) * - * 0 - default crypt (depenend on system configuration) + * 0 - default crypt (depends on system configuration) * 1 - MD5 $1$ * 2 - BLOWFISH $2y$07$ * 3 - SHA-256 $5$ (default) * 4 - SHA-512 $6$ * * @param string $password - * Password to be crypted + * Password to be encrypted * @param bool $htpasswd * optional whether to generate a SHA1 password for directory protection * diff --git a/lib/Froxlor/System/Mailer.php b/lib/Froxlor/System/Mailer.php index 0ced5466..e9d08c6c 100644 --- a/lib/Froxlor/System/Mailer.php +++ b/lib/Froxlor/System/Mailer.php @@ -7,7 +7,7 @@ class Mailer extends \PHPMailer\PHPMailer\PHPMailer { /** - * class construtor + * class constructor * * @param string $exceptions * whether to throw exceptions or not diff --git a/lib/Froxlor/User.php b/lib/Froxlor/User.php index e8e8eac3..717579e9 100644 --- a/lib/Froxlor/User.php +++ b/lib/Froxlor/User.php @@ -77,7 +77,7 @@ class User } /** - * Function which updates all counters of used ressources in panel_admins and panel_customers + * Function which updates all counters of used resources in panel_admins and panel_customers * * @param bool $returndebuginfo * Set to true to get an array with debug information @@ -237,7 +237,7 @@ class User $admin_domains = Database::pexecute_first($admin_domains_stmt, array( "aid" => $admin['adminid'] )); - // substract the amount of domains that are std-subdomains later when we iterated through all customers and know for sure + // subtract the amount of domains that are std-subdomains later when we iterated through all customers and know for sure $admin['domains_used_new'] = $admin_domains['number_domains']; // set current admin $cur_adm = $admin['adminid']; diff --git a/lib/configfiles/bionic.xml b/lib/configfiles/bionic.xml index 9d66426d..0522b429 100644 --- a/lib/configfiles/bionic.xml +++ b/lib/configfiles/bionic.xml @@ -388,7 +388,7 @@ exit "$RETVAL" # allow-axfr-ips Allow zonetransfers only to these subnets # allow-axfr-ips=127.0.0.0/8,::1, -# add these entries to the list if any speficied: +# add these entries to the list if any specified: ################################# # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. @@ -931,7 +931,7 @@ gmysql-password= # allow-axfr-ips Allow zonetransfers only to these subnets # # allow-axfr-ips=127.0.0.0/8,::1, -# add these entries to the list if any speficied: +# add these entries to the list if any specified: ################################# # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. @@ -2228,7 +2228,7 @@ debugger_command = # >$config_directory/$process_name.$process_id.log & sleep 5 # # Another possibility is to run gdb under a detached screen session. -# To attach to the screen sesssion, su root and run "screen -r +# To attach to the screen session, su root and run "screen -r # " where uniquely matches one of the detached # sessions (from "screen -list"). # @@ -2642,7 +2642,7 @@ driver = mysql # settings, like: host=sql1.host.org host=sql2.host.org # # pgsql: -# For available options, see the PostgreSQL documention for the +# For available options, see the PostgreSQL documentation for the # PQconnectdb function of libpq. # Use maxconns=n (default 5) to change how many connections Dovecot can # create to pgsql. @@ -3707,7 +3707,7 @@ protocol sieve { # # If you want UIDL compatibility with other POP3 servers, use: # UW's ipop3d : %08Xv%08Xu -# Courier : %f or %v-%u (both might be used simultaneosly) +# Courier : %f or %v-%u (both might be used simultaneously) # Cyrus (<= 2.1.3) : %u # Cyrus (>= 2.1.4) : %v.%u # Dovecot v0.99.x : %v.%u @@ -3965,7 +3965,7 @@ Port 21 # PassivePorts 49152 65534 # If your host was NATted, this option is useful in order to -# allow passive tranfers to work. You have to use your public +# allow passive transfers to work. You have to use your public # address and opening the passive ports used on your firewall as well. # MasqueradeAddress 1.2.3.4 @@ -3990,7 +3990,7 @@ Group nogroup # Umask 022 is a good standard umask to prevent new files and dirs # (second parm) from being group and world writable. Umask 022 022 -# Normally, we want files to be overwriteable. +# Normally, we want files to be overwritable. AllowOverwrite on # Uncomment this if you are using NIS or LDAP via NSS to retrieve passwords: @@ -4237,7 +4237,7 @@ SQLBackend mysql SQLEngine on SQLAuthenticate on # -# Use both a crypted or plaintext password +# Use both an encrypted or plaintext password SQLAuthTypes Crypt SQLAuthenticate users* groups* @@ -4295,7 +4295,7 @@ TLSVerifyClient off #TLSRequired on # Allow SSL/TLS renegotiations when the client requests them, but -# do not force the renegotations. Some clients do not support +# do not force the renegotiations. Some clients do not support # SSL/TLS renegotiations; when mod_tls forces a renegotiation, these # clients will close the data connection, or there will be a timeout # on an idle data connection. @@ -4595,7 +4595,7 @@ aliases: files chmod="0644"> *.log { missingok diff --git a/lib/configfiles/bullseye.xml b/lib/configfiles/bullseye.xml index 7fee323d..26de3086 100644 --- a/lib/configfiles/bullseye.xml +++ b/lib/configfiles/bullseye.xml @@ -377,7 +377,7 @@ exit "$RETVAL" # allow-axfr-ips Allow zonetransfers only to these subnets # allow-axfr-ips=127.0.0.0/8,::1, -# add these entries to the list if any speficied: +# add these entries to the list if any specified: ################################# # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. @@ -905,7 +905,7 @@ gmysql-password= # allow-axfr-ips Allow zonetransfers only to these subnets # # allow-axfr-ips=127.0.0.0/8,::1, -# add these entries to the list if any speficied: +# add these entries to the list if any specified: ################################# # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. @@ -2187,7 +2187,7 @@ debugger_command = # >$config_directory/$process_name.$process_id.log & sleep 5 # # Another possibility is to run gdb under a detached screen session. -# To attach to the screen sesssion, su root and run "screen -r +# To attach to the screen session, su root and run "screen -r # " where uniquely matches one of the detached # sessions (from "screen -list"). # @@ -4174,7 +4174,7 @@ Port 21 # PassivePorts 49152 65534 # If your host was NATted, this option is useful in order to -# allow passive tranfers to work. You have to use your public +# allow passive transfers to work. You have to use your public # address and opening the passive ports used on your firewall as well. # MasqueradeAddress 1.2.3.4 @@ -4199,7 +4199,7 @@ Group nogroup # Umask 022 is a good standard umask to prevent new files and dirs # (second parm) from being group and world writable. Umask 022 022 -# Normally, we want files to be overwriteable. +# Normally, we want files to be overwritable. AllowOverwrite on # Uncomment this if you are using NIS or LDAP via NSS to retrieve passwords: @@ -4448,7 +4448,7 @@ SQLBackend mysql SQLEngine on SQLAuthenticate on # -# Use both a crypted or plaintext password +# Use both an encrypted or plaintext password SQLAuthTypes Crypt SQLAuthenticate users* groups* @@ -4506,7 +4506,7 @@ TLSVerifyClient off #TLSRequired on # Allow SSL/TLS renegotiations when the client requests them, but -# do not force the renegotations. Some clients do not support +# do not force the renegotiations. Some clients do not support # SSL/TLS renegotiations; when mod_tls forces a renegotiation, these # clients will close the data connection, or there will be a timeout # on an idle data connection. @@ -4806,7 +4806,7 @@ aliases: files chmod="0644"> *.log { missingok diff --git a/lib/configfiles/buster.xml b/lib/configfiles/buster.xml index e3922dcf..b7b484bf 100644 --- a/lib/configfiles/buster.xml +++ b/lib/configfiles/buster.xml @@ -377,7 +377,7 @@ exit "$RETVAL" # allow-axfr-ips Allow zonetransfers only to these subnets # allow-axfr-ips=127.0.0.0/8,::1, -# add these entries to the list if any speficied: +# add these entries to the list if any specified: ################################# # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. @@ -905,7 +905,7 @@ gmysql-password= # allow-axfr-ips Allow zonetransfers only to these subnets # # allow-axfr-ips=127.0.0.0/8,::1, -# add these entries to the list if any speficied: +# add these entries to the list if any specified: ################################# # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. @@ -2187,7 +2187,7 @@ debugger_command = # >$config_directory/$process_name.$process_id.log & sleep 5 # # Another possibility is to run gdb under a detached screen session. -# To attach to the screen sesssion, su root and run "screen -r +# To attach to the screen session, su root and run "screen -r # " where uniquely matches one of the detached # sessions (from "screen -list"). # @@ -4167,7 +4167,7 @@ Port 21 # PassivePorts 49152 65534 # If your host was NATted, this option is useful in order to -# allow passive tranfers to work. You have to use your public +# allow passive transfers to work. You have to use your public # address and opening the passive ports used on your firewall as well. # MasqueradeAddress 1.2.3.4 @@ -4192,7 +4192,7 @@ Group nogroup # Umask 022 is a good standard umask to prevent new files and dirs # (second parm) from being group and world writable. Umask 022 022 -# Normally, we want files to be overwriteable. +# Normally, we want files to be overwritable. AllowOverwrite on # Uncomment this if you are using NIS or LDAP via NSS to retrieve passwords: @@ -4439,7 +4439,7 @@ SQLBackend mysql SQLEngine on SQLAuthenticate on # -# Use both a crypted or plaintext password +# Use both an encrypted or plaintext password SQLAuthTypes Crypt SQLAuthenticate users* groups* @@ -4497,7 +4497,7 @@ TLSVerifyClient off #TLSRequired on # Allow SSL/TLS renegotiations when the client requests them, but -# do not force the renegotations. Some clients do not support +# do not force the renegotiations. Some clients do not support # SSL/TLS renegotiations; when mod_tls forces a renegotiation, these # clients will close the data connection, or there will be a timeout # on an idle data connection. @@ -4797,7 +4797,7 @@ aliases: files chmod="0644"> *.log { missingok diff --git a/lib/configfiles/centos7.xml b/lib/configfiles/centos7.xml index 98307ba3..6ec83c48 100644 --- a/lib/configfiles/centos7.xml +++ b/lib/configfiles/centos7.xml @@ -226,7 +226,7 @@ query = SELECT gid FROM mail_users WHERE email = '%s' # FQDN from Froxlor mydomain = -# set myhostname to $mydomain because Froxlor alrady uses a FQDN +# set myhostname to $mydomain because Froxlor already uses a FQDN myhostname = $mydomain mydestination = $myhostname, @@ -1536,7 +1536,7 @@ protocol sieve { # # If you want UIDL compatibility with other POP3 servers, use: # UW's ipop3d : %08Xv%08Xu -# Courier : %f or %v-%u (both might be used simultaneosly) +# Courier : %f or %v-%u (both might be used simultaneously) # Cyrus (<= 2.1.3) : %u # Cyrus (>= 2.1.4) : %v.%u # Dovecot v0.99.x : %v.%u @@ -1754,7 +1754,7 @@ driver = mysql # settings, like: host=sql1.host.org host=sql2.host.org # # pgsql: -# For available options, see the PostgreSQL documention for the +# For available options, see the PostgreSQL documentation for the # PQconnectdb function of libpq. # Use maxconns=n (default 5) to change how many connections Dovecot can # create to pgsql. @@ -2237,7 +2237,7 @@ ControlsLog /var/log/proftpd/controls.log DefaultRoot ~ # Reject rootlogin (just for security) RootLogin off -# Noo need to require valid shell, because user is virtual +# No need to require valid shell, because user is virtual RequireValidShell off @@ -2447,7 +2447,7 @@ aliases: files nisplus - + @@ -2457,7 +2457,7 @@ aliases: files nisplus chmod="0644"> *.log { missingok diff --git a/lib/configfiles/centos8.xml b/lib/configfiles/centos8.xml index 207f9785..db55f89a 100644 --- a/lib/configfiles/centos8.xml +++ b/lib/configfiles/centos8.xml @@ -227,7 +227,7 @@ query = SELECT gid FROM mail_users WHERE email = '%s' # FQDN from Froxlor mydomain = -# set myhostname to $mydomain because Froxlor alrady uses a FQDN +# set myhostname to $mydomain because Froxlor already uses a FQDN myhostname = $mydomain mydestination = $myhostname, @@ -1537,7 +1537,7 @@ protocol sieve { # # If you want UIDL compatibility with other POP3 servers, use: # UW's ipop3d : %08Xv%08Xu -# Courier : %f or %v-%u (both might be used simultaneosly) +# Courier : %f or %v-%u (both might be used simultaneously) # Cyrus (<= 2.1.3) : %u # Cyrus (>= 2.1.4) : %v.%u # Dovecot v0.99.x : %v.%u @@ -1755,7 +1755,7 @@ driver = mysql # settings, like: host=sql1.host.org host=sql2.host.org # # pgsql: -# For available options, see the PostgreSQL documention for the +# For available options, see the PostgreSQL documentation for the # PQconnectdb function of libpq. # Use maxconns=n (default 5) to change how many connections Dovecot can # create to pgsql. @@ -2238,7 +2238,7 @@ ControlsLog /var/log/proftpd/controls.log DefaultRoot ~ # Reject rootlogin (just for security) RootLogin off -# Noo need to require valid shell, because user is virtual +# No need to require valid shell, because user is virtual RequireValidShell off @@ -2449,7 +2449,7 @@ aliases: files nisplus - + @@ -2459,7 +2459,7 @@ aliases: files nisplus chmod="0644"> *.log { missingok diff --git a/lib/configfiles/focal.xml b/lib/configfiles/focal.xml index 0a060b63..f0e4c462 100644 --- a/lib/configfiles/focal.xml +++ b/lib/configfiles/focal.xml @@ -375,7 +375,7 @@ exit "$RETVAL" # allow-axfr-ips Allow zonetransfers only to these subnets # allow-axfr-ips=127.0.0.0/8,::1, -# add these entries to the list if any speficied: +# add these entries to the list if any specified: ################################# # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. @@ -918,7 +918,7 @@ gmysql-password= # allow-axfr-ips Allow zonetransfers only to these subnets # # allow-axfr-ips=127.0.0.0/8,::1, -# add these entries to the list if any speficied: +# add these entries to the list if any specified: ################################# # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. @@ -2058,7 +2058,7 @@ driver = mysql # settings, like: host=sql1.host.org host=sql2.host.org # # pgsql: -# For available options, see the PostgreSQL documention for the +# For available options, see the PostgreSQL documentation for the # PQconnectdb function of libpq. # Use maxconns=n (default 5) to change how many connections Dovecot can # create to pgsql. @@ -3123,7 +3123,7 @@ protocol sieve { # # If you want UIDL compatibility with other POP3 servers, use: # UW's ipop3d : %08Xv%08Xu -# Courier : %f or %v-%u (both might be used simultaneosly) +# Courier : %f or %v-%u (both might be used simultaneously) # Cyrus (<= 2.1.3) : %u # Cyrus (>= 2.1.4) : %v.%u # Dovecot v0.99.x : %v.%u @@ -3381,7 +3381,7 @@ Port 21 # PassivePorts 49152 65534 # If your host was NATted, this option is useful in order to -# allow passive tranfers to work. You have to use your public +# allow passive transfers to work. You have to use your public # address and opening the passive ports used on your firewall as well. # MasqueradeAddress 1.2.3.4 @@ -3406,7 +3406,7 @@ Group nogroup # Umask 022 is a good standard umask to prevent new files and dirs # (second parm) from being group and world writable. Umask 022 022 -# Normally, we want files to be overwriteable. +# Normally, we want files to be overwritable. AllowOverwrite on # Uncomment this if you are using NIS or LDAP via NSS to retrieve passwords: @@ -3653,7 +3653,7 @@ SQLBackend mysql SQLEngine on SQLAuthenticate on # -# Use both a crypted or plaintext password +# Use both an encrypted or plaintext password SQLAuthTypes Crypt SQLAuthenticate users* groups* @@ -3711,7 +3711,7 @@ TLSVerifyClient off #TLSRequired on # Allow SSL/TLS renegotiations when the client requests them, but -# do not force the renegotations. Some clients do not support +# do not force the renegotiations. Some clients do not support # SSL/TLS renegotiations; when mod_tls forces a renegotiation, these # clients will close the data connection, or there will be a timeout # on an idle data connection. @@ -4019,7 +4019,7 @@ aliases: files chmod="0644"> *.log { missingok diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml index 321eb26e..afa5e295 100644 --- a/lib/configfiles/gentoo.xml +++ b/lib/configfiles/gentoo.xml @@ -398,7 +398,7 @@ mail IN A # allow-axfr-ips Allow zonetransfers only to these subnets # allow-axfr-ips=127.0.0.0/8,::1, -# add these entries to the list if any speficied: +# add these entries to the list if any specified: ################################# # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. @@ -927,7 +927,7 @@ gmysql-password= # allow-axfr-ips Allow zonetransfers only to these subnets # allow-axfr-ips=127.0.0.0/8,::1, -# add these entries to the list if any speficied: +# add these entries to the list if any specified: ################################# # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. @@ -1587,7 +1587,7 @@ sendmail_path = /usr/sbin/sendmail # FQDN from Froxlor mydomain = -# set myhostname to $mydomain because Froxlor alrady uses a FQDN +# set myhostname to $mydomain because Froxlor already uses a FQDN myhostname = $mydomain mydestination = $myhostname, @@ -3762,7 +3762,7 @@ aliases: files - + @@ -3772,7 +3772,7 @@ aliases: files chmod="0644"> *.log { missingok diff --git a/lib/configfiles/stretch.xml b/lib/configfiles/stretch.xml index 2b1bb25e..67cdce50 100644 --- a/lib/configfiles/stretch.xml +++ b/lib/configfiles/stretch.xml @@ -377,7 +377,7 @@ exit "$RETVAL" # allow-axfr-ips Allow zonetransfers only to these subnets # allow-axfr-ips=127.0.0.0/8,::1, -# add these entries to the list if any speficied: +# add these entries to the list if any specified: ################################# # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. @@ -920,7 +920,7 @@ gmysql-password= # allow-axfr-ips Allow zonetransfers only to these subnets # # allow-axfr-ips=127.0.0.0/8,::1, -# add these entries to the list if any speficied: +# add these entries to the list if any specified: ################################# # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. @@ -2217,7 +2217,7 @@ debugger_command = # >$config_directory/$process_name.$process_id.log & sleep 5 # # Another possibility is to run gdb under a detached screen session. -# To attach to the screen sesssion, su root and run "screen -r +# To attach to the screen session, su root and run "screen -r # " where uniquely matches one of the detached # sessions (from "screen -list"). # @@ -2631,7 +2631,7 @@ driver = mysql # settings, like: host=sql1.host.org host=sql2.host.org # # pgsql: -# For available options, see the PostgreSQL documention for the +# For available options, see the PostgreSQL documentation for the # PQconnectdb function of libpq. # Use maxconns=n (default 5) to change how many connections Dovecot can # create to pgsql. @@ -3696,7 +3696,7 @@ protocol sieve { # # If you want UIDL compatibility with other POP3 servers, use: # UW's ipop3d : %08Xv%08Xu -# Courier : %f or %v-%u (both might be used simultaneosly) +# Courier : %f or %v-%u (both might be used simultaneously) # Cyrus (<= 2.1.3) : %u # Cyrus (>= 2.1.4) : %v.%u # Dovecot v0.99.x : %v.%u @@ -3954,7 +3954,7 @@ Port 21 # PassivePorts 49152 65534 # If your host was NATted, this option is useful in order to -# allow passive tranfers to work. You have to use your public +# allow passive transfers to work. You have to use your public # address and opening the passive ports used on your firewall as well. # MasqueradeAddress 1.2.3.4 @@ -3979,7 +3979,7 @@ Group nogroup # Umask 022 is a good standard umask to prevent new files and dirs # (second parm) from being group and world writable. Umask 022 022 -# Normally, we want files to be overwriteable. +# Normally, we want files to be overwritable. AllowOverwrite on # Uncomment this if you are using NIS or LDAP via NSS to retrieve passwords: @@ -4226,7 +4226,7 @@ SQLBackend mysql SQLEngine on SQLAuthenticate on # -# Use both a crypted or plaintext password +# Use both an encrypted or plaintext password SQLAuthTypes Crypt SQLAuthenticate users* groups* @@ -4284,7 +4284,7 @@ TLSVerifyClient off #TLSRequired on # Allow SSL/TLS renegotiations when the client requests them, but -# do not force the renegotations. Some clients do not support +# do not force the renegotiations. Some clients do not support # SSL/TLS renegotiations; when mod_tls forces a renegotiation, these # clients will close the data connection, or there will be a timeout # on an idle data connection. @@ -4584,7 +4584,7 @@ aliases: files chmod="0644"> *.log { missingok diff --git a/lib/configfiles/xenial.xml b/lib/configfiles/xenial.xml index 19a36c33..356c469b 100644 --- a/lib/configfiles/xenial.xml +++ b/lib/configfiles/xenial.xml @@ -388,7 +388,7 @@ exit "$RETVAL" # allow-axfr-ips Allow zonetransfers only to these subnets # allow-axfr-ips=127.0.0.0/8,::1, -# add these entries to the list if any speficied: +# add these entries to the list if any specified: ################################# # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. @@ -931,7 +931,7 @@ gmysql-password= # allow-axfr-ips Allow zonetransfers only to these subnets # # allow-axfr-ips=127.0.0.0/8,::1, -# add these entries to the list if any speficied: +# add these entries to the list if any specified: ################################# # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. @@ -2228,7 +2228,7 @@ debugger_command = # >$config_directory/$process_name.$process_id.log & sleep 5 # # Another possibility is to run gdb under a detached screen session. -# To attach to the screen sesssion, su root and run "screen -r +# To attach to the screen session, su root and run "screen -r # " where uniquely matches one of the detached # sessions (from "screen -list"). # @@ -2642,7 +2642,7 @@ driver = mysql # settings, like: host=sql1.host.org host=sql2.host.org # # pgsql: -# For available options, see the PostgreSQL documention for the +# For available options, see the PostgreSQL documentation for the # PQconnectdb function of libpq. # Use maxconns=n (default 5) to change how many connections Dovecot can # create to pgsql. @@ -3707,7 +3707,7 @@ protocol sieve { # # If you want UIDL compatibility with other POP3 servers, use: # UW's ipop3d : %08Xv%08Xu -# Courier : %f or %v-%u (both might be used simultaneosly) +# Courier : %f or %v-%u (both might be used simultaneously) # Cyrus (<= 2.1.3) : %u # Cyrus (>= 2.1.4) : %v.%u # Dovecot v0.99.x : %v.%u @@ -3965,7 +3965,7 @@ Port 21 # PassivePorts 49152 65534 # If your host was NATted, this option is useful in order to -# allow passive tranfers to work. You have to use your public +# allow passive transfers to work. You have to use your public # address and opening the passive ports used on your firewall as well. # MasqueradeAddress 1.2.3.4 @@ -3990,7 +3990,7 @@ Group nogroup # Umask 022 is a good standard umask to prevent new files and dirs # (second parm) from being group and world writable. Umask 022 022 -# Normally, we want files to be overwriteable. +# Normally, we want files to be overwritable. AllowOverwrite on # Uncomment this if you are using NIS or LDAP via NSS to retrieve passwords: @@ -4237,7 +4237,7 @@ SQLBackend mysql SQLEngine on SQLAuthenticate on # -# Use both a crypted or plaintext password +# Use both an encrypted or plaintext password SQLAuthTypes Crypt SQLAuthenticate users* groups* @@ -4295,7 +4295,7 @@ TLSVerifyClient off #TLSRequired on # Allow SSL/TLS renegotiations when the client requests them, but -# do not force the renegotations. Some clients do not support +# do not force the renegotiations. Some clients do not support # SSL/TLS renegotiations; when mod_tls forces a renegotiation, these # clients will close the data connection, or there will be a timeout # on an idle data connection. @@ -4595,7 +4595,7 @@ aliases: files chmod="0644"> *.log { missingok diff --git a/lib/init.php b/lib/init.php index 7a6d8b44..84c6e627 100644 --- a/lib/init.php +++ b/lib/init.php @@ -265,7 +265,7 @@ if (isset($s) && $s != "" && $nosession != 1) { } /** - * Language Managament + * Language Management */ $langs = array(); $languages = array(); @@ -279,7 +279,7 @@ while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) { $langs[$row['language']][] = $row; // check for row[iso] cause older froxlor // versions didn't have that and it will - // lead to a lot of undfined variables + // lead to a lot of undefined variables // before the admin can even update if (isset($row['iso'])) { $iso[$row['iso']] = $row['language']; diff --git a/lng/czech.lng.php b/lng/czech.lng.php index 0b429793..0d19b467 100644 --- a/lng/czech.lng.php +++ b/lng/czech.lng.php @@ -923,7 +923,7 @@ $lng['admin']['ipsandports']['default_vhostconf_domain'] = 'Default vHost-settin $lng['serversettings']['ssl']['ssl_key_file']['title'] = 'Path to the SSL Keyfile'; $lng['serversettings']['ssl']['ssl_key_file']['description'] = 'Specify the path including the filename for the private-key file (.key mostly)'; $lng['serversettings']['ssl']['ssl_ca_file']['title'] = 'Path to the SSL CA certificate (optional)'; -$lng['serversettings']['ssl']['ssl_ca_file']['description'] = 'Client authentification, set this only if you know what it is.'; +$lng['serversettings']['ssl']['ssl_ca_file']['description'] = 'Client authentication, set this only if you know what it is.'; $lng['error']['usernamealreadyexists'] = 'The username %s already exists.'; @@ -1598,7 +1598,7 @@ $lng['admin']['ipsandports']['ssl_paste_description'] = 'Paste your complete cer $lng['admin']['ipsandports']['ssl_cert_file_content'] = 'Content of the ssl certificate'; $lng['admin']['ipsandports']['ssl_key_file_content'] = 'Content of the ssl (private-) key file'; $lng['admin']['ipsandports']['ssl_ca_file_content'] = 'Content of the ssl CA file (optional)'; -$lng['admin']['ipsandports']['ssl_ca_file_content_desc'] = '

Client authentification, set this only if you know what it is.'; +$lng['admin']['ipsandports']['ssl_ca_file_content_desc'] = '

Client authentication, set this only if you know what it is.'; $lng['admin']['ipsandports']['ssl_cert_chainfile_content'] = 'Content of the certificate chain file (optional)'; $lng['admin']['ipsandports']['ssl_cert_chainfile_content_desc'] = '

Mostly CA_Bundle, or similar, you probably want to set this if you bought a SSL certificate.'; $lng['error']['sslcertificateismissingprivatekey'] = 'You need to specify a private key for your certificate'; @@ -1608,7 +1608,7 @@ $lng['error']['sslcertificateinvalidcertkeypair'] = 'The given private-key does $lng['error']['sslcertificateinvalidca'] = 'The given CA certificate data does not seem to be a valid certificate'; $lng['error']['sslcertificateinvalidchain'] = 'The given certificate chain data does not seem to be a valid certificate'; $lng['serversettings']['customerssl_directory']['title'] = 'Webserver customer-ssl certificates-directory'; -$lng['serversettings']['customerssl_directory']['description'] = 'Where should customer-specified ssl-certificates be created?

NOTE: This folder\'s content gets deleted regulary so avoid storing data in there manually.
'; +$lng['serversettings']['customerssl_directory']['description'] = 'Where should customer-specified ssl-certificates be created?

NOTE: This folder\'s content gets deleted regularly so avoid storing data in there manually.
'; $lng['admin']['phpfpm.ininote'] = 'Not all values you may want to define can be used in the php-fpm pool configuration'; // Added in Froxlor 0.9.30 @@ -1914,7 +1914,7 @@ $lng['dnseditor']['records'] = 'záznamy'; $lng['error']['dns_notfoundorallowed'] = 'Domain not found or no permission'; $lng['serversettings']['dnseditorenable']['title'] = 'Enable DNS editor'; $lng['serversettings']['dnseditorenable']['description'] = 'Allows admins and customer to manage domain dns entries'; -$lng['dns']['howitworks'] = 'Here you can manage DNS entries for your domain. Note that froxlor will automatically generate NS/MX/A/AAAA records for you. The custom entries are prefered, only missing entries will be automatically generated.'; +$lng['dns']['howitworks'] = 'Here you can manage DNS entries for your domain. Note that froxlor will automatically generate NS/MX/A/AAAA records for you. The custom entries are preferred, only missing entries will be automatically generated.'; $lng['serversettings']['dns_server']['title'] = 'DNS server daemon'; $lng['serversettings']['dns_server']['description'] = 'Remember that daemons have to be configured using froxlors configuration templates'; @@ -1928,7 +1928,7 @@ $lng['serversettings']['panel_customer_hide_options']['description'] = 'Select i // Added in froxlor 0.9.38-rc1 $lng['serversettings']['allow_allow_customer_shell']['title'] = 'Allow customers to enable shell access for ftp-users'; -$lng['serversettings']['allow_allow_customer_shell']['description'] = 'Please note: Shell access allows the user to execute various binaries on your system. Use with extrem caution. Please only activate this if you REALLY know what you are doing!!!'; +$lng['serversettings']['allow_allow_customer_shell']['description'] = 'Please note: Shell access allows the user to execute various binaries on your system. Use with extreme caution. Please only activate this if you REALLY know what you are doing!!!'; $lng['serversettings']['available_shells']['title'] = 'List of available shells'; $lng['serversettings']['available_shells']['description'] = 'Comma separated list of shells that are available for the customer to chose from for their ftp-users.

Note that the default shell /bin/false will always be a choice (if enabled), even if this setting is empty. It is the default value for ftp-users in any case'; $lng['panel']['shell'] = 'Shell'; @@ -1989,7 +1989,7 @@ $lng['serversettings']['leapiversion']['title'] = "Choose Let's Encrypt ACME imp $lng['serversettings']['leapiversion']['description'] = "Currently only ACME v2 implementation for Let's Encrypt is supported."; $lng['admin']['phpsettings']['pass_authorizationheader'] = 'Add "-pass-header Authorization" / "CGIPassAuth On" to vhosts'; $lng['serversettings']['ssl']['ssl_protocols']['title'] = 'Configure the TLS protocol version'; -$lng['serversettings']['ssl']['ssl_protocols']['description'] = 'This is a list of ssl protocols that you want (or don\'t want) to use when using SSL. Notice: Some older browsers may not support the newest protcol versions.

Default value is:
TLSv1.2
'; +$lng['serversettings']['ssl']['ssl_protocols']['description'] = 'This is a list of ssl protocols that you want (or don\'t want) to use when using SSL. Notice: Some older browsers may not support the newest protocol versions.

Default value is:
TLSv1.2
'; $lng['serversettings']['phpfpm_settings']['limit_extensions']['title'] = 'Allowed extensions'; $lng['serversettings']['phpfpm_settings']['limit_extensions']['description'] = 'Limits the extensions of the main script FPM will allow to parse. This can prevent configuration mistakes on the web server side. You should only limit FPM to .php extensions to prevent malicious users to use other extensions to execute php code. Default value: .php'; $lng['phpfpm']['ini_flags'] = 'Enter possible php_flags for php.ini. One entry per line'; diff --git a/lng/english.lng.php b/lng/english.lng.php index e7fb8413..20379bdf 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -926,7 +926,7 @@ $lng['admin']['ipsandports']['default_vhostconf_domain'] = 'Default vHost-settin $lng['serversettings']['ssl']['ssl_key_file']['title'] = 'Path to the SSL Keyfile'; $lng['serversettings']['ssl']['ssl_key_file']['description'] = 'Specify the path including the filename for the private-key file (.key mostly)'; $lng['serversettings']['ssl']['ssl_ca_file']['title'] = 'Path to the SSL CA certificate (optional)'; -$lng['serversettings']['ssl']['ssl_ca_file']['description'] = 'Client authentification, set this only if you know what it is.'; +$lng['serversettings']['ssl']['ssl_ca_file']['description'] = 'Client authentication, set this only if you know what it is.'; $lng['error']['usernamealreadyexists'] = 'The username %s already exists.'; @@ -1601,7 +1601,7 @@ $lng['admin']['ipsandports']['ssl_paste_description'] = 'Paste your complete cer $lng['admin']['ipsandports']['ssl_cert_file_content'] = 'Content of the ssl certificate'; $lng['admin']['ipsandports']['ssl_key_file_content'] = 'Content of the ssl (private-) key file'; $lng['admin']['ipsandports']['ssl_ca_file_content'] = 'Content of the ssl CA file (optional)'; -$lng['admin']['ipsandports']['ssl_ca_file_content_desc'] = '

Client authentification, set this only if you know what it is.'; +$lng['admin']['ipsandports']['ssl_ca_file_content_desc'] = '

Client authentication, set this only if you know what it is.'; $lng['admin']['ipsandports']['ssl_cert_chainfile_content'] = 'Content of the certificate chain file (optional)'; $lng['admin']['ipsandports']['ssl_cert_chainfile_content_desc'] = '

Mostly CA_Bundle, or similar, you probably want to set this if you bought a SSL certificate.'; $lng['error']['sslcertificateismissingprivatekey'] = 'You need to specify a private key for your certificate'; @@ -1611,7 +1611,7 @@ $lng['error']['sslcertificateinvalidcertkeypair'] = 'The given private-key does $lng['error']['sslcertificateinvalidca'] = 'The given CA certificate data does not seem to be a valid certificate'; $lng['error']['sslcertificateinvalidchain'] = 'The given certificate chain data does not seem to be a valid certificate'; $lng['serversettings']['customerssl_directory']['title'] = 'Webserver customer-ssl certificates-directory'; -$lng['serversettings']['customerssl_directory']['description'] = 'Where should customer-specified ssl-certificates be created?

NOTE: This folder\'s content gets deleted regulary so avoid storing data in there manually.
'; +$lng['serversettings']['customerssl_directory']['description'] = 'Where should customer-specified ssl-certificates be created?

NOTE: This folder\'s content gets deleted regularly so avoid storing data in there manually.
'; $lng['admin']['phpfpm.ininote'] = 'Not all values you may want to define can be used in the php-fpm pool configuration'; // Added in Froxlor 0.9.30 @@ -1918,7 +1918,7 @@ $lng['dnseditor']['records'] = 'records'; $lng['error']['dns_notfoundorallowed'] = 'Domain not found or no permission'; $lng['serversettings']['dnseditorenable']['title'] = 'Enable DNS editor'; $lng['serversettings']['dnseditorenable']['description'] = 'Allows admins and customer to manage domain dns entries'; -$lng['dns']['howitworks'] = 'Here you can manage DNS entries for your domain. Note that froxlor will automatically generate NS/MX/A/AAAA records for you. The custom entries are prefered, only missing entries will be automatically generated.'; +$lng['dns']['howitworks'] = 'Here you can manage DNS entries for your domain. Note that froxlor will automatically generate NS/MX/A/AAAA records for you. The custom entries are preferred, only missing entries will be automatically generated.'; $lng['serversettings']['dns_server']['title'] = 'DNS server daemon'; $lng['serversettings']['dns_server']['description'] = 'Remember that daemons have to be configured using froxlors configuration templates'; @@ -1993,7 +1993,7 @@ $lng['serversettings']['leapiversion']['title'] = "Choose Let's Encrypt ACME imp $lng['serversettings']['leapiversion']['description'] = "Currently only ACME v2 implementation for Let's Encrypt is supported."; $lng['admin']['phpsettings']['pass_authorizationheader'] = 'Add "-pass-header Authorization" / "CGIPassAuth On" to vhosts'; $lng['serversettings']['ssl']['ssl_protocols']['title'] = 'Configure the TLS protocol version'; -$lng['serversettings']['ssl']['ssl_protocols']['description'] = 'This is a list of ssl protocols that you want (or don\'t want) to use when using SSL. Notice: Some older browsers may not support the newest protcol versions.

Default value is:
TLSv1.2
'; +$lng['serversettings']['ssl']['ssl_protocols']['description'] = 'This is a list of ssl protocols that you want (or don\'t want) to use when using SSL. Notice: Some older browsers may not support the newest protocol versions.

Default value is:
TLSv1.2
'; $lng['serversettings']['phpfpm_settings']['limit_extensions']['title'] = 'Allowed extensions'; $lng['serversettings']['phpfpm_settings']['limit_extensions']['description'] = 'Limits the extensions of the main script FPM will allow to parse. This can prevent configuration mistakes on the web server side. You should only limit FPM to .php extensions to prevent malicious users to use other extensions to execute php code. Default value: .php'; $lng['phpfpm']['ini_flags'] = 'Enter possible php_flags for php.ini. One entry per line'; diff --git a/templates/Sparkle/assets/js/circular.js b/templates/Sparkle/assets/js/circular.js index 085743bf..f755c7e6 100644 --- a/templates/Sparkle/assets/js/circular.js +++ b/templates/Sparkle/assets/js/circular.js @@ -56,7 +56,7 @@ $(document).ready(function() { // Draw percentages if (!isNaN(assigned) && available == "∞") { - // Unlimited ressource and assigned + // Unlimited resource and assigned if (assigned > used) { // Draw assigned as full circle circularCircle(canvas, 38, 0, 270, 4, assiColor); @@ -77,7 +77,7 @@ $(document).ready(function() { } circularText(canvas, 60, 42, 26, "∞"); } else if (!isNaN(assigned)) { - // Limited ressources but assigned + // Limited resources but assigned available = parseFloat(available); assignedP = Math.round(100 / available * assigned); @@ -92,7 +92,7 @@ $(document).ready(function() { circularCircle(canvas, 40, 0, 270, 8, unliColor); circularText(canvas, 60, 42, 26, "∞"); } else { - // Limited ressources + // Limited resources available = parseFloat(available); usedP = 100 / available * used; if (usedP < 1 && usedP > 0) {