From b65ae184ab2506b0c0e9f19f16feda6af50309e1 Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Mon, 20 Aug 2012 10:11:09 +0000
Subject: [PATCH] =?UTF-8?q?Plus=20de=20register=20globals.=20Comme=20?=
 =?UTF-8?q?=C3=A7a,=20on=20validera=20lors=20de=20nos=20tests.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bureau/admin/ip_main.php                       | 2 +-
 debian/changelog                               | 2 +-
 etc/alternc/apache2.conf                       | 1 -
 etc/alternc/templates/apache2/webmail.conf     | 2 --
 etc/alternc/templates/squirrelmail/apache.conf | 2 --
 5 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/bureau/admin/ip_main.php b/bureau/admin/ip_main.php
index efe49260..83c5252b 100644
--- a/bureau/admin/ip_main.php
+++ b/bureau/admin/ip_main.php
@@ -69,7 +69,7 @@ $lac = $authip->list_affected();
     $col=3-$col;
     echo "<tr class='lst$col' >";
     echo "<td>".$ac[$ll['protocol']]['name']."</td>";
-    echo "<td>".$ac[$ll['protocol']]['values'][$ll['parameters']]."</td>";
+    echo "<td>".(isset($ac[$ll['protocol']]['values'][$ll['parameters']])?$ac[$ll['protocol']]['values'][$ll['parameters']]:'')."</td>";
     echo "<td>".$list_ip[$ll['authorised_ip_id']]['infos']."<br/>".$list_ip[$ll['authorised_ip_id']]['ip_human']."</td>"; ?>
     <td><div class="ina"><a href="ip_main.php?delete_affected_id=<?php echo urlencode($ll["id"]) ?>"><img src="images/delete.png" alt="<?php __("Delete")?>" /><?php __("Delete"); ?></a></div></td>
   <?php
diff --git a/debian/changelog b/debian/changelog
index 6ed4f1d8..fd96acf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ alternc (1.1+nmu4) stable; urgency=low
     * Users can now create databases en databases users independently 
       ( no need to create a first database to create a user anymore)
   * Bugfixes in installation process
- 
+  * Kick off register_globals
 
  -- squidly <squidly@nnx.com>  Tue, 14 Aug 2012 11:21:14 +0200
 
diff --git a/etc/alternc/apache2.conf b/etc/alternc/apache2.conf
index 28f1c72a..4db35263 100644
--- a/etc/alternc/apache2.conf
+++ b/etc/alternc/apache2.conf
@@ -29,7 +29,6 @@ ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/
 
   php_admin_flag safe_mode_gid off
   php_admin_flag safe_mode off
-  php_admin_flag register_globals on
   AddDefaultCharset UTF-8
 # modules such as mailman or awstats needs to write into other folders, we have to remove this :
 #  php_admin_value open_basedir /etc/alternc/:/var/run/alternc/:/var/alternc/bureau/:/var/alternc/html/:/var/alternc/tmp:/tmp:/usr/share/php/:/var/cache/alternc-webalizer/:/etc/locale.gen
diff --git a/etc/alternc/templates/apache2/webmail.conf b/etc/alternc/templates/apache2/webmail.conf
index e4a3c4e1..a10f44b0 100644
--- a/etc/alternc/templates/apache2/webmail.conf
+++ b/etc/alternc/templates/apache2/webmail.conf
@@ -4,8 +4,6 @@
 
   DocumentRoot /usr/share/squirrelmail
   <Directory /usr/share/squirrelmail>
-  #  php_value register_globals On # refer to Debian bug #128226
-    php_flag register_globals on
     php_value open_basedir /usr/share/squirrelmail:/etc/squirrelmail/:/var/lib/squirrelmail/data/
     php_admin_flag safe_mode off
     Options Indexes FollowSymLinks
diff --git a/etc/alternc/templates/squirrelmail/apache.conf b/etc/alternc/templates/squirrelmail/apache.conf
index d35d4dc4..3c57ece0 100644
--- a/etc/alternc/templates/squirrelmail/apache.conf
+++ b/etc/alternc/templates/squirrelmail/apache.conf
@@ -6,8 +6,6 @@
 #Alias /squirrelmail /usr/share/squirrelmail
 
 <Directory /usr/share/squirrelmail>
-#  php_value register_globals On # refer to Debian bug #128226
-  php_flag register_globals on
   php_value open_basedir /usr/share/squirrelmail
   php_admin_flag safe_mode off
   Options Indexes FollowSymLinks