From 65e060da05d8250b95e5846205e4231aa8c44a18 Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Wed, 24 Nov 2004 14:08:24 +0000 Subject: [PATCH] latnewslogin -> banana_last --- htdocs/banana/include/profile.inc.php | 4 ++-- htdocs/banana/include/session.inc.php | 4 ++-- include/conf.d/banana.menu.inc.php | 3 +++ include/conf.d/tmp.menu.inc.php | 3 +-- include/xorg/session.inc.php | 8 ++++---- upgrade/0.9.3/60_banana.sql | 1 + 6 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 include/conf.d/banana.menu.inc.php create mode 100644 upgrade/0.9.3/60_banana.sql diff --git a/htdocs/banana/include/profile.inc.php b/htdocs/banana/include/profile.inc.php index c1878fa..92099c8 100644 --- a/htdocs/banana/include/profile.inc.php +++ b/htdocs/banana/include/profile.inc.php @@ -41,10 +41,10 @@ function getprofile() { $array['customhdr'] = ""; $array['display'] = $disp; $array['autoup'] = $maj; - $array['lastnews'] = $_SESSION['lastnewslogin']; + $array['lastnews'] = $_SESSION['banana_last']; $array['dropsig'] = true; if ($maj) { - mysql_query("UPDATE auth_user_md5 SET lastnewslogin='" + mysql_query("UPDATE auth_user_md5 SET banana_last='" .gmdate("YmdHis")."' WHERE user_id='{$_SESSION['uid']}'"); } $req=mysql_query("SELECT nom diff --git a/htdocs/banana/include/session.inc.php b/htdocs/banana/include/session.inc.php index dcf9d09..b4c9d4c 100644 --- a/htdocs/banana/include/session.inc.php +++ b/htdocs/banana/include/session.inc.php @@ -18,9 +18,9 @@ switch ($sname) { break; case "index.php": if (isset($_GET["banana"]) && ($_GET["banana"]=="updateall")) { - mysql_query("UPDATE auth_user_quick SET lastnewslogin='" + mysql_query("UPDATE auth_user_quick SET banana_last='" .gmdate("YmdHis")."' WHERE user_id='{$_SESSION['uid']}'"); - $_SESSION["lastnewslogin"]=time(); + $_SESSION["banana_last"]=time(); } default: $_SESSION['bananapostok']=true; diff --git a/include/conf.d/banana.menu.inc.php b/include/conf.d/banana.menu.inc.php new file mode 100644 index 0000000..58615ab --- /dev/null +++ b/include/conf.d/banana.menu.inc.php @@ -0,0 +1,3 @@ +addPrivateEntry(XOM_SERVICES, 10, 'Forums & PA', 'banana/'); +?> diff --git a/include/conf.d/tmp.menu.inc.php b/include/conf.d/tmp.menu.inc.php index 7029248..47a3e14 100644 --- a/include/conf.d/tmp.menu.inc.php +++ b/include/conf.d/tmp.menu.inc.php @@ -1,4 +1,4 @@ -addPrivateEntry(XOM_NO, 10, 'Page d\'accueil', 'login.php'); $this->addPrivateEntry(XOM_CUSTOM, 00, 'Mes emails', 'emails.php'); @@ -9,7 +9,6 @@ $this->addPrivateEntry(XOM_CUSTOM, 40, 'Mon mot de passe', 'motdepassemd5 $this->addPrivateEntry(XOM_CUSTOM, 50, 'Mes préférences', 'preferences.php'); $this->addPrivateEntry(XOM_SERVICES, 00, 'Envoyer un mail', 'sendmail.php'); -$this->addPrivateEntry(XOM_SERVICES, 10, 'Forums & PA', 'banana/'); $this->addPrivateEntry(XOM_SERVICES, 20, 'Listes de diffusion', 'listes/'); $this->addPrivateEntry(XOM_SERVICES, 30, 'Envoyer un mail', 'sendmail.php'); $this->addPrivateEntry(XOM_SERVICES, 40, 'Patte cassée', 'pattecassee.php'); diff --git a/include/xorg/session.inc.php b/include/xorg/session.inc.php index d11b2ca..f94f9b2 100644 --- a/include/xorg/session.inc.php +++ b/include/xorg/session.inc.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: session.inc.php,v 1.6 2004-11-24 10:19:48 x2000habouzit Exp $ + $Id: session.inc.php,v 1.7 2004-11-24 14:08:24 x2000habouzit Exp $ ***************************************************************************/ require_once("diogenes.core.session.inc.php"); @@ -277,7 +277,7 @@ function start_connexion ($uid, $identified) global $globals; $result=$globals->db->query(" SELECT prenom, nom, perms, promo, matricule, UNIX_TIMESTAMP(s.start) AS lastlogin, s.host, a.alias, - UNIX_TIMESTAMP(q.lastnewslogin), q.watch_last, + UNIX_TIMESTAMP(q.banana_last), q.watch_last, a2.alias, password, FIND_IN_SET('femme', u.flags) FROM auth_user_md5 AS u INNER JOIN auth_user_quick AS q USING(user_id) @@ -287,7 +287,7 @@ function start_connexion ($uid, $identified) WHERE u.user_id=$uid AND u.perms IN('admin','user') ORDER BY s.start DESC, !FIND_IN_SET('epouse', a2.flags), length(a2.alias)"); list($prenom, $nom, $perms, $promo, $matricule, $lastlogin, $host, $forlife, - $lastnewslogin, $watch_last, + $banana_last, $watch_last, $bestalias, $password, $femme) = mysql_fetch_row($result); mysql_free_result($result); @@ -316,7 +316,7 @@ function start_connexion ($uid, $identified) // le login est stocké pour un an $_SESSION['lastlogin'] = $lastlogin; - $_SESSION['lastnewslogin'] = $lastnewslogin; + $_SESSION['banana_last'] = $banana_last; $_SESSION['watch_last'] = $watch_last; $_SESSION['host'] = $host; $_SESSION['auth'] = ($identified ? AUTH_MDP : AUTH_COOKIE); diff --git a/upgrade/0.9.3/60_banana.sql b/upgrade/0.9.3/60_banana.sql new file mode 100644 index 0000000..3386f6d --- /dev/null +++ b/upgrade/0.9.3/60_banana.sql @@ -0,0 +1 @@ +alter table auth_user_quick change column lastnewslogin banana_last timestamp not null; -- 2.1.4