appdb/ include/header.php include/incl.php ban ...

[Jeremy Newman]

ChangeSet ID:	21386
CVSROOT:	/opt/cvs-commit
Module name:	appdb
Changes by:	jnewman(a)winehq.org	2005/11/21 11:30:58

Modified files:
	include        : header.php incl.php 
Removed files:
	banner/468x60  : cw-ad01.gif cw-ad02.gif cw-ad04.gif 
	banner/xml     : cw-ad01.xml cw-ad02.xml cw-ad04.xml 
	include        : banner.php 

Log message:
	use banner ad code from main winehq.org

Patch: http://cvs.winehq.org/patch.py?id=21386

Old revision  New revision  Changes     Path
 1.1.1.1       Removed       +0 -0       appdb/banner/468x60/cw-ad01.gif
 1.1.1.1       Removed       +0 -0       appdb/banner/468x60/cw-ad02.gif
 1.1.1.1       Removed       +0 -0       appdb/banner/468x60/cw-ad04.gif
 1.2           Removed       +0 -0       appdb/banner/xml/cw-ad01.xml
 1.2           Removed       +0 -0       appdb/banner/xml/cw-ad02.xml
 1.2           Removed       +0 -0       appdb/banner/xml/cw-ad04.xml
 1.8           1.9           +7 -2       appdb/include/header.php
 1.25          1.26          +0 -4       appdb/include/incl.php
 1.5           Removed       +0 -0       appdb/include/banner.php

Index: appdb/banner/xml/cw-ad01.xml
diff -u -p appdb/banner/xml/cw-ad01.xml:1.2 /dev/null
--- appdb/banner/xml/cw-ad01.xml	21 Nov 2005 17:30:58 -0000
+++ /dev/null	21 Nov 2005 17:30:58 -0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE bannerAd>
-<ad>
-    <id>cw-ad04</id>
-    <url>http://www.codeweavers.com/products/?ad=1</url>
-    <alt>QuickTime for Linux!</alt>
-</ad>
Index: appdb/banner/xml/cw-ad02.xml
diff -u -p appdb/banner/xml/cw-ad02.xml:1.2 /dev/null
--- appdb/banner/xml/cw-ad02.xml	21 Nov 2005 17:30:58 -0000
+++ /dev/null	21 Nov 2005 17:30:58 -0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE bannerAd>
-<ad>
-    <id>cw-ad04</id>
-    <url>http://www.codeweavers.com/products/support_wine/?ad=1</url>
-    <alt>Support the Wine Project!</alt>
-</ad>
Index: appdb/banner/xml/cw-ad04.xml
diff -u -p appdb/banner/xml/cw-ad04.xml:1.2 /dev/null
--- appdb/banner/xml/cw-ad04.xml	21 Nov 2005 17:30:58 -0000
+++ /dev/null	21 Nov 2005 17:30:58 -0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE bannerAd>
-<ad>
-    <id>cw-ad04</id>
-    <url>http://www.codeweavers.com/products/?ad=1</url>
-    <alt>Microsoft Office On Linux!</alt>
-</ad>
Index: appdb/include/header.php
diff -u -p appdb/include/header.php:1.8 appdb/include/header.php:1.9
--- appdb/include/header.php:1.8	21 Nov 2005 17:30:58 -0000
+++ appdb/include/header.php	21 Nov 2005 17:30:58 -0000
@@ -25,8 +25,13 @@
         <td>
           <img src="<?php echo BASE; ?>images/blank.gif" width="10" height="1" alt="">
         </td>
-        <td width="100%" align="center" valign="middle">
-            <?php echo $banner_ad; ?>
+        <td width="468" align="center" valign="middle">
+            <!-- BANNER AD -->
+            <iframe src="http://www.winehq.org/bin/ad" scrolling="no" frameBorder="0" height="60" width="468"></iframe>
+            <!-- END BANNER AD -->
+	    </td>
+        <td>
+          <img src="<?php echo BASE; ?>images/blank.gif" width=10 height=1 alt="">
         </td>
        </tr>
        </table>
Index: appdb/include/incl.php
diff -u -p appdb/include/incl.php:1.25 appdb/include/incl.php:1.26
--- appdb/include/incl.php:1.25	21 Nov 2005 17:30:58 -0000
+++ appdb/include/incl.php	21 Nov 2005 17:30:58 -0000
@@ -58,10 +58,6 @@ function apidb_header($title = 0)
     if ($title)
          $title = " - $title";
 
-    // banner ad
-    include(BASE."include/banner.php");
-    $banner_ad = banner_display();
-
     // Display Header
     include(BASE."include/header.php");
 
Index: appdb/include/banner.php
diff -u -p appdb/include/banner.php:1.5 /dev/null
--- appdb/include/banner.php	21 Nov 2005 17:30:58 -0000
+++ /dev/null	21 Nov 2005 17:30:58 -0000
@@ -1,50 +0,0 @@
-<?php
-/**********************************************/
-/* Banner Ad Library                          */
-/* by Jeremy Newman <jnewman(a)codeweavers.com> */
-/* last modified: 2001.10.08                  */
-/**********************************************/
-
-/**
- * Path for Banner Ads
- */
-function banner_display ()
-{
-    // import banner paths from config
-    $banner_path_468x60 = BASE."banner/468x60/";
-    $banner_path_xml = BASE."banner/xml/";
-
-    // opening html
-    $banner = "";
-    $banner .= "\n\n".'<!-- START BANNER AD -->'."\n";
-    $banner .= "<div align=center id=\"banner\">\n";
-
-    // read dir and get list of banners
-    $ads = array();
-    $d = opendir($banner_path_468x60);
-    while($entry = readdir($d))
-    {
-        if(!ereg("(.+)\\.gif$", $entry, $arr))
-            continue; //"
-            array_push($ads, $arr[1]);
-    }
-    closedir($d);
-
-    // randomly select a banner and display it
-    $img = $ads[(rand(1,count($ads))-1)];
-    $url = get_xml_tag($banner_path_xml.$img.'.xml','url');
-    $alt = get_xml_tag($banner_path_xml.$img.'.xml','alt');
-
-    // da banner
-    $banner .= '<a href="'.$url.'">';	
-    $banner .= '<img src="'.$banner_path_468x60.$img.'.gif" width=468 height=60 alt="'.$alt.'">';
-    $banner .= '</a>'."\n";
-    
-    // closing html
-    $banner .= '</div>'."\n";
-    $banner .= '<!-- END BANNER AD -->'."\n\n";
-
-    return $banner;
-}
-
-?>