From: x2000habouzit Date: Sat, 6 Nov 2004 13:53:51 +0000 (+0000) Subject: auth_user_quick is now used for quick datas or plugins, this table will have variable... X-Git-Tag: xorg/old~1047 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=6424f2340a8e6fbc9b50b9eafad76caf81a9300f;p=platal.git auth_user_quick is now used for quick datas or plugins, this table will have variable geometry, whereas auth_user_md5 holds the core founctionnalitites --- diff --git a/htdocs/banana/include/session.inc.php b/htdocs/banana/include/session.inc.php index a845aaf..dcf9d09 100644 --- a/htdocs/banana/include/session.inc.php +++ b/htdocs/banana/include/session.inc.php @@ -18,7 +18,7 @@ switch ($sname) { break; case "index.php": if (isset($_GET["banana"]) && ($_GET["banana"]=="updateall")) { - mysql_query("UPDATE auth_user_md5 SET lastnewslogin='" + mysql_query("UPDATE auth_user_quick SET lastnewslogin='" .gmdate("YmdHis")."' WHERE user_id='{$_SESSION['uid']}'"); $_SESSION["lastnewslogin"]=time(); } diff --git a/htdocs/skins.php b/htdocs/skins.php index a71c259..39fca0f 100644 --- a/htdocs/skins.php +++ b/htdocs/skins.php @@ -18,14 +18,14 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: skins.php,v 1.7 2004-08-31 10:03:28 x2000habouzit Exp $ + $Id: skins.php,v 1.8 2004-11-06 13:53:51 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); new_skinned_page('skins.tpl', AUTH_COOKIE); if (isset($_REQUEST['submit'])) { // formulaire soumis, traitons les données envoyées - $globals->db->query("UPDATE auth_user_md5 + $globals->db->query("UPDATE auth_user_quick SET skin={$_REQUEST['newskin']} WHERE user_id={$_SESSION['uid']}"); set_skin(); @@ -33,7 +33,7 @@ if (isset($_REQUEST['submit'])) { // formulaire soumis, traitons les donn $sql = "SELECT s.*,auteur,count(*) AS nb FROM skins AS s - LEFT JOIN auth_user_md5 AS a ON s.id=a.skin + LEFT JOIN auth_user_quick AS a ON s.id=a.skin WHERE skin_tpl != '' AND ext != '' GROUP BY id ORDER BY s.date DESC"; $page->mysql_assign($sql, 'skins'); diff --git a/include/xorg.session.inc.php b/include/xorg.session.inc.php index 9053544..91a3704 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: xorg.session.inc.php,v 1.35 2004-10-31 16:12:12 x2000chevalier Exp $ + $Id: xorg.session.inc.php,v 1.36 2004-11-06 13:53:52 x2000habouzit Exp $ ***************************************************************************/ require("diogenes.core.session.inc.php"); @@ -221,12 +221,13 @@ 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(u.lastnewslogin), a2.alias, password, FIND_IN_SET('femme', flags) + a.alias, UNIX_TIMESTAMP(q.lastnewslogin), a2.alias, password, FIND_IN_SET('femme', flags) FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON (u.user_id = a.id AND a.type='a_vie') + INNER JOIN auth_user_quick AS q USING(user_id) + INNER JOIN aliases AS a ON (u.user_id = a.id AND a.type='a_vie') INNER JOIN aliases AS a2 ON (u.user_id = a2.id AND (a2.type='a_vie' OR a2.type='alias' OR a2.type='epouse') AND a2.alias LIKE '%.%') LEFT JOIN logger.sessions AS s ON (s.uid=u.user_id AND s.suid=0) - WHERE user_id=$uid + WHERE u.user_id=$uid ORDER BY s.start DESC, a2.type != 'epouse', length(a2.alias) LIMIT 1"); list($prenom, $nom, $perms, $promo, $matricule, $lastlogin, $host, @@ -276,7 +277,7 @@ function set_skin() { global $globals; if(logged()) { $result = $globals->db->query("SELECT skin,skin_tpl - FROM auth_user_md5 AS a INNER JOIN skins AS s + FROM auth_user_quick AS a INNER JOIN skins AS s ON a.skin=s.id WHERE user_id='{$_SESSION['uid']}' AND skin_tpl != ''"); if(list($_SESSION['skin_id'], $_SESSION['skin']) = mysql_fetch_row($result)) { if ($_SESSION['skin_id'] == SKIN_STOCHASKIN_ID) { diff --git a/scripts/migration/0.9.2/00_auth_user_quicl.sql b/scripts/migration/0.9.2/00_auth_user_quicl.sql new file mode 100644 index 0000000..5be4ad1 --- /dev/null +++ b/scripts/migration/0.9.2/00_auth_user_quicl.sql @@ -0,0 +1,14 @@ +create table auth_user_quick ( + user_id smallint not null, + lastnewslogin timestamp not null, + skin tinyint not null, + primary key(user_id) +); + +insert into auth_user_quick ( + select user_id,lastnewslogin,skin + from auth_user_md5 +); + +alter table auth_user_md5 drop column lastnewslogin; +alter table auth_user_md5 drop column skin;