[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[phoenix-dev] Commit eclipse.org-common to www
|
Team,
I'd like to commit the recent e.o-c changes to www.eclipse.org. It's
mainly some code updated for PHP5 compatibility, and adding the Google
Search code to $App as a function so that we don't repeat the same block
of code in millions of places on the site.
Attached is the patch. I'll commit this live later today (Eastern)
unless someone objects.
Denis
--
Denis Roy
Manager, IT Infrastructure
Eclipse Foundation, Inc. -- http://www.eclipse.org/
Office: 613.224.9461 x224 (Eastern time)
Cell: 819.210.6481
denis.roy@xxxxxxxxxxx
### Eclipse Workspace Patch 1.0
#P www
Index: eclipse.org-common/themes/Lazarus/header.php
===================================================================
RCS file: /cvsroot/org.eclipse/www/eclipse.org-common/themes/Lazarus/header.php,v
retrieving revision 1.3
diff -u -r1.3 header.php
--- eclipse.org-common/themes/Lazarus/header.php 20 Mar 2007 17:02:37 -0000 1.3
+++ eclipse.org-common/themes/Lazarus/header.php 20 Feb 2008 20:03:57 -0000
@@ -19,11 +19,9 @@
$www_prefix = $App->getWWWPrefix();
}
?>
-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html xmlns="http://www.w3.org/1999/xhtml";>
-<head><title><?= $pageTitle ?></title><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="author" content="<?= $pageAuthor ?>" />
+<head><title><?= $pageTitle ?></title><meta name="author" content="<?= $pageAuthor ?>" />
<meta name="keywords" content="<?= $pageKeywords ?>" />
<link rel="stylesheet" type="text/css" href="/eclipse.org-common/themes/Lazarus/css/small.css" title="small" />
<link rel="alternate stylesheet" type="text/css" href="/eclipse.org-common/themes/Lazarus/css/large.css" title="large" />
@@ -33,13 +31,9 @@
<script type="text/javascript" src="/eclipse.org-common/themes/Phoenix/styleswitcher.js"></script>
<?php if( isset($extraHtmlHeaders) ) echo $extraHtmlHeaders; ?>
</head>
-
<body>
<div id="header">
</div>
-
<div id="headerlogo">
-
<a href="/"><img src="/eclipse.org-common/themes/Lazarus/images/header_logo.gif" alt="Eclipse Logo" class="logo" border="0" height="75" width="241" /></a>
-
-</div>
+</div>
\ No newline at end of file
Index: eclipse.org-common/system/app.class.php
===================================================================
RCS file: /cvsroot/org.eclipse/www/eclipse.org-common/system/app.class.php,v
retrieving revision 1.41
diff -u -r1.41 app.class.php
--- eclipse.org-common/system/app.class.php 23 Nov 2007 00:57:32 -0000 1.41
+++ eclipse.org-common/system/app.class.php 20 Feb 2008 20:03:57 -0000
@@ -25,28 +25,28 @@
#
#*****************************************************************************
- var $APPVERSION = "1.0";
- var $APPNAME = "Eclipse.org";
+ private $APPVERSION = "1.0";
+ private $APPNAME = "Eclipse.org";
- var $DEFAULT_ROW_HEIGHT = 20;
+ private $DEFAULT_ROW_HEIGHT = 20;
- var $POST_MAX_SIZE = 262144; # 256KB Max post
- var $OUR_DOWNLOAD_URL = "http://download1.eclipse.org";;
- var $PUB_DOWNLOAD_URL = "http://download.eclipse.org";;
- var $DOWNLOAD_BASE_PATH = "/home/data2/httpd/download.eclipse.org";
+ private $POST_MAX_SIZE = 262144; # 256KB Max post
+ private $OUR_DOWNLOAD_URL = "http://download1.eclipse.org";;
+ private $PUB_DOWNLOAD_URL = "http://download.eclipse.org";;
+ private $DOWNLOAD_BASE_PATH = "/home/data2/httpd/download.eclipse.org";
- var $WWW_PREFIX = ""; # default is relative
+ private $WWW_PREFIX = ""; # default is relative
# Additional page-related variables
- var $ExtraHtmlHeaders = "";
- var $PageRSS = "";
- var $PageRSSTitle = "";
+ private $ExtraHtmlHeaders = "";
+ private $PageRSS = "";
+ private $PageRSSTitle = "";
- var $THEME_LIST = array("", "Phoenix", "Miasma", "Lazarus");
+ private $THEME_LIST = array("", "Phoenix", "Miasma", "Lazarus");
# Set to TRUE to disable all database operations
- var $DB_READ_ONLY = false;
+ private $DB_READ_ONLY = false;
# Default constructor
function App() {
@@ -757,6 +757,18 @@
$_value = mysql_real_escape_string($_value, $_dbh);
return $_value;
}
+
+ function getGoogleSearchHTML() {
+ $strn = <<<EOHTML
+ <form action="http://www.google.com/cse"; id="searchbox_017941334893793413703:sqfrdtd112s">
+ <input type="hidden" name="cx" value="017941334893793413703:sqfrdtd112s" />
+ <input type="text" name="q" size="25" />
+ <input type="submit" name="sa" value="Search" />
+ </form>
+ <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=searchbox_017941334893793413703%3Asqfrdtd112s&lang=en";></script>";
+EOHTML;
+ return $strn;
+ }
}
?>
\ No newline at end of file
Index: eclipse.org-common/system/nav.class.php
===================================================================
RCS file: /cvsroot/org.eclipse/www/eclipse.org-common/system/nav.class.php,v
retrieving revision 1.20
diff -u -r1.20 nav.class.php
--- eclipse.org-common/system/nav.class.php 20 Mar 2007 17:25:20 -0000 1.20
+++ eclipse.org-common/system/nav.class.php 20 Feb 2008 20:03:57 -0000
@@ -27,7 +27,7 @@
#
#*****************************************************************************
- var $LinkList = array();
+ private $LinkList = array();
function getLinkList() {
Index: eclipse.org-common/system/link.class.php
===================================================================
RCS file: /cvsroot/org.eclipse/www/eclipse.org-common/system/link.class.php,v
retrieving revision 1.5
diff -u -r1.5 link.class.php
--- eclipse.org-common/system/link.class.php 14 Dec 2006 16:33:03 -0000 1.5
+++ eclipse.org-common/system/link.class.php 20 Feb 2008 20:03:57 -0000
@@ -24,10 +24,10 @@
#
#*****************************************************************************
- var $Text = "";
- var $URL = "";
- var $Target = "";
- var $Level = 0;
+ private $Text = "";
+ private $URL = "";
+ private $Target = "";
+ private $Level = 0;
function getText() {
Index: eclipse.org-common/system/menu.class.php
===================================================================
RCS file: /cvsroot/org.eclipse/www/eclipse.org-common/system/menu.class.php,v
retrieving revision 1.18
diff -u -r1.18 menu.class.php
--- eclipse.org-common/system/menu.class.php 20 Mar 2007 20:14:56 -0000 1.18
+++ eclipse.org-common/system/menu.class.php 20 Feb 2008 20:03:57 -0000
@@ -25,9 +25,9 @@
#
#*****************************************************************************
- var $MenuItemList = array();
+ private $MenuItemList = array();
- var $projectBranding = "";
+ private $projectBranding = "";
function getProjectBranding() {
return $this->projectBranding;
Index: eclipse.org-common/system/smartconnection.class.php
===================================================================
RCS file: /cvsroot/org.eclipse/www/eclipse.org-common/system/smartconnection.class.php,v
retrieving revision 1.3
diff -u -r1.3 smartconnection.class.php
--- eclipse.org-common/system/smartconnection.class.php 14 Dec 2006 16:33:03 -0000 1.3
+++ eclipse.org-common/system/smartconnection.class.php 20 Feb 2008 20:03:57 -0000
@@ -13,10 +13,12 @@
if (file_exists("/home/data/httpd/eclipse-php-classes/system/dbconnection.class.php")) {
require_once "/home/data/httpd/eclipse-php-classes/system/dbconnection.class.php";
- require_once "/home/data/httpd/eclipse-php-classes/system/dbconnection_epic_ro.class.php";
+ require_once "/home/data/httpd/eclipse-php-classes/system/dbconnection_epic_ro.class.php";
+ require_once "/home/data/httpd/eclipse-php-classes/system/dbconnection_live_rw.class.php";
} else {
require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/dbconnection.class.php");
- require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/dbconnection_epic_ro.class.php");
+ require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/dbconnection_epic_ro.class.php");
+ require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/dbconnection_live_rw.class.php");
}
?>
\ No newline at end of file
Index: eclipse.org-common/themes/Phoenix/header.php
===================================================================
RCS file: /cvsroot/org.eclipse/www/eclipse.org-common/themes/Phoenix/header.php,v
retrieving revision 1.28
diff -u -r1.28 header.php
--- eclipse.org-common/themes/Phoenix/header.php 16 Jan 2008 15:25:25 -0000 1.28
+++ eclipse.org-common/themes/Phoenix/header.php 20 Feb 2008 20:03:57 -0000
@@ -20,7 +20,7 @@
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html xmlns="http://www.w3.org/1999/xhtml";>
-<head><title><?= $pageTitle ?></title><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><meta name="author" content="<?= $pageAuthor ?>" />
+<head><title><?= $pageTitle ?></title><meta name="author" content="<?= $pageAuthor ?>" />
<meta name="keywords" content="<?= $pageKeywords ?>" /><link rel="stylesheet" type="text/css" href="/eclipse.org-common/themes/Phoenix/css/small.css" title="small" /><link rel="alternate stylesheet" type="text/css" href="/eclipse.org-common/themes/Phoenix/css/large.css" title="large" /><link rel="stylesheet" type="text/css" href="/eclipse.org-common/themes/Phoenix/css/visual.css" media="screen" /><link rel="stylesheet" type="text/css" href="/eclipse.org-common/themes/Phoenix/css/layout.css" media="screen" />
<!--[if IE]> <link rel="stylesheet" type="text/css" href="/eclipse.org-common/themes/Phoenix/css/ie_style.css" media="screen"/> <![endif]-->
<link rel="stylesheet" type="text/css" href="/eclipse.org-common/themes/Phoenix/css/print.css" media="print" />
@@ -33,14 +33,13 @@
<a href="/"><img src="/eclipse.org-common/themes/Phoenix/images/eclipse_home_header.jpg" alt="" /></a><h1>Eclipse</h1>
</div>
<div id="header-global-holder" class="eclipse-main-global">
- <div id="header-global-links">
- <ul>
- <li><a href="/org/foundation/contact.php" class="first_one">Contact</a></li><li><a href="/legal/">Legal</a></li>
+ <div id="header-global-links"><ul>
+<li><a href="/org/foundation/contact.php" class="first_one">Contact</a></li><li><a href="/legal/">Legal</a></li>
</ul>
</div>
<div id="header-icons">
- <a href="http://live.eclipse.org";><img src="/eclipse.org-common/themes/Phoenix/images/Icon_Live.png" width="28" height="28" alt="Eclipse Live" title="Eclipse Live" /></a>
- <a href="http://www.eclipseplugincentral.com";><img src="/eclipse.org-common/themes/Phoenix/images/Icon_plugin.png" width="28" height="28" alt="Eclipse Plugin Central" title="Eclipse Plugin Central" /></a>
- <a href="http://www.planeteclipse.org";><img src="/eclipse.org-common/themes/Phoenix/images/Icon_planet.png" width="28" height="28" alt="Planet Eclipse" title="Planet Eclipse" /></a>
+<a href="http://live.eclipse.org";><img src="/eclipse.org-common/themes/Phoenix/images/Icon_Live.png" width="28" height="28" alt="Eclipse Live" title="Eclipse Live" /></a>
+<a href="http://www.eclipseplugincentral.com";><img src="/eclipse.org-common/themes/Phoenix/images/Icon_plugin.png" width="28" height="28" alt="Eclipse Plugin Central" title="Eclipse Plugin Central" /></a>
+<a href="http://www.planeteclipse.org";><img src="/eclipse.org-common/themes/Phoenix/images/Icon_planet.png" width="28" height="28" alt="Planet Eclipse" title="Planet Eclipse" /></a>
</div>
</div></div>
\ No newline at end of file
Index: eclipse.org-common/themes/Miasma/header.php
===================================================================
RCS file: /cvsroot/org.eclipse/www/eclipse.org-common/themes/Miasma/header.php,v
retrieving revision 1.6
diff -u -r1.6 header.php
--- eclipse.org-common/themes/Miasma/header.php 16 Jan 2008 15:25:25 -0000 1.6
+++ eclipse.org-common/themes/Miasma/header.php 20 Feb 2008 20:03:57 -0000
@@ -21,7 +21,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html xmlns="http://www.w3.org/1999/xhtml";>
<head><title><?= $pageTitle ?></title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="author" content="<?= $pageAuthor ?>" />
<meta name="keywords" content="<?= $pageKeywords ?>" />
<link rel="stylesheet" type="text/css" href="/eclipse.org-common/themes/Miasma/css/visual.css" media="screen" />
@@ -29,7 +28,6 @@
<link rel="stylesheet" type="text/css" href="/eclipse.org-common/themes/Phoenix/css/print.css" media="print" />
<?php if( isset($extraHtmlHeaders) ) echo $extraHtmlHeaders; ?>
</head>
-
<body>
<div id="header">
<a href="/"><img src="/eclipse.org-common/themes/Miasma/images/header_logo.gif" alt="Eclipse Logo" class="logo" border="0" height="71" width="128" /></a>
