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

Fix typos found by codespell

Browse Source 
Fix also a grammar issue.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil
2015-07-29 22:39:31 +02:00
parent 0939d032a5
commit fe5ab0d8da
10 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
index.php
View File

@@ -119,7 +119,7 @@ if ($action == 'login') {
redirectTo('index.php', array('showmessage' => '3')); redirectTo('index.php', array('showmessage' => '3'));
exit; exit;
} elseif (validatePasswordLogin($userinfo, $password, $table, $uid)) { } elseif (validatePasswordLogin($userinfo, $password, $table, $uid)) {
// only show "you're banned" if the login was successfull // only show "you're banned" if the login was successful
// because we don't want to publish that the user does exist // because we don't want to publish that the user does exist
if ($userinfo['deactivated']) { if ($userinfo['deactivated']) {
unset($userinfo); unset($userinfo);

2
install/lib/class.FroxlorInstall.php
View File

@@ -1238,7 +1238,7 @@ class FroxlorInstall {
// this is faster than calling count($tokens) every time through the loop. // this is faster than calling count($tokens) every time through the loop.
$token_count = count($tokens); $token_count = count($tokens);
for ($i = 0; $i < $token_count; $i++) { for ($i = 0; $i < $token_count; $i++) {
// Don't wanna add an empty string as the last thing in the array. // Don't want to add an empty string as the last thing in the array.
if (($i != ($token_count - 1)) if (($i != ($token_count - 1))
|| (strlen($tokens[$i] > 0)) || (strlen($tokens[$i] > 0))
) { ) {

8
lib/classes/bulk/class.DomainBulkAction.php
View File

@@ -301,7 +301,7 @@ class DomainBulkAction
), '', $domain_data['aliasdomain'])); ), '', $domain_data['aliasdomain']));
// validate alias-domain // validate alias-domain
if (! validateDomain($domain_data['aliasdomain'])) { if (! validateDomain($domain_data['aliasdomain'])) {
// invalid-domain lol - skip to be sure we dont add anything weird // invalid-domain lol - skip to be sure we don't add anything weird
return false; return false;
} }
// does the domain we want to be an alias of exists? // does the domain we want to be an alias of exists?
@@ -409,12 +409,12 @@ class DomainBulkAction
// write back iplist // write back iplist
$iplist = implode(",", $result_iplist); $iplist = implode(",", $result_iplist);
// dont need that for the domain-insert-statement // don't need that for the domain-insert-statement
unset($domain_data['ips']); unset($domain_data['ips']);
// remember use_ssl value // remember use_ssl value
$use_ssl = (bool)$domain_data['use_ssl']; $use_ssl = (bool)$domain_data['use_ssl'];
// dont need that for the domain-insert-statement // don't need that for the domain-insert-statement
unset($domain_data['use_ssl']); unset($domain_data['use_ssl']);
// finally ADD the domain to panel_domains // finally ADD the domain to panel_domains
@@ -480,7 +480,7 @@ class DomainBulkAction
$tmp_arr = explode($separator, $line); $tmp_arr = explode($separator, $line);
$data_arr = array(); $data_arr = array();
foreach ($tmp_arr as $idx => $data) { foreach ($tmp_arr as $idx => $data) {
// dont include more fields that the ones we use // don't include more fields than the ones we use
if ($idx > (count($this->_required_fields) - 4)) // off-by-one + 3 auto-values if ($idx > (count($this->_required_fields) - 4)) // off-by-one + 3 auto-values
break; break;
$data_arr[$this->_required_fields[$idx]] = $data; $data_arr[$this->_required_fields[$idx]] = $data;

20
lib/classes/idna/class.idna_convert.php
View File

@@ -43,7 +43,7 @@
* *
* Unicode input might be given as either UTF-8 string, UCS-4 string or UCS-4 array. * Unicode input might be given as either UTF-8 string, UCS-4 string or UCS-4 array.
* Unicode output is available in the same formats. * Unicode output is available in the same formats.
* You can select your preferred format via {@link set_paramter()}. * You can select your preferred format via {@link set_parameter()}.
* *
* ACE input and output is always expected to be ASCII. * ACE input and output is always expected to be ASCII.
* *
@@ -79,7 +79,7 @@ class idna_convert {
protected $_scount = 11172; // _lcount * _tcount * _vcount protected $_scount = 11172; // _lcount * _tcount * _vcount
protected $_error = false; protected $_error = false;
protected static $_mb_string_overload = null; protected static $_mb_string_overload = null;
// See {@link set_paramter()} for details of how to change the following // See {@link set_parameter()} for details of how to change the following
// settings from within your script / application // settings from within your script / application
protected $_api_encoding = 'utf8'; // Default input charset is UTF-8 protected $_api_encoding = 'utf8'; // Default input charset is UTF-8
protected $_allow_overlong = false; // Overlong UTF-8 encodings are forbidden protected $_allow_overlong = false; // Overlong UTF-8 encodings are forbidden
@@ -393,9 +393,9 @@ class idna_convert {
} }
/** /**
* Use this method to get the last error ocurred * Use this method to get the last error occurred
* @param void * @param void
* @return string The last error, that occured * @return string The last error, that occurred
*/ */
public function get_last_error() public function get_last_error()
{ {
@@ -421,7 +421,7 @@ class idna_convert {
$this->_error('The given encoded string was empty'); $this->_error('The given encoded string was empty');
return false; return false;
} }
// Find last occurence of the delimiter // Find last occurrence of the delimiter
$delim_pos = strrpos($encoded, '-'); $delim_pos = strrpos($encoded, '-');
if ($delim_pos > self::byteLength($this->_punycode_prefix)) { if ($delim_pos > self::byteLength($this->_punycode_prefix)) {
for ($k = self::byteLength($this->_punycode_prefix); $k < $delim_pos; ++$k) { for ($k = self::byteLength($this->_punycode_prefix); $k < $delim_pos; ++$k) {
@@ -622,7 +622,7 @@ class idna_convert {
// Mapping // Mapping
// Walking through the input array, performing the required steps on each of // Walking through the input array, performing the required steps on each of
// the input chars and putting the result into the output array // the input chars and putting the result into the output array
// While mapping required chars we apply the cannonical ordering // While mapping required chars we apply the canonical ordering
foreach ($input as $v) { foreach ($input as $v) {
// Map to nothing == skip that code point // Map to nothing == skip that code point
if (in_array($v, self::$NP['map_nothing'])) { if (in_array($v, self::$NP['map_nothing'])) {
@@ -646,11 +646,11 @@ class idna_convert {
$output[] = (int) $out; $output[] = (int) $out;
} }
} elseif (($this->_idn_version == '2003') && isset(self::$NP['replacemaps_2003'][$v])) { } elseif (($this->_idn_version == '2003') && isset(self::$NP['replacemaps_2003'][$v])) {
foreach ($this->_apply_cannonical_ordering(self::$NP['replacemaps_2003'][$v]) as $out) { foreach ($this->_apply_canonical_ordering(self::$NP['replacemaps_2003'][$v]) as $out) {
$output[] = (int) $out; $output[] = (int) $out;
} }
} elseif (($this->_idn_version == '2008') && isset(self::$NP['replacemaps'][$v])) { } elseif (($this->_idn_version == '2008') && isset(self::$NP['replacemaps'][$v])) {
foreach ($this->_apply_cannonical_ordering(self::$NP['replacemaps'][$v]) as $out) { foreach ($this->_apply_canonical_ordering(self::$NP['replacemaps'][$v]) as $out) {
$output[] = (int) $out; $output[] = (int) $out;
} }
} else { } else {
@@ -773,11 +773,11 @@ class idna_convert {
} }
/** /**
* Applies the cannonical ordering of a decomposed UCS4 sequence * Applies the canonical ordering of a decomposed UCS4 sequence
* @param array Decomposed UCS4 sequence * @param array Decomposed UCS4 sequence
* @return array Ordered USC4 sequence * @return array Ordered USC4 sequence
*/ */
protected function _apply_cannonical_ordering($input) protected function _apply_canonical_ordering($input)
{ {
$swap = true; $swap = true;
$size = count($input); $size = count($input);

4
lib/classes/webserver/class.ConfigIO.php
View File

@@ -178,7 +178,7 @@ class ConfigIO {
$awstatsclean['path'] = $this->_getFile('system', 'awstats_conf'); $awstatsclean['path'] = $this->_getFile('system', 'awstats_conf');
/** /**
* dont do anyting if the directory not exists * don't do anything if the directory does not exist
* (e.g. awstats not installed yet or whatever) * (e.g. awstats not installed yet or whatever)
* fixes #45 * fixes #45
*/ */
@@ -187,7 +187,7 @@ class ConfigIO {
while ($awstatsclean['entry'] = $awstatsclean['dir']->read()) { while ($awstatsclean['entry'] = $awstatsclean['dir']->read()) {
$awstatsclean['fullentry'] = makeCorrectFile($awstatsclean['path'].'/'.$awstatsclean['entry']); $awstatsclean['fullentry'] = makeCorrectFile($awstatsclean['path'].'/'.$awstatsclean['entry']);
/** /**
* dont do anything if the file does not exist * don't do anything if the file does not exist
*/ */
if (@file_exists($awstatsclean['fullentry'])) { if (@file_exists($awstatsclean['fullentry'])) {
$awstatsclean['fh'] = fopen($awstatsclean['fullentry'], 'r'); $awstatsclean['fh'] = fopen($awstatsclean['fullentry'], 'r');

4
lib/configfiles/jessie.xml
View File

@@ -3789,7 +3789,7 @@ MySQLGetQTASZ SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_cus
# If you're using a transactionnal storage engine, you can enable SQL # If you're using a transactionnal storage engine, you can enable SQL
# transactions to avoid races. Leave this commented if you are using the # transactions to avoid races. Leave this commented if you are using the
# traditionnal MyIsam engine. # traditional MyIsam engine.
# MySQLTransactions On # MySQLTransactions On
]]> ]]>
@@ -4022,7 +4022,7 @@ aliases: files
<commands index="1"> <commands index="1">
<visibility mode="equals" value="apache2">{{settings.system.webserver}} <visibility mode="equals" value="apache2">{{settings.system.webserver}}
</visibility> </visibility>
<command><![CDATA[# add "non-free" after all occurances of "main" in /etc/apt/sources.list]]></command> <command><![CDATA[# add "non-free" after all occurrences of "main" in /etc/apt/sources.list]]></command>
<command><![CDATA[# this is needed for libapache2-mod-fastcgi to install]]></command> <command><![CDATA[# this is needed for libapache2-mod-fastcgi to install]]></command>
</commands> </commands>
<install> <install>

2
lib/configfiles/precise.xml
View File

@@ -1579,7 +1579,7 @@ aliases: files
<commands index="1"> <commands index="1">
<visibility mode="equals" value="apache2">{{settings.system.webserver}} <visibility mode="equals" value="apache2">{{settings.system.webserver}}
</visibility> </visibility>
<command><![CDATA[# add "non-free" after all occurances of "main" in /etc/apt/sources.list]]></command> <command><![CDATA[# add "non-free" after all occurrences of "main" in /etc/apt/sources.list]]></command>
<command><![CDATA[# this is needed for libapache2-mod-fastcgi to install]]></command> <command><![CDATA[# this is needed for libapache2-mod-fastcgi to install]]></command>
</commands> </commands>
<install> <install>

2
lib/configfiles/trusty.xml
View File

@@ -1573,7 +1573,7 @@ aliases: files
<commands index="1"> <commands index="1">
<visibility mode="equals" value="apache2">{{settings.system.webserver}} <visibility mode="equals" value="apache2">{{settings.system.webserver}}
</visibility> </visibility>
<command><![CDATA[# add "non-free" after all occurances of "main" in /etc/apt/sources.list]]></command> <command><![CDATA[# add "non-free" after all occurrences of "main" in /etc/apt/sources.list]]></command>
<command><![CDATA[# this is needed for libapache2-mod-fastcgi to install]]></command> <command><![CDATA[# this is needed for libapache2-mod-fastcgi to install]]></command>
</commands> </commands>
<install> <install>

4
lib/configfiles/wheezy.xml
View File

@@ -4860,7 +4860,7 @@ MySQLGetQTASZ SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_cus
# If you're using a transactionnal storage engine, you can enable SQL # If you're using a transactionnal storage engine, you can enable SQL
# transactions to avoid races. Leave this commented if you are using the # transactions to avoid races. Leave this commented if you are using the
# traditionnal MyIsam engine. # traditional MyIsam engine.
# MySQLTransactions On # MySQLTransactions On
]]> ]]>
@@ -5089,7 +5089,7 @@ aliases: files
<commands index="1"> <commands index="1">
<visibility mode="equals" value="apache2">{{settings.system.webserver}} <visibility mode="equals" value="apache2">{{settings.system.webserver}}
</visibility> </visibility>
<command><![CDATA[# add "non-free" after all occurances of "main" in /etc/apt/sources.list]]></command> <command><![CDATA[# add "non-free" after all occurrences of "main" in /etc/apt/sources.list]]></command>
<command><![CDATA[# this is needed for libapache2-mod-fastcgi to install]]></command> <command><![CDATA[# this is needed for libapache2-mod-fastcgi to install]]></command>
</commands> </commands>
<install> <install>

4
lib/cron_init.php
View File

@@ -201,10 +201,10 @@ if (Settings::Get('panel.version') == null
*/ */
$cronlog->logAction(CRON_ACTION, LOG_WARNING, 'Automatic update is activated and we are going to proceed without any notices'); $cronlog->logAction(CRON_ACTION, LOG_WARNING, 'Automatic update is activated and we are going to proceed without any notices');
$cronlog->logAction(CRON_ACTION, LOG_WARNING, 'all new settings etc. will be stored with the default value, that might not always be right for your system!'); $cronlog->logAction(CRON_ACTION, LOG_WARNING, 'all new settings etc. will be stored with the default value, that might not always be right for your system!');
$cronlog->logAction(CRON_ACTION, LOG_WARNING, 'If you dont want this to happen in the future consider removing the --allow-autoupdate flag from the cronjob'); $cronlog->logAction(CRON_ACTION, LOG_WARNING, "If you don't want this to happen in the future consider removing the --allow-autoupdate flag from the cronjob");
fwrite($debugHandler, '*** WARNING *** - Automatic update is activated and we are going to proceed without any notices' . "\n"); fwrite($debugHandler, '*** WARNING *** - Automatic update is activated and we are going to proceed without any notices' . "\n");
fwrite($debugHandler, '*** WARNING *** - all new settings etc. will be stored with the default value, that might not always be right for your system!' . "\n"); fwrite($debugHandler, '*** WARNING *** - all new settings etc. will be stored with the default value, that might not always be right for your system!' . "\n");
fwrite($debugHandler, '*** WARNING *** - If you dont want this to happen in the future consider removing the --allow-autoupdate flag from the cronjob' . "\n"); fwrite($debugHandler, "*** WARNING *** - If you don't want this to happen in the future consider removing the --allow-autoupdate flag from the cronjob\n");
// including update procedures // including update procedures
include_once FROXLOR_INSTALL_DIR.'/install/updatesql.php'; include_once FROXLOR_INSTALL_DIR.'/install/updatesql.php';
// pew - everything went better than expected // pew - everything went better than expected