From 89f135f173986d6dbd7c78a7b532b18c267d8d5d Mon Sep 17 00:00:00 2001
From: x2000habouzit <x2000habouzit>
Date: Tue, 31 Aug 2004 21:57:50 +0000
Subject: [PATCH] closes FS#39 defaults should be added into
 include/xorg.globals.inc.php. config.xorg.inc.php is only an override !!!

some obsolete settings go out
---
 include/xorg.globals.inc.php  |  7 ++++++-
 include/xorg.page.inc.php     |  4 ++--
 install.d/config.xorg.inc.php | 14 ++------------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/include/xorg.globals.inc.php b/include/xorg.globals.inc.php
index d77113c..ee5bac8 100644
--- a/include/xorg.globals.inc.php
+++ b/include/xorg.globals.inc.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: xorg.globals.inc.php,v 1.3 2004-08-31 11:16:48 x2000habouzit Exp $
+        $Id: xorg.globals.inc.php,v 1.4 2004-08-31 21:57:50 x2000habouzit Exp $
  ***************************************************************************/
 
 require("diogenes.core.globals.inc.php");
@@ -33,7 +33,12 @@ class XorgGlobals extends DiogenesCoreGlobals {
   var $table_log_sessions = 'logger.sessions';
   var $table_log_events = 'logger.events';
 
+  /** logger */
   var $tauth = array('native'=>"auth_user_md5");
   var $tlabel = array('native'=>"X.Org");
+  
+  /** recherche */
+  var $public_max_search_results = 25;
+  var $search_results_per_page = 10;
 }
 ?>
diff --git a/include/xorg.page.inc.php b/include/xorg.page.inc.php
index 34b627e..9621813 100644
--- a/include/xorg.page.inc.php
+++ b/include/xorg.page.inc.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: xorg.page.inc.php,v 1.38 2004-08-31 11:16:48 x2000habouzit Exp $
+        $Id: xorg.page.inc.php,v 1.39 2004-08-31 21:57:50 x2000habouzit Exp $
  ***************************************************************************/
 
 require("diogenes.core.page.inc.php");
@@ -59,7 +59,7 @@ class XorgPage extends DiogenesCorePage {
     var $_tpl;
 
     function XorgPage($tpl, $type=SKINNED) {
-        global $site_dev,$marketing_admin,$globals;
+        global $site_dev,$globals;
 
         $this->template_dir = $globals->spoolroot."/templates/";
         $this->compile_dir  = $globals->spoolroot."/templates_c/";
diff --git a/install.d/config.xorg.inc.php b/install.d/config.xorg.inc.php
index 1ef7156..85373f1 100644
--- a/install.d/config.xorg.inc.php
+++ b/install.d/config.xorg.inc.php
@@ -18,16 +18,14 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: config.xorg.inc.php,v 1.3 2004-08-31 11:19:51 x2000habouzit Exp $
+        $Id: config.xorg.inc.php,v 1.4 2004-08-31 21:57:51 x2000habouzit Exp $
  ***************************************************************************/
 
-/* $Id: config.xorg.inc.php,v 1.3 2004-08-31 11:19:51 x2000habouzit Exp $ */
+/* $Id: config.xorg.inc.php,v 1.4 2004-08-31 21:57:51 x2000habouzit Exp $ */
 
 /* URL de la racine pour les mails contenant des URL (pas de slash final!) */
 if (!isset($baseurl)) $baseurl="http://dev.m4x.org";
 
-/* pour empêcher les mises à jour de la base de donnée depuis le site */
-$no_update_bd = false;
 /* les parametres pour se connecter à la BDD */
 $globals->dbhost='localhost';
 $globals->dbdb = 'x4dat';
@@ -41,9 +39,6 @@ if (!isset($news_server)) $news_server="localhost";
 if (!isset($news_port)) $news_port=119;
 if (!isset($news_auth_pass)) $news_auth_pass="***";
 
-/* acces a la page marketing */
-$marketing_admin = array();
-
 /* définir sur le site de dev */
 if (!isset($site_dev)) $site_dev=true;
 
@@ -55,9 +50,4 @@ $dbuser = $globals->dbuser;
 $dbpwd = $globals->dbpwd;
 $xdat = $globals->dbdb;
 
-/* domaines et mails utilisés */
-$globals->domaine_mail='domaine.org' ;
-$globals->domaine_mail_alias=array('alias.net','alias.org') ; // seul le 1er apparaît dans la BD
-$globals->addr_mail_valid_alias='validation+alias@'.$globals->domaine_mail ;
-
 ?>
-- 
2.1.4