[xoops-svn] SF.net SVN: xoops:[4052] XoopsCore/trunk

[<tr...@us...>]

Revision: 4052
          http://xoops.svn.sourceforge.net/xoops/?rev=4052&view=rev
Author:   trabis
Date:     2009-12-26 18:44:37 +0000 (Sat, 26 Dec 2009)

Log Message:
-----------
Fixed bug #2915970 : Banner white page on IE, adding new language defines into banners.php

Modified Paths:
--------------
    XoopsCore/trunk/docs/changelog.txt
    XoopsCore/trunk/htdocs/banners.php
    XoopsCore/trunk/htdocs/language/english/banners.php

Modified: XoopsCore/trunk/docs/changelog.txt
===================================================================
--- XoopsCore/trunk/docs/changelog.txt	2009-12-26 17:01:58 UTC (rev 4051)
+++ XoopsCore/trunk/docs/changelog.txt	2009-12-26 18:44:37 UTC (rev 4052)
@@ -1,7 +1,7 @@
 XOOPS Changelog
 
 ===============================
-2009/12/05: Version 2.4.3
+2009/12/26: Version 2.4.3
 ===============================
 Updates upon community:
 - Added: Ability to assign display elements to a specific group of users (ghia)
@@ -19,7 +19,13 @@
 - Fixed bug #2911944 : Users can see other users profile in edit profile (trabis/ghia)
 - Fixed bug #2910495 : BBcode code tag handles code worse than quote tag (trabis/ghia)
 - Fixed bug #2914175 : code tags translate to double tags and alter first line (trabis/ghia)
+- Fixed bug #2915970 : Banner white page on IE (trabis/gia)
 
+Added Language defines:
+  language/english/banners.php _BANNERS_NO_LOGIN_DATA
+  language/english/banners.php _BANNERS_NO_REFERER
+  language/english/banners.php _BANNERS_NO_ID
+
 ===============================
 2009/11/28: Version 2.4.2
 ===============================

Modified: XoopsCore/trunk/htdocs/banners.php
===================================================================
--- XoopsCore/trunk/htdocs/banners.php	2009-12-26 17:01:58 UTC (rev 4051)
+++ XoopsCore/trunk/htdocs/banners.php	2009-12-26 18:44:37 UTC (rev 4052)
@@ -91,7 +91,7 @@
           <div class='actions'><input type='hidden' name='op' value='Ok' /><button type='submit'>" . _BANNERS_LOGIN_OK . "</button></div>
           <div class='login_info'>" . _BANNERS_LOGIN_INFO . "</div>" . $GLOBALS['xoopsSecurity']->getTokenHTML("BANNER_LOGIN") . "
           </form></div>";
-    include "footer.php";
+    include $GLOBALS['xoops']->path('footer.php');
 }
 
 /*********************************************/
@@ -102,7 +102,7 @@
 {
     global $xoopsDB, $xoopsConfig, $xoopsLogger;
     if ($_SESSION['banner_login'] == "" || $_SESSION['banner_pass'] == "") {
-        redirect_header("banners.php", 2, 'No login data detected');
+        redirect_header("banners.php", 2, _BANNERS_NO_LOGIN_DATA);
         exit();
     }
     $result = $xoopsDB->query(sprintf("SELECT cid, name, passwd FROM %s WHERE login=%s", $xoopsDB->prefix("bannerclient"), $xoopsDB->quoteString($_SESSION['banner_login'])));
@@ -130,7 +130,7 @@
               <td>" . _BANNERS_FUNCTIONS . "</td></tr></thead>
               <tfoot><tr><td colspan='7'></td></tr></tfoot>";
 
-        $result = $xoopsDB->query("select bid, imptotal, impmade, clicks, date from " . $xoopsDB->prefix("banner") . " where cid=$cid");
+        $result = $xoopsDB->query("SELECT bid, imptotal, impmade, clicks, date FROM " . $xoopsDB->prefix("banner") . " WHERE cid={$cid}");
         $i = 0;
         while (list ($bid, $imptotal, $impmade, $clicks, $date) = $xoopsDB->fetchRow($result)) {
             if ($impmade == 0) {
@@ -144,21 +144,21 @@
                 $left = $imptotal - $impmade;
             }
             $class = ($i % 2 == 0) ? 'even' : 'odd';
-            echo "<tbody><tr class='$class'>
-                  <td>$bid</td>
-                  <td>$impmade</td>
-                  <td>$imptotal</td>
-                  <td>$left</td>
-                  <td>$clicks</td>
-                  <td>$percent%</td>
-                  <td><a href='banners.php?op=EmailStats&amp;cid=$cid&amp;bid=$bid' title='" . _BANNERS_STATS . "'>" . _BANNERS_STATS . "</a></td></tr></tbody>";
-            $i ++;
+            echo "<tbody><tr class='{$class}'>
+                  <td>{$bid}</td>
+                  <td>{$impmade}</td>
+                  <td>{$imptotal}</td>
+                  <td>{$left}</td>
+                  <td>{$clicks}</td>
+                  <td>{$percent}%</td>
+                  <td><a href='banners.php?op=EmailStats&amp;cid={$cid}&amp;bid={$bid}' title='" . _BANNERS_STATS . "'>" . _BANNERS_STATS . "</a></td></tr></tbody>";
+            $i++;
         }
         echo "</table>
               <br /><br />
               <h4 class='content_title'>" . _BANNERS_FOW_IN . htmlspecialchars($xoopsConfig['sitename']) . "</h4><hr />";
 
-        $result = $xoopsDB->query("select bid, imageurl, clickurl, htmlbanner, htmlcode from " . $xoopsDB->prefix("banner") . " where cid=$cid");
+        $result = $xoopsDB->query("SELECT bid, imageurl, clickurl, htmlbanner, htmlcode FROM " . $xoopsDB->prefix("banner") . " WHERE cid={$cid}");
         while (list ($bid, $imageurl, $clickurl, $htmlbanner, $htmlcode) = $xoopsDB->fetchRow($result)) {
             $numrows = $xoopsDB->getRowsNum($result);
             if ($numrows > 1) {
@@ -190,7 +190,7 @@
 
         /* Finnished Banners */
         echo "<br />";
-        if ($result = $xoopsDB->query("select bid, impressions, clicks, datestart, dateend from " . $xoopsDB->prefix("bannerfinish") . " where cid=$cid")) {
+        if ($result = $xoopsDB->query("SELECT bid, impressions, clicks, datestart, dateend FROM " . $xoopsDB->prefix("bannerfinish") . " WHERE cid={$cid}")) {
             echo "<h4 class='content_title'>" . sprintf(_BANNERS_FINISHED, $name) . "</h4><hr />
                   <table summary=''>
                   <caption>" . sprintf(_BANNERS_FINISHED, $name) . "</caption>
@@ -234,14 +234,14 @@
     if ($_SESSION['banner_login'] != "" && $_SESSION['banner_pass'] != "") {
         $cid = intval($cid);
         $bid = intval($bid);
-        if ($result2 = $xoopsDB->query(sprintf("select name, email, passwd from %s where cid=%u AND login=%s", $xoopsDB->prefix("bannerclient"), $cid, $xoopsDB->quoteString($_SESSION['banner_login'])))) {
+        if ($result2 = $xoopsDB->query(sprintf("SELECT name, email, passwd FROM %s WHERE cid=%u AND login=%s", $xoopsDB->prefix("bannerclient"), $cid, $xoopsDB->quoteString($_SESSION['banner_login'])))) {
             list ($name, $email, $passwd) = $xoopsDB->fetchRow($result2);
             if ($_SESSION['banner_pass'] == $passwd) {
                 if ($email == "") {
                     redirect_header("banners.php", 3, sprintf(_BANNERS_MAIL_ERROR, $name));
                     exit();
                 } else {
-                    if ($result = $xoopsDB->query("select bid, imptotal, impmade, clicks, imageurl, clickurl, date from " . $xoopsDB->prefix("banner") . " where bid=$bid and cid=$cid")) {
+                    if ($result = $xoopsDB->query("SELECT bid, imptotal, impmade, clicks, imageurl, clickurl, date FROM " . $xoopsDB->prefix("banner") . " WHERE bid={$bid} AND cid={$cid}")) {
                         list ($bid, $imptotal, $impmade, $clicks, $imageurl, $clickurl, $date) = $xoopsDB->fetchRow($result);
                         if ($impmade == 0) {
                             $percent = 0;
@@ -286,13 +286,13 @@
     if ($_SESSION['banner_login'] != "" && $_SESSION['banner_pass'] != "" && $url != "") {
         $cid = intval($cid);
         $bid = intval($bid);
-        $sql = sprintf("select passwd from %s where cid=%u and login=%s", $xoopsDB->prefix("bannerclient"), $cid, $xoopsDB->quoteString($_SESSION['banner_login']));
+        $sql = sprintf("SELECT passwd FROM %s WHERE cid=%u AND login=%s", $xoopsDB->prefix("bannerclient"), $cid, $xoopsDB->quoteString($_SESSION['banner_login']));
         if ($result = $xoopsDB->query($sql)) {
             list ($passwd) = $xoopsDB->fetchRow($result);
             if ($_SESSION['banner_pass'] == $passwd) {
-                $sql = sprintf("update %s set clickurl=%s where bid=%u AND cid=%u", $xoopsDB->prefix("banner"), $xoopsDB->quoteString($url), $bid, $cid);
+                $sql = sprintf("UPDATE %s SET clickurl=%s WHERE bid=%u AND cid=%u", $xoopsDB->prefix("banner"), $xoopsDB->quoteString($url), $bid, $cid);
                 if ($xoopsDB->query($sql)) {
-                    redirect_header("banners.php?op=Ok", 3, "URL has been changed.");
+                    redirect_header("banners.php?op=Ok", 3, _BANNERS_DBUPDATED);
                     exit();
                 }
             }
@@ -311,24 +311,23 @@
         list ($clickurl) = $xoopsDB->fetchRow($bresult);
         if ($clickurl) {
             if ($GLOBALS['xoopsSecurity']->checkReferer()) {
-                $xoopsDB->queryF("update " . $xoopsDB->prefix("banner") . " set clicks=clicks+1 where bid=$bid");
+                $xoopsDB->queryF("UPDATE " . $xoopsDB->prefix("banner") . " SET clicks=clicks+1 WHERE bid=$bid");
                 header('Location: ' . $clickurl);
             } else {
                 //No valid referer found so some javascript error or direct access found
-                //Display a link but do not update counter
-                echo sprintf(_BANNERS_POINTS, $clickurl);
+                echo _BANNERS_NO_REFERER;
             }
             exit();
         }
     }
-    redirect_header(XOOPS_URL, 3, _ERRORS);
+    redirect_header(XOOPS_URL, 3, _BANNERS_NO_ID);
     exit();
 }
 
 $op = '';
 if (!empty($_POST['op'])) {
     $op = $_POST['op'];
-} elseif (!empty($_GET['op'])) {
+} else if (!empty($_GET['op'])) {
     $op = $_GET['op'];
 }
 

Modified: XoopsCore/trunk/htdocs/language/english/banners.php
===================================================================
--- XoopsCore/trunk/htdocs/language/english/banners.php	2009-12-26 17:01:58 UTC (rev 4051)
+++ XoopsCore/trunk/htdocs/language/english/banners.php	2009-12-26 18:44:37 UTC (rev 4052)
@@ -71,4 +71,8 @@
 define('_BANNERS_DBUPDATED', 'Item modified and database updated');
 define('_BANNERS_DBERROR', 'Database was not updated due to an error!');
 define('_BANNERS_CHANGE', 'Change');
+
+define('_BANNERS_NO_LOGIN_DATA', 'No login data detected');
+define('_BANNERS_NO_REFERER', 'No referer detected');
+define('_BANNERS_NO_ID', 'No valid ID detected');
 ?>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.