Changeset 2981

Timestamp:

06/04/11 11:39:15 (2 years ago)

Author:

xals

Message:

Merged changesets 2976 and 2979 from branch stable 1.0 to trunk.

Location:

alternc/trunk

Files:

• . (modified) (1 prop)
• bureau/class/lang_env.php (modified) (3 diffs)
• bureau/class/m_err.php (modified) (1 diff)
• bureau/class/m_quota.php (modified) (1 diff)
• bureau/class/variables.php (modified) (1 diff)
• debian/control (modified) (1 diff)
• etc/alternc/functions_hosting (modified) (1 prop)
• etc/alternc/postfix.cf (modified) (1 diff)
• etc/alternc/templates/apache2/url.conf (modified) (1 prop)
• etc/alternc/templates/apache2/vhost.conf (modified) (1 prop)
• install/alternc.install (modified) (1 diff)
• src/functions_dns.sh (modified) (1 prop)
• src/functions_hosting.sh (modified) (1 prop)

alternc/trunk/bureau/class/lang_env.php

@@ -9 +9 @@
       $locales[$mat[1]]=$mat[1];
     }
+  }
+  if (!count($locales)) {
+    $locales=array("en_US"=>"en_US");
   }
   return $locales;
@@ -23 +26 @@
 // Create or update a locale.php file if it is outdated.
 $locales = update_locale($langpath);
+
+// Default to en_US : 
+if (!isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
+  $_SERVER["HTTP_ACCEPT_LANGUAGE"]="en_US";
+}
 
 if (!(isset($lang))) {  // Use the browser first preferred language
@@ -40 +48 @@
 }
 
-if (!isset($locales[$lang])) $lang=$locales[0]; 
+if (!isset($locales[$lang])) list($lang)=each($locales);
 
 if (isset($setlang) && isset($lang)) {

alternc/trunk/bureau/class/m_err.php

@@ -141 +141 @@
     $f=@fopen($this->logfile,"ab");
     if ($f) {
+      if (!isset($_SERVER['REMOTE_ADDR'])) $_SERVER['REMOTE_ADDR']="::1";
       fputs($f,date("d/m/Y H:i:s")." - " . $_SERVER['REMOTE_ADDR'] . " - CALL - ");
       fputs($f,$mem->user["login"]." - ");

alternc/trunk/bureau/class/m_quota.php

@@ -174 +174 @@
     $err->log("quota","setquota",$ressource."/".$size);
     if (floatval($size)==0) $size="0";
-    if ($this->disk[$ressource]) {
+    if (isset($this->disk[$ressource])) {
       // It's a disk resource, update it with shell command
       exec("/usr/lib/alternc/quota_edit $cuid $size");

alternc/trunk/bureau/class/variables.php

@@ -47 +47 @@
     /* maybe the data is *not* serialized, in that case, take it verbatim */
     $variable = $db->Record;
-    if (($variables[$variable['name']] = unserialize($variable['value'])) === FALSE) {
+    if (($variables[$variable['name']] = @unserialize($variable['value'])) === FALSE) {
       $variables[$variable['name']] = $variable['value'];
     }

alternc/trunk/debian/control

@@ -30 +30 @@
 Architecture: all
 Pre-depends: debconf (>= 0.5.00) | debconf-2.0
-Depends: debianutils (>= 1.13.1), apache2, libapache2-mod-php5, courier-ssl, courier-imap-ssl, courier-pop-ssl, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, squirrelmail, postfix-tls, bind9, wget, rsync, quota, courier-authmysql | courier-authlib-mysql, ca-certificates, locales, perl-suid, perl, postfix-mysql, wwwconfig-common, sasl2-bin, libsasl2-modules, php5-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), adduser, mysql-client, postgrey, sudo
+Depends: debianutils (>= 1.13.1), apache2, libapache2-mod-php5, courier-ssl, courier-imap-ssl, courier-pop-ssl, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, squirrelmail, postfix-tls, bind9, wget, rsync, quota, courier-authmysql | courier-authlib-mysql, ca-certificates, locales, perl-suid, perl, postfix-mysql, wwwconfig-common, sasl2-bin, libsasl2-modules, php5-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), adduser, mysql-client, sudo
 Recommends: apache2
 Conflicts: alternc-admintools, alternc-awstats (<= 0.3.2), alternc-webalizer (<= 0.9.4), alternc

alternc/trunk/etc/alternc/postfix.cf

@@ -32 +32 @@
 virtual_uid_maps = static:33
 default_privs = www-data
-smtpd_recipient_restrictions = reject_unlisted_recipient, permit_mynetworks, permit_sasl_authenticated, reject_non_fqdn_recipient, reject_unauth_destination, check_policy_service inet:127.0.0.1:60000, reject_rbl_client zen.spamhaus.org
+smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_invalid_hostname, reject_non_fqdn_hostname, reject_non_fqdn_sender, reject_rbl_client zen.spamhaus.org, reject_non_fqdn_recipient, reject_unknown_sender_domain, reject_unknown_recipient_domain, reject_unauth_pipelining, reject_unlisted_recipient, reject_unauth_destination

alternc/trunk/install/alternc.install

@@ -259 +259 @@
 fi
 
+if [ ! -f /etc/postfix/main.cf ]
+then
+    echo "****************************************"
+    echo "POSTFIX is NOT configured properly"
+    echo "please launch dpkg-reconfigure -plow postfix" 
+    echo "and choose 'Internet Site'"
+    echo "then reinstall alternc"
+    echo "****************************************"
+    exit 1
+fi
+
 # configure postfix appropriatly for our needs
 if [ "$slave" = "1" ]; then