From 7903a47a0bbf5496eb7d764008b399246d2a1843 Mon Sep 17 00:00:00 2001 From: x2003bruneau Date: Wed, 31 Jan 2007 08:34:13 +0000 Subject: [PATCH] Backports git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1441 839d8a87-29fc-0310-9880-83ba4fa771e5 --- bin/connect.db.inc.php | 4 ++-- bin/cron/cron_validations.php | 2 +- htdocs/css/nl.css | 1 + templates/xnet/skin.tpl | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/connect.db.inc.php b/bin/connect.db.inc.php index 0fc5ac6..8e0f830 100644 --- a/bin/connect.db.inc.php +++ b/bin/connect.db.inc.php @@ -19,11 +19,11 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ -ini_set('include_path',dirname(__FILE__).'/../include:/usr/share/php'); +ini_set('include_path',dirname(__FILE__).'/../include:' . dirname(__FILE__).'/../classes:/usr/share/php'); require_once('xorg.inc.php'); require_once('xorg.misc.inc.php'); -require_once dirname(__FILE__).'/../classes/xdb.php'; +require_once 'xdb.php'; ?> diff --git a/bin/cron/cron_validations.php b/bin/cron/cron_validations.php index 81ed9ad..75ef035 100755 --- 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('../classes/plmailer.php'); +require('plmailer.php'); $res = 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/htdocs/css/nl.css b/htdocs/css/nl.css index 6350f51..8eed668 100644 --- a/htdocs/css/nl.css +++ b/htdocs/css/nl.css @@ -64,6 +64,7 @@ div.nl div.intro { } div.nl div.lnk { + text-align: left; margin : 2ex 6ex; } diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl index 6242008..d496046 100644 --- a/templates/xnet/skin.tpl +++ b/templates/xnet/skin.tpl @@ -129,7 +129,7 @@ {/foreach} - {if $asso && ($is_admin || $smarty.session.suid.perms eq 'admin' || $smarty.suid.may_update[$asso.id])} + {if $asso && ($is_admin || $smarty.session.suid.perms eq 'admin' || $smarty.session.suid.may_update[$asso.id])}