|
From: Florin C B. <ory...@us...> - 2013-04-18 01:56:42
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28784 Modified Files: session.php Log Message: updating phpBB3 announce Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** session.php 8 Apr 2013 22:07:50 -0000 1.47 --- session.php 18 Apr 2013 01:56:40 -0000 1.48 *************** *** 1366,1370 **** AND t.template_path = m.template_name AND t.template_id = s.template_id"; - if ($row = $db->sql_fetchrow($db->sql_query($sql))) { --- 1366,1369 ---- *************** *** 1410,1414 **** $sql = "SELECT s.style_id, s.style_name FROM " . MX_THEMES_TABLE . " AS m, " . STYLES_TABLE . " AS s, " . STYLES_TEMPLATE_TABLE . " AS t ! WHERE s.style_id = " . (int) $style_value . " AND s.style_name = m.style_name AND t.template_id = s.template_id"; --- 1409,1413 ---- $sql = "SELECT s.style_id, s.style_name FROM " . MX_THEMES_TABLE . " AS m, " . STYLES_TABLE . " AS s, " . STYLES_TEMPLATE_TABLE . " AS t ! WHERE m.themes_id = " . (int) $style_value . " AND s.style_name = m.style_name AND t.template_id = s.template_id"; *************** *** 1428,1432 **** { $style = $style_value; ! } //We should never get this, temp fix for GoogleBot-2.1 crawler //Remove this Deguging Code after solved --- 1427,1432 ---- { $style = $style_value; ! } ! //We should never get this, temp fix for GoogleBot-2.1 crawler //Remove this Deguging Code after solved *************** *** 1436,1440 **** } $mx_style = $style; ! $mx_style_value = $style_value; // END Styles_Demo MOD if (intval($style) == 0) --- 1436,1441 ---- } $mx_style = $style; ! $mx_style_value = $style_value; ! // END Styles_Demo MOD if (intval($style) == 0) *************** *** 1459,1466 **** else { ! //Query phpBB style_id corepondent to mxp themes_id $sql = "SELECT s.style_id, s.style_name, t.template_storedb, t.template_path, t.template_id, t.bbcode_bitfield, c.theme_path, c.theme_name, c.theme_storedb, c.theme_id, i.imageset_path, i.imageset_id, i.imageset_name FROM " . MX_THEMES_TABLE . " AS m, " . STYLES_TABLE . " AS s, " . STYLES_TEMPLATE_TABLE . " AS t, " . STYLES_THEME_TABLE . " AS c, " . STYLES_IMAGESET_TABLE . " i ! WHERE m.themes_id = " . (int) $style . " AND s.style_name = m.style_name AND t.template_id = s.template_id --- 1460,1467 ---- else { ! //Query phpBB style_id get from main style init. Should be correct and valid. $sql = "SELECT s.style_id, s.style_name, t.template_storedb, t.template_path, t.template_id, t.bbcode_bitfield, c.theme_path, c.theme_name, c.theme_storedb, c.theme_id, i.imageset_path, i.imageset_id, i.imageset_name FROM " . MX_THEMES_TABLE . " AS m, " . STYLES_TABLE . " AS s, " . STYLES_TEMPLATE_TABLE . " AS t, " . STYLES_THEME_TABLE . " AS c, " . STYLES_IMAGESET_TABLE . " i ! WHERE s.style_id = " . (int) $style . " AND s.style_name = m.style_name AND t.template_id = s.template_id *************** *** 1471,1474 **** --- 1472,1476 ---- $style = $row['style_id']; $style_value = $row['style_name']; + // MXP themes_id = $row['themes_id'] } else *************** *** 1479,1482 **** --- 1481,1485 ---- $this->theme = $row; $db->sql_freeresult($result); + // User has wrong style if (!$this->theme && $style == $this->data['user_style']) |