we don't need diogenes lib to be direct in the include path. /usr/share/php is sufficient

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-243

diff --git a/bin/connect.db.inc.php b/bin/connect.db.inc.php
index ce2437a..b6a08cc 100644 (file)
--- a/bin/connect.db.inc.php
+++ b/bin/connect.db.inc.php
@@ -19,7 +19,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-ini_set('include_path','/usr/share/php/diogenes:/usr/share/php:../include:../../include');
+ini_set('include_path','/usr/share/php:../include:../../include');
 
 require('xorg.inc.php');
 require('xorg.misc.inc.php');

diff --git a/bin/cron/cron_validations.php b/bin/cron/cron_validations.php
index 5eb6212..4f1e440 100755 (executable)
--- a/bin/cron/cron_validations.php
+++ b/bin/cron/cron_validations.php
@@ -27,7 +27,7 @@ $M_PERIOD = "INTERVAL 3 HOUR"; // p
 $R_PERIOD = "INTERVAL 6 HOUR"; // période de réponse moyenne de 6h
 
 require('./connect.db.inc.php');
-require('diogenes.hermes.inc.php');
+require('diogenes/diogenes.hermes.inc.php');
 
 $res = $globals->xdb->query("SELECT count(stamp), sum(stamp < NOW() - $M_PERIOD), sum(stamp < NOW() - $R_PERIOD) FROM x4dat.requests");
 list($nb,$nbold,$nbveryold) = $res->fetchOneRow();

diff --git a/bin/cron/rapports_inscription.php b/bin/cron/rapports_inscription.php
index 4bde48f..844dc0b 100755 (executable)
--- a/bin/cron/rapports_inscription.php
+++ b/bin/cron/rapports_inscription.php
@@ -55,7 +55,7 @@ if ($c = $res->total()) {
 
 $MESSAGE=$MESSAGE."\n\n";
 
-require_once('diogenes.hermes.inc.php');
+require_once('diogenes/diogenes.hermes.inc.php');
 $mailer = new HermesMailer();
 $mailer->setSubject("$a confirmées, $b en attente et $c sollicitées");
 $mailer->setFrom('register@polytechnique.org');

diff --git a/bin/cron/send_notifs.php b/bin/cron/send_notifs.php
index 9e67b1c..13c038b 100755 (executable)
--- a/bin/cron/send_notifs.php
+++ b/bin/cron/send_notifs.php
@@ -22,8 +22,8 @@
 
 require_once('./connect.db.inc.php');
 require_once("../../include/notifs.inc.php");
-require_once("diogenes.hermes.inc.php");
-require_once("diogenes.misc.inc.php");
+require_once("diogenes/diogenes.hermes.inc.php");
+require_once("diogenes/diogenes.misc.inc.php");
 
 $all = new AllNotifs();
 

diff --git a/bin/emails.broken.php b/bin/emails.broken.php
index caf4c9c..c33f69b 100755 (executable)
--- a/bin/emails.broken.php
+++ b/bin/emails.broken.php
@@ -19,7 +19,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-ini_set('include_path', '../include:/usr/share/php/diogenes:/usr/share/php');
+ini_set('include_path', '../include:/usr/share/php');
  
 require_once('../include/xorg.inc.php');
 require_once('../include/emails.inc.php');
@@ -86,7 +86,7 @@ d'acc
 elle te permettra de créer un nouveau mot de passe après avoir rentré ton
 login ({$x['alias']}) et ta date de naissance !";
 
-            require_once("diogenes.hermes.inc.php");
+            require_once("diogenes/diogenes.hermes.inc.php");
             $mail = new HermesMailer();
             $mail->setFrom('"Polytechnique.org" <support@polytechnique.org>');
             $mail->addTo("\"{$x['prenom']} {$x['nom']}\" <{$x['alias']}@polytechnique.org>");

diff --git a/htdocs/admin/homonymes.php b/htdocs/admin/homonymes.php
index 88b5707..bda5fd0 100644 (file)
--- a/htdocs/admin/homonymes.php
+++ b/htdocs/admin/homonymes.php
@@ -21,7 +21,7 @@
 
 require_once("xorg.inc.php");
 new_admin_page('admin/homonymes.tpl');
-require_once("diogenes.hermes.inc.php");
+require_once("diogenes/diogenes.hermes.inc.php");
 
 $op     = Env::get('op', 'list');
 $target = Env::getInt('target');

diff --git a/htdocs/admin/logger.php b/htdocs/admin/logger.php
index a44addf..f7247ff 100644 (file)
--- a/htdocs/admin/logger.php
+++ b/htdocs/admin/logger.php
@@ -21,7 +21,7 @@
 
 require_once("xorg.inc.php");
 new_admin_page('logger-view.tpl');
-require_once('diogenes.logger-view.inc.php');
+require_once('diogenes/diogenes.logger-view.inc.php');
 
 if (!Env::has('logauth')) {
     $_REQUEST['logauth'] = 'native';

diff --git a/htdocs/admin/utilisateurs.php b/htdocs/admin/utilisateurs.php
index 2f49d9e..de7e004 100644 (file)
--- a/htdocs/admin/utilisateurs.php
+++ b/htdocs/admin/utilisateurs.php
@@ -124,7 +124,7 @@ if ($login) {
                     // FIXME: recherche
                     system('echo 1 > /tmp/flag_recherche');
 
-                    require_once("diogenes.hermes.inc.php");
+                    require_once("diogenes/diogenes.hermes.inc.php");
                     $mailer = new HermesMailer();
                     $mailer->setFrom("webmaster@polytechnique.org");
                     $mailer->addTo("web@polytechnique.org");
@@ -145,7 +145,7 @@ if ($login) {
            case "u_kill":
                user_clear_all_subs($mr['user_id']);
                 $page->trig("'{$mr['user_id']}' a été désinscrit !");
-               require_once("diogenes.hermes.inc.php");
+               require_once("diogenes/diogenes.hermes.inc.php");
                $mailer = new HermesMailer();
                $mailer->setFrom("webmaster@polytechnique.org");
                $mailer->addTo("web@polytechnique.org");

diff --git a/htdocs/emails/broken.php b/htdocs/emails/broken.php
index 1a2a569..698747d 100644 (file)
--- a/htdocs/emails/broken.php
+++ b/htdocs/emails/broken.php
@@ -54,7 +54,7 @@ consulter la page <{$globals->baseurl}/emails/broken.php>.
 A bientôt sur Polytechnique.org !
 L'équipe d'administration <support@polytechnique.org>";
 
-       require_once("diogenes.hermes.inc.php");
+       require_once("diogenes/diogenes.hermes.inc.php");
        $mail = new HermesMailer();
        $mail->setFrom('"Polytechnique.org" <support@polytechnique.org>');
        $mail->addTo("$dest@polytechnique.org");

diff --git a/htdocs/emails/send.php b/htdocs/emails/send.php
index b2d4db6..9661be0 100644 (file)
--- a/htdocs/emails/send.php
+++ b/htdocs/emails/send.php
@@ -36,7 +36,7 @@ if (Env::get('submit') == 'Envoyer')
     if (empty($to) && empty($cc) && empty($to2)) {
         $page->trig("Indique au moins un destinataire.");
     } else {
-        require_once("diogenes.hermes.inc.php");
+        require_once("diogenes/diogenes.hermes.inc.php");
 
         $mymail = new HermesMailer();
        $mymail->setFrom($from);

diff --git a/htdocs/listes/moderate.php b/htdocs/listes/moderate.php
index 251cef2..18c4a13 100644 (file)
--- a/htdocs/listes/moderate.php
+++ b/htdocs/listes/moderate.php
@@ -74,7 +74,7 @@ if(Env::has('mid')) {
                 ."    Sujet : « {$mail['subj']} »\n"
                 ."    Date  : ".strftime("le %d %b %Y à %H:%M:%S", (int)$mail['stamp'])."\n\n"
                 .$append;
-        require_once('diogenes.hermes.inc.php');
+        require_once('diogenes/diogenes.hermes.inc.php');
         $mailer = new HermesMailer();
         $mailer->addTo("$liste-owner@{$globals->mail->domain}");
         $mailer->setFrom("$liste-bounces@{$globals->mail->domain}");

diff --git a/htdocs/newsletter/submit.php b/htdocs/newsletter/submit.php
index 5eac8a3..509436a 100644 (file)
--- a/htdocs/newsletter/submit.php
+++ b/htdocs/newsletter/submit.php
@@ -31,7 +31,7 @@ if (Post::has('see')) {
     $art = new NLArticle(Post::get('title'), Post::get('body'), Post::get('append'));
     $nl->saveArticle($art);
 
-    require_once("diogenes.hermes.inc.php");
+    require_once("diogenes/diogenes.hermes.inc.php");
     $from = sprintf('"%s %s (%s)" <%s@%s>', Session::get('prenom'), Session::get('nom'),
             Session::get('promo'), Session::get('bestalias'), $globals->mail->domain);
     $mailer = new HermesMailer();

diff --git a/htdocs/paiement/cyberpaiement_retour.php b/htdocs/paiement/cyberpaiement_retour.php
index d021b50..c0c0de4 100644 (file)
--- a/htdocs/paiement/cyberpaiement_retour.php
+++ b/htdocs/paiement/cyberpaiement_retour.php
@@ -20,7 +20,7 @@
  ***************************************************************************/
 
 require_once("xorg.inc.php");
-require_once("diogenes.hermes.inc.php");
+require_once("diogenes/diogenes.hermes.inc.php");
 
 /* sort en affichant une erreur */
 function erreur($text) {

diff --git a/htdocs/recovery.php b/htdocs/recovery.php
index e7d8770..2009037 100644 (file)
--- a/htdocs/recovery.php
+++ b/htdocs/recovery.php
@@ -48,7 +48,7 @@ if (Env::has('login') and Env::has('birth'))  {
         $res   = $globals->xdb->query('SELECT email FROM emails WHERE uid = {?} AND NOT FIND_IN_SET("filter", flags)', $uid);
         $mails = implode(', ', $res->fetchColumn());
         
-       require_once("diogenes.hermes.inc.php");
+       require_once("diogenes/diogenes.hermes.inc.php");
        $mymail = new HermesMailer();
        $mymail->setFrom('"Gestion des mots de passe" <support+password@polytechnique.org>');
        $mymail->addTo($mails);

diff --git a/include/identification.inc.php b/include/identification.inc.php
index d41ad53..c3d7903 100644 (file)
--- a/include/identification.inc.php
+++ b/include/identification.inc.php
@@ -186,7 +186,7 @@ if ( $homonyme ) {
     if ( $h_type != 'homonyme' and empty($expire) ) {
        $globals->xdb->execute('UPDATE aliases SET expire=ADDDATE(NOW(),INTERVAL 1 MONTH) WHERE alias={?}', $mailorg);
        $globals->xdb->execute('REPLACE INTO homonymes (homonyme_id,user_id) VALUES ({?},{?})', $h_id, $h_id);
-       require_once('diogenes.hermes.inc.php');
+       require_once('diogenes/diogenes.hermes.inc.php');
        $mailer = new HermesMailer();
        $mailer->setFrom('"Support Polytechnique.org" <support@polytechnique.org>');
        $mailer->addTo("$mailorg@polytechnique.org");

diff --git a/include/newsletter.inc.php b/include/newsletter.inc.php
index a7400e3..91fc1cd 100644 (file)
--- a/include/newsletter.inc.php
+++ b/include/newsletter.inc.php
@@ -22,7 +22,7 @@
 // {{{ requires + defines
 
 require_once("xorg.misc.inc.php");
-require_once("diogenes.misc.inc.php");
+require_once("diogenes/diogenes.misc.inc.php");
 
 define('FEMME', 1);
 define('HOMME', 0);
@@ -315,7 +315,7 @@ EOF;
     function sendTo($prenom, $nom, $login, $sex, $html)
     {
         global $globals;
-       require_once('diogenes.hermes.inc.php');
+       require_once('diogenes/diogenes.hermes.inc.php');
 
        $mailer = new HermesMailer();
        $mailer->setFrom($globals->newsletter->from);

diff --git a/include/validations.inc.php b/include/validations.inc.php
index 2e1b067..3fb629d 100644 (file)
--- a/include/validations.inc.php
+++ b/include/validations.inc.php
@@ -199,7 +199,7 @@ class Validate
     function sendmail($isok)
     {
         global $globals;
-        require_once('diogenes.hermes.inc.php');
+        require_once('diogenes/diogenes.hermes.inc.php');
         $mailer = new HermesMailer;
         $mailer->setSubject($this->_mail_subj());
         $mailer->setFrom("validations+{$this->type}@{$globals->mail->domain}");

diff --git a/include/xorg.mailer.inc.php b/include/xorg.mailer.inc.php
index 088d14d..08036e2 100644 (file)
--- a/include/xorg.mailer.inc.php
+++ b/include/xorg.mailer.inc.php
@@ -19,8 +19,8 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once("diogenes.hermes.inc.php");
-require_once("Smarty.class.php");
+require_once('diogenes/diogenes.hermes.inc.php');
+require_once('Smarty.class.php');
 
 // {{{ class XOrgMailer
 

diff --git a/include/xorg.table-editor.inc.php b/include/xorg.table-editor.inc.php
index 7fc4ccb..c8feb7f 100644 (file)
--- a/include/xorg.table-editor.inc.php
+++ b/include/xorg.table-editor.inc.php
@@ -19,7 +19,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once('diogenes.table-editor.inc.php');
+require_once('diogenes/diogenes.table-editor.inc.php');
 
 class XOrgAdminTableEditor extends DiogenesTableEditor {
     function XOrgTableEditor($table,$idfield,$editid=false) {

diff --git a/include/xorg/page.inc.php b/include/xorg/page.inc.php
index 91dbce5..0d53255 100644 (file)
--- a/include/xorg/page.inc.php
+++ b/include/xorg/page.inc.php
@@ -19,7 +19,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once('diogenes.core.page.inc.php');
+require_once('diogenes/diogenes.core.page.inc.php');
 require_once('xorg/errors.inc.php');
 require_once('xorg/smarty.plugins.inc.php');
 

diff --git a/include/xorg/session.inc.php b/include/xorg/session.inc.php
index 79b8feb..dee75da 100644 (file)
--- a/include/xorg/session.inc.php
+++ b/include/xorg/session.inc.php
@@ -19,8 +19,8 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once("diogenes.core.session.inc.php");
-require_once("diogenes.misc.inc.php");
+require_once('diogenes/diogenes.core.session.inc.php');
+require_once('diogenes/diogenes.misc.inc.php');
 
 // {{{ class XorgSession
 
@@ -197,7 +197,7 @@ function check_perms()
 {
     global $page;
     if (!has_perms()) {
-       require_once("diogenes.core.logger.inc.php");
+       require_once('diogenes/diogenes.core.logger.inc.php');
        $_SESSION['log']->log("noperms",$_SERVER['PHP_SELF']);
        $page->kill("Tu n'as pas les permissions nécessaires pour accéder à cette page.");
     }