Gros sed pour dégager les unbreakable space
This commit is contained in:
parent
c7d1327153
commit
5c2275f035
|
@ -4,7 +4,7 @@
|
||||||
# Appelé avec "all" lance les stats avec tous les fichiers .gz situés dans /var/log/apache
|
# 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.
|
# 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
|
. /usr/lib/alternc/functions.sh
|
||||||
|
|
||||||
# Regenerate the awstat etc cache files :
|
# Regenerate the awstat etc cache files :
|
||||||
|
|
|
@ -160,7 +160,7 @@ while (list($key,$val)=each($r)) {
|
||||||
<td id="user_<?php echo $val["uid"]; ?>"> </td>
|
<td id="user_<?php echo $val["uid"]; ?>"> </td>
|
||||||
<?php } else { ?>
|
<?php } else { ?>
|
||||||
<td><input type="checkbox" class="inc" name="d[]" id="user_<?php echo $val["uid"]; ?>" value="<?php echo $val["uid"]; ?>" /></td>
|
<td><input type="checkbox" class="inc" name="d[]" id="user_<?php echo $val["uid"]; ?>" value="<?php echo $val["uid"]; ?>" /></td>
|
||||||
<?php } // val['su'] ?>
|
<?php } // val['su'] ?>
|
||||||
<td <?php if ($val["su"]) echo 'style="color: red"'; ?>><label for="user_<?php echo $val["uid"]; ?>"><b><?php echo $val["login"] ?></b></label></td>
|
<td <?php if ($val["su"]) echo 'style="color: red"'; ?>><label for="user_<?php echo $val["uid"]; ?>"><b><?php echo $val["login"] ?></b></label></td>
|
||||||
<td><a href="mailto:<?php echo $val["mail"]; ?>"><?php echo $val["nom"]." ".$val["prenom"] ?></a> </td>
|
<td><a href="mailto:<?php echo $val["mail"]; ?>"><?php echo $val["nom"]." ".$val["prenom"] ?></a> </td>
|
||||||
<td><?php echo $val["parentlogin"] ?></td>
|
<td><?php echo $val["parentlogin"] ?></td>
|
||||||
|
|
|
@ -79,7 +79,7 @@ function destruction_alert() {
|
||||||
if (document.forms["fdns"].email[1].checked) {
|
if (document.forms["fdns"].email[1].checked) {
|
||||||
if ( confirm("<?php __("Are you sure you want to do this? This will DELETE ALL the mailboxes, messages and aliases on this domain ?"); ?>") ) {
|
if ( confirm("<?php __("Are you sure you want to do this? This will DELETE ALL the mailboxes, messages and aliases on this domain ?"); ?>") ) {
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
require_once("../class/config_nochk.php");
|
require_once("../class/config_nochk.php");
|
||||||
|
|
||||||
# Test it :
|
# 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
|
// Created by Alesandro Slepcevic - alesandro@plus.hr
|
||||||
if ( $_SERVER['REQUEST_METHOD'] === 'POST' ){
|
if ( $_SERVER['REQUEST_METHOD'] === 'POST' ){
|
||||||
|
|
|
@ -861,7 +861,7 @@ ORDER BY
|
||||||
/* ----------------------------------------------------------------- */
|
/* ----------------------------------------------------------------- */
|
||||||
/** hook function called by AlternC when a domain is created for
|
/** hook function called by AlternC when a domain is created for
|
||||||
* the current user account
|
* 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
|
* wich is a dynamic alias to the alternc's account mail
|
||||||
* @param string $domain_id Domain that has just been created
|
* @param string $domain_id Domain that has just been created
|
||||||
* @access private
|
* @access private
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# AUTO GENERATED FILE
|
# AUTO GENERATED FILE
|
||||||
# Modify template in /etc/alternc/templates/
|
# Modify template in /etc/alternc/templates/
|
||||||
# and launch alternc.install if you want
|
# and launch alternc.install if you want
|
||||||
# to modify this file.
|
# to modify this file.
|
||||||
#
|
#
|
||||||
# This module is loaded in /etc/apache/modules, and enabled by apache-modconf
|
# 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
|
php_admin_value sendmail_path /usr/lib/alternc/sendmail
|
||||||
|
|
||||||
# Default upload_tmp_dir is /tmp . Be carefull, this value MUST be surcharged
|
# 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.
|
# that, ACLs could be "strange" or inexistent.
|
||||||
php_admin_value upload_tmp_dir /tmp
|
php_admin_value upload_tmp_dir /tmp
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# AUTO GENERATED FILE
|
# AUTO GENERATED FILE
|
||||||
# Modify template in /etc/alternc/templates/
|
# Modify template in /etc/alternc/templates/
|
||||||
# and launch alternc.install if you want
|
# and launch alternc.install if you want
|
||||||
# to modify this file.
|
# to modify this file.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
# AUTO GENERATED FILE
|
# AUTO GENERATED FILE
|
||||||
# Modify template in /etc/alternc/templates/
|
# Modify template in /etc/alternc/templates/
|
||||||
# and launch alternc.install if you want
|
# and launch alternc.install if you want
|
||||||
# to modify this file.
|
# to modify this file.
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# AUTO GENERATED FILE
|
# AUTO GENERATED FILE
|
||||||
# Modify template in /etc/alternc/templates/
|
# Modify template in /etc/alternc/templates/
|
||||||
# and launch alternc.install if you want
|
# and launch alternc.install if you want
|
||||||
# to modify this file.
|
# to modify this file.
|
||||||
#
|
#
|
||||||
# envvars - default environment variables for apache2ctl
|
# envvars - default environment variables for apache2ctl
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# AUTO GENERATED FILE
|
# AUTO GENERATED FILE
|
||||||
# Modify template in /etc/alternc/templates/
|
# Modify template in /etc/alternc/templates/
|
||||||
# and launch alternc.install if you want
|
# and launch alternc.install if you want
|
||||||
# to modify this file.
|
# to modify this file.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# AUTO GENERATED FILE
|
# AUTO GENERATED FILE
|
||||||
# Modify template in /etc/alternc/templates/
|
# Modify template in /etc/alternc/templates/
|
||||||
# and launch alternc.install if you want
|
# and launch alternc.install if you want
|
||||||
# to modify this file.
|
# to modify this file.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# AUTO GENERATED FILE
|
# AUTO GENERATED FILE
|
||||||
# Modify template in /etc/alternc/templates/
|
# Modify template in /etc/alternc/templates/
|
||||||
# and launch alternc.install if you want
|
# and launch alternc.install if you want
|
||||||
# to modify this file.
|
# to modify this file.
|
||||||
#
|
#
|
||||||
## Dovecot configuration file
|
## Dovecot configuration file
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# AUTO GENERATED FILE
|
# AUTO GENERATED FILE
|
||||||
# Modify template in /etc/alternc/templates/
|
# Modify template in /etc/alternc/templates/
|
||||||
# and launch alternc.install if you want
|
# and launch alternc.install if you want
|
||||||
# to modify this file.
|
# to modify this file.
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# AUTO GENERATED FILE
|
# AUTO GENERATED FILE
|
||||||
# Modify template in /etc/alternc/templates/
|
# Modify template in /etc/alternc/templates/
|
||||||
# and launch alternc.install if you want
|
# and launch alternc.install if you want
|
||||||
# to modify this file.
|
# to modify this file.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# AUTO GENERATED FILE
|
# AUTO GENERATED FILE
|
||||||
# Modify template in /etc/alternc/templates/
|
# Modify template in /etc/alternc/templates/
|
||||||
# and launch alternc.install if you want
|
# and launch alternc.install if you want
|
||||||
# to modify this file.
|
# to modify this file.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# AUTO GENERATED FILE
|
# AUTO GENERATED FILE
|
||||||
# Modify template in /etc/alternc/templates/
|
# Modify template in /etc/alternc/templates/
|
||||||
# and launch alternc.install if you want
|
# and launch alternc.install if you want
|
||||||
# to modify this file.
|
# to modify this file.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
|
@ -73,8 +73,8 @@ SQLAuthenticate users
|
||||||
AuthPAM off
|
AuthPAM off
|
||||||
|
|
||||||
# What this SQL query do :
|
# What this SQL query do :
|
||||||
# - check if there is IP limitation for this account. If there isn't, allow everyone (by returning a TRUE)
|
# - check if there is IP limitation for this account. If there isn't, allow everyone (by returning a TRUE)
|
||||||
# - if there is some limitation :
|
# - 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)
|
# - 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
|
# - 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
|
# - check that the user's ip is in an allowed range
|
||||||
|
|
|
@ -404,7 +404,7 @@ if ! grep -e "${include_str/\"/\\\"}" $pma_config > /dev/null 2>&1; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Le template de /etc/alternc/phpmyadmin.inc.php viens d'être réappliqué, on
|
# 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
|
mysql_query "select id,host,name from db_servers;" | while read id host name ; do
|
||||||
echo "
|
echo "
|
||||||
// Server #$id in db_servers
|
// Server #$id in db_servers
|
||||||
|
|
|
@ -70,7 +70,7 @@ for file in $( ls $extensions | sort -n ) ; do
|
||||||
sh $file || true
|
sh $file || true
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
# Do nothing
|
# Do nothing
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -73,7 +73,7 @@ if [ ! -z "$RELOAD_ZONES" ]; then
|
||||||
apache_reload
|
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 "$zone" || echo "Cannot reload bind for zone $zone"
|
||||||
$sudo rndc reload || echo "Cannot reload bind for zone $zone"
|
$sudo rndc reload || echo "Cannot reload bind for zone $zone"
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -30,7 +30,7 @@ launch_hooks() {
|
||||||
}
|
}
|
||||||
|
|
||||||
host_conffile() {
|
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 FQDN="$1"
|
||||||
local U_ID=$(get_uid_by_domain "$FQDN")
|
local U_ID=$(get_uid_by_domain "$FQDN")
|
||||||
local CONFFILE="$VHOST_DIR/${U_ID:(-1)}/$U_ID/$FQDN.conf"
|
local CONFFILE="$VHOST_DIR/${U_ID:(-1)}/$U_ID/$FQDN.conf"
|
||||||
|
|
|
@ -32,7 +32,7 @@ require_once("/usr/share/alternc/panel/class/config_nochk.php");
|
||||||
|
|
||||||
$admin->stop_if_jobs_locked();
|
$admin->stop_if_jobs_locked();
|
||||||
|
|
||||||
# Be super user
|
# Be super user
|
||||||
#$mem->setid(2000);
|
#$mem->setid(2000);
|
||||||
$admin->enabled=1;
|
$admin->enabled=1;
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ command -v $QUOTA >/dev/null || { echo "Quotas uninstalled"; exit 0; }
|
||||||
|
|
||||||
# The second line is the one interesting
|
# The second line is the one interesting
|
||||||
# We look precisely on the HTML directory. Why ? because it's surely
|
# 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.
|
# 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 }'`
|
DATA_PART=`$DF "${ALTERNC_HTML}" 2>/dev/null | $AWK 'NR==2 { print $1 }'`
|
||||||
|
|
|
@ -58,7 +58,7 @@ mysql_query "SELECT id, address_id, quote(replace(path,'!','\\!')) FROM mailbox
|
||||||
# Other case, do nothing
|
# Other case, do nothing
|
||||||
if [ -d "${path//\'/}" ] ; then
|
if [ -d "${path//\'/}" ] ; then
|
||||||
$ionice rm -rf "${path//\'/}" && mysql_query "DELETE FROM mailbox WHERE id=$id AND mail_action='DELETING';"
|
$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//\'/}"
|
test -d "${path//\'/}" && $ionice rm -rf "${path//\'/}"
|
||||||
else
|
else
|
||||||
mysql_query "DELETE FROM mailbox WHERE id=$id AND mail_action='DELETING';"
|
mysql_query "DELETE FROM mailbox WHERE id=$id AND mail_action='DELETING';"
|
||||||
|
|
|
@ -399,7 +399,7 @@ if ! grep -e "${include_str/\"/\\\"}" $pma_config > /dev/null 2>&1; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Le template de /etc/alternc/phpmyadmin.inc.php viens d'être réappliqué, on
|
# 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
|
mysql_query "select id,host,name from db_servers;" | while read id host name ; do
|
||||||
echo "
|
echo "
|
||||||
// Server #$id in db_servers
|
// Server #$id in db_servers
|
||||||
|
|
Loading…
Reference in New Issue