diff --git a/awstats/alternc-awstats b/awstats/alternc-awstats index 739c4eca..9f5b4347 100755 --- a/awstats/alternc-awstats +++ b/awstats/alternc-awstats @@ -4,7 +4,7 @@ # Appelé avec "all" lance les stats avec tous les fichiers .gz situés dans /var/log/apache # Appelé avec un nom de domaine en paramètre, rescanne tous les fichiers .gz pour ce domaine uniquement. -# Include some usefull functions +# Include some usefull functions . /usr/lib/alternc/functions.sh # Regenerate the awstat etc cache files : diff --git a/bureau/admin/adm_list.php b/bureau/admin/adm_list.php index 447d05cd..1bcadeda 100644 --- a/bureau/admin/adm_list.php +++ b/bureau/admin/adm_list.php @@ -160,7 +160,7 @@ while (list($key,$val)=each($r)) { ">  " value="" /> - + > ">  diff --git a/bureau/admin/dom_edit.php b/bureau/admin/dom_edit.php index 6ffd39e6..068258f9 100644 --- a/bureau/admin/dom_edit.php +++ b/bureau/admin/dom_edit.php @@ -79,7 +79,7 @@ function destruction_alert() { if (document.forms["fdns"].email[1].checked) { if ( confirm("") ) { return true; - } else { + } else { return false; } } else { diff --git a/bureau/admin/mailautoconfig_outlook.php b/bureau/admin/mailautoconfig_outlook.php index 4f572c33..e924e676 100644 --- a/bureau/admin/mailautoconfig_outlook.php +++ b/bureau/admin/mailautoconfig_outlook.php @@ -2,7 +2,7 @@ require_once("../class/config_nochk.php"); # Test it : -# wget http://FQDN/mailautoconfig_outlook.php -O - --post-data="test@example.tls" -q +# wget http://FQDN/mailautoconfig_outlook.php -O - --post-data="test@example.tls" -q // Created by Alesandro Slepcevic - alesandro@plus.hr if ( $_SERVER['REQUEST_METHOD'] === 'POST' ){ diff --git a/bureau/class/m_mail.php b/bureau/class/m_mail.php index 808652b9..70552b57 100644 --- a/bureau/class/m_mail.php +++ b/bureau/class/m_mail.php @@ -861,7 +861,7 @@ ORDER BY /* ----------------------------------------------------------------- */ /** hook function called by AlternC when a domain is created for * the current user account - * This function create a postmaster mail which is an alias to LOGIN @ FQDN + * This function create a postmaster mail which is an alias to LOGIN @ FQDN * wich is a dynamic alias to the alternc's account mail * @param string $domain_id Domain that has just been created * @access private diff --git a/etc/alternc/templates/alternc/apache2.conf b/etc/alternc/templates/alternc/apache2.conf index b84af7db..795a1075 100644 --- a/etc/alternc/templates/alternc/apache2.conf +++ b/etc/alternc/templates/alternc/apache2.conf @@ -1,6 +1,6 @@ # AUTO GENERATED FILE # Modify template in /etc/alternc/templates/ -# and launch alternc.install if you want +# and launch alternc.install if you want # to modify this file. # # This module is loaded in /etc/apache/modules, and enabled by apache-modconf @@ -55,7 +55,7 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ php_admin_value sendmail_path /usr/lib/alternc/sendmail # Default upload_tmp_dir is /tmp . Be carefull, this value MUST be surcharged - # by the vhost to be a directory INSIDE the home of the user. If you don't do + # by the vhost to be a directory INSIDE the home of the user. If you don't do # that, ACLs could be "strange" or inexistent. php_admin_value upload_tmp_dir /tmp diff --git a/etc/alternc/templates/alternc/apache_logformat.conf b/etc/alternc/templates/alternc/apache_logformat.conf index 1fd79a87..7e160721 100644 --- a/etc/alternc/templates/alternc/apache_logformat.conf +++ b/etc/alternc/templates/alternc/apache_logformat.conf @@ -1,6 +1,6 @@ # AUTO GENERATED FILE # Modify template in /etc/alternc/templates/ -# and launch alternc.install if you want +# and launch alternc.install if you want # to modify this file. # diff --git a/etc/alternc/templates/alternc/phpmyadmin.inc.php b/etc/alternc/templates/alternc/phpmyadmin.inc.php index 3180317c..ccea46b2 100644 --- a/etc/alternc/templates/alternc/phpmyadmin.inc.php +++ b/etc/alternc/templates/alternc/phpmyadmin.inc.php @@ -2,7 +2,7 @@ # AUTO GENERATED FILE # Modify template in /etc/alternc/templates/ -# and launch alternc.install if you want +# and launch alternc.install if you want # to modify this file. /** diff --git a/etc/alternc/templates/apache2/envvars b/etc/alternc/templates/apache2/envvars index e52236c1..e7dda7ae 100644 --- a/etc/alternc/templates/apache2/envvars +++ b/etc/alternc/templates/apache2/envvars @@ -1,6 +1,6 @@ # AUTO GENERATED FILE # Modify template in /etc/alternc/templates/ -# and launch alternc.install if you want +# and launch alternc.install if you want # to modify this file. # # envvars - default environment variables for apache2ctl diff --git a/etc/alternc/templates/dovecot/dovecot-dict-quota.conf b/etc/alternc/templates/dovecot/dovecot-dict-quota.conf index 2832f501..b22e98ef 100644 --- a/etc/alternc/templates/dovecot/dovecot-dict-quota.conf +++ b/etc/alternc/templates/dovecot/dovecot-dict-quota.conf @@ -1,6 +1,6 @@ # AUTO GENERATED FILE # Modify template in /etc/alternc/templates/ -# and launch alternc.install if you want +# and launch alternc.install if you want # to modify this file. # diff --git a/etc/alternc/templates/dovecot/dovecot-sql.conf b/etc/alternc/templates/dovecot/dovecot-sql.conf index 232980a8..befef217 100644 --- a/etc/alternc/templates/dovecot/dovecot-sql.conf +++ b/etc/alternc/templates/dovecot/dovecot-sql.conf @@ -1,6 +1,6 @@ # AUTO GENERATED FILE # Modify template in /etc/alternc/templates/ -# and launch alternc.install if you want +# and launch alternc.install if you want # to modify this file. # diff --git a/etc/alternc/templates/dovecot/dovecot.conf b/etc/alternc/templates/dovecot/dovecot.conf index 1521bf45..4af42e21 100644 --- a/etc/alternc/templates/dovecot/dovecot.conf +++ b/etc/alternc/templates/dovecot/dovecot.conf @@ -1,6 +1,6 @@ # AUTO GENERATED FILE # Modify template in /etc/alternc/templates/ -# and launch alternc.install if you want +# and launch alternc.install if you want # to modify this file. # ## Dovecot configuration file diff --git a/etc/alternc/templates/postfix/master.cf b/etc/alternc/templates/postfix/master.cf index c140795b..5840dae2 100644 --- a/etc/alternc/templates/postfix/master.cf +++ b/etc/alternc/templates/postfix/master.cf @@ -1,6 +1,6 @@ # AUTO GENERATED FILE # Modify template in /etc/alternc/templates/ -# and launch alternc.install if you want +# and launch alternc.install if you want # to modify this file. # # diff --git a/etc/alternc/templates/postfix/myalias.cf b/etc/alternc/templates/postfix/myalias.cf index 243e228b..be86eea3 100644 --- a/etc/alternc/templates/postfix/myalias.cf +++ b/etc/alternc/templates/postfix/myalias.cf @@ -1,6 +1,6 @@ # AUTO GENERATED FILE # Modify template in /etc/alternc/templates/ -# and launch alternc.install if you want +# and launch alternc.install if you want # to modify this file. # diff --git a/etc/alternc/templates/postfix/mydomain.cf b/etc/alternc/templates/postfix/mydomain.cf index bbebdc95..2e048d25 100644 --- a/etc/alternc/templates/postfix/mydomain.cf +++ b/etc/alternc/templates/postfix/mydomain.cf @@ -1,6 +1,6 @@ # AUTO GENERATED FILE # Modify template in /etc/alternc/templates/ -# and launch alternc.install if you want +# and launch alternc.install if you want # to modify this file. # diff --git a/etc/alternc/templates/postfix/mygid.cf b/etc/alternc/templates/postfix/mygid.cf index f2941883..66a0af85 100644 --- a/etc/alternc/templates/postfix/mygid.cf +++ b/etc/alternc/templates/postfix/mygid.cf @@ -1,6 +1,6 @@ # AUTO GENERATED FILE # Modify template in /etc/alternc/templates/ -# and launch alternc.install if you want +# and launch alternc.install if you want # to modify this file. # diff --git a/etc/alternc/templates/proftpd/proftpd.conf b/etc/alternc/templates/proftpd/proftpd.conf index c8fc10f5..7d55ba68 100644 --- a/etc/alternc/templates/proftpd/proftpd.conf +++ b/etc/alternc/templates/proftpd/proftpd.conf @@ -73,8 +73,8 @@ SQLAuthenticate users AuthPAM off # What this SQL query do : -# - check if there is IP limitation for this account. If there isn't, allow everyone (by returning a TRUE) -# - if there is some limitation : +# - check if there is IP limitation for this account. If there isn't, allow everyone (by returning a TRUE) +# - if there is some limitation : # - convert ip to integer (if convert impossible, it's an ipv6. Mysql6 will have ipv6 function, for mysql5 alternc create some function) # - calculate the last IP of the subnet. If the subnet is 32, return the original IP # - check that the user's ip is in an allowed range diff --git a/install/alternc.install b/install/alternc.install index 20ae7c36..3434b354 100644 --- a/install/alternc.install +++ b/install/alternc.install @@ -404,7 +404,7 @@ if ! grep -e "${include_str/\"/\\\"}" $pma_config > /dev/null 2>&1; then fi # Le template de /etc/alternc/phpmyadmin.inc.php viens d'être réappliqué, on -# regénére la liste des serveurs MySQL disponible dedans. +# regénére la liste des serveurs MySQL disponible dedans. mysql_query "select id,host,name from db_servers;" | while read id host name ; do echo " // Server #$id in db_servers diff --git a/install/upgrade_check.sh b/install/upgrade_check.sh index 309ba34b..011937da 100755 --- a/install/upgrade_check.sh +++ b/install/upgrade_check.sh @@ -70,7 +70,7 @@ for file in $( ls $extensions | sort -n ) ; do sh $file || true ;; *) - # Do nothing + # Do nothing ;; esac fi diff --git a/src/alternc_reload b/src/alternc_reload index 005b6964..2f10f4aa 100755 --- a/src/alternc_reload +++ b/src/alternc_reload @@ -73,7 +73,7 @@ if [ ! -z "$RELOAD_ZONES" ]; then apache_reload ;; *) - # FIXME: should reload only concerned zones + # FIXME: should reload only concerned zones #$sudo rndc reload "$zone" || echo "Cannot reload bind for zone $zone" $sudo rndc reload || echo "Cannot reload bind for zone $zone" ;; diff --git a/src/functions_hosting.sh b/src/functions_hosting.sh index 88bc639c..7c163fb5 100644 --- a/src/functions_hosting.sh +++ b/src/functions_hosting.sh @@ -30,7 +30,7 @@ launch_hooks() { } host_conffile() { - # Return the absolute path of a conf file for a FQDN + # Return the absolute path of a conf file for a FQDN local FQDN="$1" local U_ID=$(get_uid_by_domain "$FQDN") local CONFFILE="$VHOST_DIR/${U_ID:(-1)}/$U_ID/$FQDN.conf" diff --git a/src/lxc_stopexpired.php b/src/lxc_stopexpired.php index 50ad9bcc..195ab504 100755 --- a/src/lxc_stopexpired.php +++ b/src/lxc_stopexpired.php @@ -32,7 +32,7 @@ require_once("/usr/share/alternc/panel/class/config_nochk.php"); $admin->stop_if_jobs_locked(); -# Be super user +# Be super user #$mem->setid(2000); $admin->enabled=1; diff --git a/src/quota_get b/src/quota_get index 7e94e783..2558544e 100755 --- a/src/quota_get +++ b/src/quota_get @@ -23,7 +23,7 @@ command -v $QUOTA >/dev/null || { echo "Quotas uninstalled"; exit 0; } # The second line is the one interesting # We look precisely on the HTML directory. Why ? because it's surely -# the bigger one, and if someone separate it we need to look this one +# the bigger one, and if someone separate it we need to look this one # particulary. It should be interesting to cumulate quota of all mounted directory. DATA_PART=`$DF "${ALTERNC_HTML}" 2>/dev/null | $AWK 'NR==2 { print $1 }'` diff --git a/src/update_mails.sh b/src/update_mails.sh index 2ea9e577..2064b8ff 100755 --- a/src/update_mails.sh +++ b/src/update_mails.sh @@ -58,7 +58,7 @@ mysql_query "SELECT id, address_id, quote(replace(path,'!','\\!')) FROM mailbox # Other case, do nothing if [ -d "${path//\'/}" ] ; then $ionice rm -rf "${path//\'/}" && mysql_query "DELETE FROM mailbox WHERE id=$id AND mail_action='DELETING';" - # Do the rm again in case of newly added file during delete. Should not be usefull + # Do the rm again in case of newly added file during delete. Should not be usefull test -d "${path//\'/}" && $ionice rm -rf "${path//\'/}" else mysql_query "DELETE FROM mailbox WHERE id=$id AND mail_action='DELETING';" diff --git a/wheezy/originals/alternc.install b/wheezy/originals/alternc.install index a4050940..9ebdd1c5 100644 --- a/wheezy/originals/alternc.install +++ b/wheezy/originals/alternc.install @@ -399,7 +399,7 @@ if ! grep -e "${include_str/\"/\\\"}" $pma_config > /dev/null 2>&1; then fi # Le template de /etc/alternc/phpmyadmin.inc.php viens d'être réappliqué, on -# regénére la liste des serveurs MySQL disponible dedans. +# regénére la liste des serveurs MySQL disponible dedans. mysql_query "select id,host,name from db_servers;" | while read id host name ; do echo " // Server #$id in db_servers