diff -Naur nuface-1.0.5/acls.php nuface-1.0.5.oden/acls.php
--- nuface-1.0.5/acls.php 2006-06-09 12:02:20.000000000 +0200
+++ nuface-1.0.5.oden/acls.php 2006-06-14 16:21:50.000000000 +0200
@@ -23,7 +23,7 @@
$title='acls';
$singtitle='acl';
-require("include/config.php");
+require("/etc/nuface/config.php");
require("include/messages.php");
$header_onclick="return ask_list_change(new Array('sortcat'),'$gal_confirm_change_order')";
require("include/headers.php");
diff -Naur nuface-1.0.5/applications.php nuface-1.0.5.oden/applications.php
--- nuface-1.0.5/applications.php 2006-06-07 16:45:52.000000000 +0200
+++ nuface-1.0.5.oden/applications.php 2006-06-14 16:21:50.000000000 +0200
@@ -23,7 +23,7 @@
$title="applications";
$singtitle="application";
-require("include/config.php");
+require("/etc/nuface/config.php");
require("include/headers.php");
require("include/function.php");
require("include/types.php");
diff -Naur nuface-1.0.5/floatings.php nuface-1.0.5.oden/floatings.php
--- nuface-1.0.5/floatings.php 2006-04-23 12:29:04.000000000 +0200
+++ nuface-1.0.5.oden/floatings.php 2006-06-14 16:21:50.000000000 +0200
@@ -3,7 +3,7 @@
$title='floatings';
-require("include/config.php");
+require("/etc/nuface/config.php");
require("include/headers.php");
require("include/function.php");
require("include/types.php");
diff -Naur nuface-1.0.5/include/config.php nuface-1.0.5.oden/include/config.php
--- nuface-1.0.5/include/config.php 2006-06-14 15:33:10.000000000 +0200
+++ nuface-1.0.5.oden/include/config.php 2006-06-14 16:23:49.000000000 +0200
@@ -19,31 +19,27 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-$lang='fr';
-$policyfile="/etc/network/firewall/specs/spec.xml";
-
-
+$lang='en';
$pages_list=array("index","nat","acls","protocols","subjects","ressources","applications","floatings");
-$datadir="/var/local/nuface";
-#$datadir="/tmp/";
-#$logdir="/var/local/nuface-logs";
-$lockdir="/tmp";
+$datadir="/var/lib/nuface";
+$logdir="/var/log/nuface";
+$lockdir="/var/lib/nuface";
$tmpdir="/tmp";
-$rules_dir="/etc/network/firewall/dyn";
-$nufw_rules_dir="/etc/network/firewall/dyn/nufw";
-$std_rules_dir="/etc/network/firewall/dyn/standard";
+$rules_dir="/etc/nuface/dyn";
+$nufw_rules_dir="/etc/nuface/dyn/nufw";
+$std_rules_dir="/etc/nuface/dyn/standard";
$nufw_rules_file="fwd_rules";
$std_rules_file="nonufw_rules";
$nupyf_ldap_file="ldap_objects";
$nupyf_conf_file="nupyf.conf";
-$network_desc_dir="/etc/network/firewall/desc";
+$network_desc_dir="/etc/nuface/desc";
$network_desc_file="desc.xml";
#$network_desc_file=array("desc.xml","desc2.xml");
@@ -51,8 +47,8 @@
$sudo_command="/usr/bin/sudo";
-$network_script_dir="/etc/network/firewall";
-$firewall_script="/etc/init.d/init-firewall";
+$network_script_dir="/etc/nuface";
+$firewall_script="/etc/rc.d/init.d/nupyf";
$manage_input=true;
diff -Naur nuface-1.0.5/include/headers.php nuface-1.0.5.oden/include/headers.php
--- nuface-1.0.5/include/headers.php 2006-04-10 15:17:42.000000000 +0200
+++ nuface-1.0.5.oden/include/headers.php 2006-06-14 16:21:50.000000000 +0200
@@ -55,7 +55,7 @@
<body>
<div class="headers">
<?php
-require("include/config.php");
+require("/etc/nuface/config.php");
require("include/messages.php");
if ($edenwall_integration!=0)
include('../nuconf/include/edennavbar.php');
diff -Naur nuface-1.0.5/index.php nuface-1.0.5.oden/index.php
--- nuface-1.0.5/index.php 2006-06-07 16:53:36.000000000 +0200
+++ nuface-1.0.5.oden/index.php 2006-06-14 16:21:50.000000000 +0200
@@ -20,7 +20,7 @@
#
require("include/function.php");
-require("include/config.php");
+require("/etc/nuface/config.php");
require("include/messages.php");
$title='index';
diff -Naur nuface-1.0.5/nat.php nuface-1.0.5.oden/nat.php
--- nuface-1.0.5/nat.php 2006-06-07 16:45:52.000000000 +0200
+++ nuface-1.0.5.oden/nat.php 2006-06-14 16:21:50.000000000 +0200
@@ -23,7 +23,7 @@
$title='nat';
$singtitle='nat';
-require("include/config.php");
+require("/etc/nuface/config.php");
require("include/messages.php");
$header_onclick = "return ask_list_change(new Array('sortsnat','sortdnat','sortpnat'),'$gal_confirm_change_order')";
require("include/headers.php");
diff -Naur nuface-1.0.5/protocols.php nuface-1.0.5.oden/protocols.php
--- nuface-1.0.5/protocols.php 2006-05-15 15:42:19.000000000 +0200
+++ nuface-1.0.5.oden/protocols.php 2006-06-14 16:21:50.000000000 +0200
@@ -22,7 +22,7 @@
session_start();
$title="protocols";
$singtitle="protocol";
-require("include/config.php");
+require("/etc/nuface/config.php");
require("include/headers.php");
require("include/function.php");
require("include/types.php");
diff -Naur nuface-1.0.5/ressources.php nuface-1.0.5.oden/ressources.php
--- nuface-1.0.5/ressources.php 2006-06-07 16:45:52.000000000 +0200
+++ nuface-1.0.5.oden/ressources.php 2006-06-14 16:21:50.000000000 +0200
@@ -21,7 +21,7 @@
session_start();
$title="ressources";
$singtitle="ressource";
-require("include/config.php");
+require("/etc/nuface/config.php");
require("include/headers.php");
require("include/function.php");
require("include/types.php");
diff -Naur nuface-1.0.5/subjects.php nuface-1.0.5.oden/subjects.php
--- nuface-1.0.5/subjects.php 2006-06-12 11:10:53.000000000 +0200
+++ nuface-1.0.5.oden/subjects.php 2006-06-14 16:21:50.000000000 +0200
@@ -23,7 +23,7 @@
$title="subjects";
$singtitle="subject";
-require("include/config.php");
+require("/etc/nuface/config.php");
require("include/headers.php");
require("include/function.php");
require("include/types.php");
