Attachment 236915 Details for Bug 418847 – Patch v2

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch v2

eclipse.org-common.patch (text/plain), 10.52 KB, created by Denis Roy

on 2013-10-25 13:05:26 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Denis Roy

Created: 2013-10-25 13:05:26 EDT

Size: 10.52 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P eclipse.org-common
>diff --git .buildpath .buildpath
>index 9bcca21..8bcb4b5 100644
>--- .buildpath
>+++ .buildpath
>@@ -1,16 +1,5 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <buildpath>
>-	<buildpathentry kind="src" path="classes/drops"/>
>-	<buildpathentry kind="src" path="classes/friends"/>
>-	<buildpathentry kind="src" path="classes/membership"/>
>-	<buildpathentry kind="src" path="classes/polls"/>
>-	<buildpathentry kind="src" path="classes/projects"/>
>-	<buildpathentry kind="src" path="json"/>
>-	<buildpathentry kind="src" path="system"/>
>-	<buildpathentry kind="src" path="themes/Lazarus"/>
>-	<buildpathentry kind="src" path="themes/Miasma"/>
>-	<buildpathentry kind="src" path="themes/Nova"/>
>-	<buildpathentry kind="src" path="themes/Phoenix"/>
>-	<buildpathentry kind="src" path="themes/PlainText"/>
>+	<buildpathentry kind="src" path=""/>
> 	<buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
> </buildpath>
>diff --git .project .project
>index e465536..a939f29 100644
>--- .project
>+++ .project
>@@ -6,6 +6,11 @@
> 	</projects>
> 	<buildSpec>
> 		<buildCommand>
>+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
> 			<name>org.eclipse.wst.validation.validationbuilder</name>
> 			<arguments>
> 			</arguments>
>@@ -18,5 +23,6 @@
> 	</buildSpec>
> 	<natures>
> 		<nature>org.eclipse.php.core.PHPNature</nature>
>+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
> 	</natures>
> </projectDescription>
>diff --git .settings/org.eclipse.wst.common.project.facet.core.xml .settings/org.eclipse.wst.common.project.facet.core.xml
>new file mode 100644
>index 0000000..cd5af24
>--- /dev/null
>+++ .settings/org.eclipse.wst.common.project.facet.core.xml
>@@ -0,0 +1,7 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<faceted-project>
>+  <fixed facet="php.component"/>
>+  <fixed facet="php.core.component"/>
>+  <installed facet="php.core.component" version="1"/>
>+  <installed facet="php.component" version="5.4"/>
>+</faceted-project>
>diff --git system/app.class.php system/app.class.php
>index 0a36bf3..a408a1c 100644
>--- system/app.class.php
>+++ system/app.class.php
>@@ -124,6 +124,9 @@
> 
> 		# Initialize backtrace storage
> 		$this->query_btrace = array();
>+		
>+		# Set server timezone
>+		date_default_timezone_set("America/Montreal");
> 	}
> 
> 
>@@ -1143,6 +1146,8 @@
> 		$this->set("foundation_db_class",	 	'FoundationDBConnectionRW');
> 		$this->set("foundation_db_classfile_ro",'dbconnection_foundation_ro.class.php');
> 		$this->set("foundation_db_class_ro", 	'DBConnectionFoundation');
>+		$this->set("gerrit_db_classfile_ro",	'dbconnection_gerrit_ro.class.php');
>+		$this->set("gerrit_db_class_ro",		'DBConnectionGerrit');
> 		$this->set("ipzilla_db_classfile_ro",	'dbconnection_ipzilla_ro.class.php');
> 		$this->set("ipzilla_db_class_ro",	 	'DBConnectionIPZillaRO');
> 		$this->set("ipzilla_db_classfile",	 	'dbconnection_ipzilla_rw.class.php');
>@@ -1164,7 +1169,7 @@
> 		$this->set("conferences_db_classfile",	'dbconnection.conferences_rw.class.php');
> 		$this->set("conferences_db_class", 	 	'DBConnectionConferencesRW');
> 		$this->set("marketplace_db_classfile_ro",	 	'dbconnection_marketplace_ro.class.php');
>-		$this->set("marketplace_db_class_ro",	 	 	'DBConnectionMarket');
>+		$this->set("marketplace_db_class_ro",	  	'DBConnectionMarket');
> 		#-----------------------------------------------------------------------------------------------------
> 	}
> 
>@@ -1314,6 +1319,7 @@
> 	function eclipse_sql ($statement) 	{ return $this->sql ($statement, "eclipse"); }			// Whole Eclipse database
> 	function epic_sql ($statement) 		{ return $this->sql ($statement, "epic"); }				// EPIC (read-only!)
> 	function foundation_sql($statement) { return $this->sql ($statement, "foundation"); }		// Foundation internal database
>+	function gerrit_sql($statement) 	{ return $this->sql ($statement, "gerrit"); }			// Gerrit
> 	function ipzilla_sql ($statement) 	{ return $this->sql ($statement, "ipzilla"); }			// IPZilla
> 	function ipzillatest_sql ($statement) { return $this->sql ($statement, "ipzillatest"); }	// IPZilla test database
> 	function live_sql ($statement) 		{ return $this->sql ($statement, "live"); }				// Eclipse Live (read-only!)
>diff --git themes/Nova/footer.php themes/Nova/footer.php
>index 111b488..457925c 100644
>--- themes/Nova/footer.php
>+++ themes/Nova/footer.php
>@@ -1,4 +1,4 @@
>-<? 
>+<?php
> /*******************************************************************************
>  * Copyright (c) 2008 Eclipse Foundation and others.
>  * All rights reserved. This program and the accompanying materials
>@@ -12,7 +12,7 @@
> 	
> ?>
> 		<br style="clear:both;height:1em;"/>&nbsp;
>-		</div> <?//This Div tag is used to close #novaContent?>
>+		</div> <?php //This Div tag is used to close #novaContent?>
> 		<div id="clearFooter"></div>
> 		<div id="footer">
> 			<ul id="footernav">
>@@ -22,7 +22,7 @@
> <li><a href="<?= $App->getWWWPrefix() ?>/legal/copyright.php">Copyright Agent</a></li>
> <li><a href="<?= $App->getWWWPrefix() ?>/legal/">Legal</a></li>
> <li><a href="<?= $App->getWWWPrefix() ?>/org/foundation/contact.php">Contact Us</a></li></ul>
>-			<span id="copyright">Copyright &copy; <?=date("Y");?> The Eclipse Foundation. All Rights Reserved.</span>
>+			<span id="copyright">Copyright &copy; <?=date("Y", time());?> The Eclipse Foundation. All Rights Reserved.</span>
> 		</div>
>-	</div> <?//This Div tag is used to close #novaWrapper?>
>+	</div> <?php //This Div tag is used to close #novaWrapper?>
> </body></html>
>\ No newline at end of file
>diff --git themes/Nova/header.php themes/Nova/header.php
>index 88c462c..e930a1a 100644
>--- themes/Nova/header.php
>+++ themes/Nova/header.php
>@@ -1,6 +1,6 @@
>-<?
>+<?php
> /*******************************************************************************
>- * Copyright (c) 2008 Eclipse Foundation and others.
>+ * Copyright (c) 2008-2013 Eclipse Foundation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -15,9 +15,9 @@
> if(isset($App)) {
> 	$www_prefix = $App->getWWWPrefix();
> }
>-?>
>-<?php print $this->getDoctype();?>
> 
>+print $this->getDoctype();
>+?>
> <head>
> 	<title><?= $pageTitle ?></title><meta name="author" content="<?= $pageAuthor ?>" />
> 	<?php
>@@ -42,16 +42,15 @@
> 	
> 	
> <?php if($App->getjQuery()) echo $App->getjQuery(); ?>
>-
>-	<?php if( isset($extraHtmlHeaders) ) echo $extraHtmlHeaders; ?>
>+<?php if( isset($extraHtmlHeaders) ) echo $extraHtmlHeaders; ?>
> </head>
> <body>
> 	<div id="novaWrapper"<?php if ($App->OutDated == TRUE) print ' class="deprecated"';?>><?//This Div is closed in footer.php?>
> 		<div id="clearHeader">
> 			<div id="logo">
>-				<? if ($App->Promotion == FALSE) { ?>
>+				<?php if ($App->Promotion == FALSE) { ?>
> 					 <img src="/eclipse.org-common/themes/Nova/images/eclipse.png" alt="Eclipse.org"/>
>-				<? } else {
>+				<?php } else {
> 						if ($App->CustomPromotionPath != "") {
> 							include($App->CustomPromotionPath);
> 						}
>diff --git themes/Nova/menu.php themes/Nova/menu.php
>index c4b4269..4fae2a5 100644
>--- themes/Nova/menu.php
>+++ themes/Nova/menu.php
>@@ -1,4 +1,4 @@
>-<?
>+<?php
> /*******************************************************************************
>  * Copyright (c) 2008-2012 Eclipse Foundation and others.
>  * All rights reserved. This program and the accompanying materials
>@@ -29,7 +29,7 @@
> 
> 		?>
> 		<li><a href="<?= $MenuItem->getURL(); ?>" target="<?= $MenuItem->getTarget(); ?>"><?= $MenuItem->getText(); ?></a></li>
>-	<? }
>+	<?php }
> 	$menuHTML = ob_get_clean();
> 	?>
> <div id="header">
>@@ -43,12 +43,12 @@
> 		<script type="text/javascript" src="//www.google.com/coop/cse/brand?form=searchbox_017941334893793413703%3Asqfrdtd112s&amp;lang=en"></script>
> 	</div>
> </div>
>-	<? if ($Nav == NULL) { ?>
>+	<?php if ($Nav == NULL) { ?>
> 	<div id="novaContent">
>-	<? }
>+	<?php }
> 	else { ?>
> 	<div id="novaContent" class="faux"><br id="faux-br" style="clear:both;height:1em;"/>
>-	<? } ?>
>+	<?php } ?>
> 	<?php if ($App->OutDated == TRUE) {?>
> 		<div class="message-box-container">
> 			<div class="message-box error">This page is deprecated and may contain some information that is no longer relevant or accurate.</div>
>diff --git themes/Nova/nav.php themes/Nova/nav.php
>index 2f252f0..53f82e1 100644
>--- themes/Nova/nav.php
>+++ themes/Nova/nav.php
>@@ -1,4 +1,4 @@
>-<? 
>+<?php
> /*******************************************************************************
>  * Copyright (c) 2006 Eclipse Foundation and others.
>  * All rights reserved. This program and the accompanying materials
>@@ -19,32 +19,25 @@
> 		$Link = $Nav->getLinkAt($i);
> 		if( $Link->getURL() == "" ) {
> 			if($Link->getTarget() == "__SEPARATOR") {
>-			   
>-			   ?><li class="separator"><a class="separator"><?php
>-			   ?><?= $Link->getText() ?><img src="/eclipse.org-common/themes/Nova/images/separator.png" alt="navigation image"/></a></li>
>-<?php
>+			   echo '<li class="separator"><a class="separator">';
>+			   echo $Link->getText() . '<img src="/eclipse.org-common/themes/Nova/images/separator.png" alt="navigation image"/></a></li>';
> 			} else {
>-				?><li><a class="nolink" href="#"><?= $Link->getText() ?></a></li>
>-<?php
>+				echo '<li><a class="nolink" href="#">' . $Link->getText() . '</a></li>';
> 			}
> 		} elseif (stripos($Link->getURL(), 'project_summary.php') !== FALSE) { 
>-				?><li class="about"><a href="<?= $Link->getURL() ?>"><?=$Link->getText();?></a></li> <?
>+				echo '<li class="about"><a href="' . $Link->getURL() . '">' . $Link->getText() . '</a></li>';
> 		} else {
> 			if($Link->getTarget() == "__SEPARATOR") {
>-				?><li class="separator"><a class="separator" href="<?= $Link->getURL() ?>">
>-				<?= $Link->getText() ?><img src="/eclipse.org-common/themes/Nova/images/separator.png" alt="navigation image"/></a></li>
>-<?php
>+				echo '<li class="separator"><a class="separator" href="' . $Link->getURL() . '">';
>+				echo $Link->getText() . '<img src="/eclipse.org-common/themes/Nova/images/separator.png" alt="navigation image"/></a></li>';
> 			} else {
>-				?><li><a href="<?= $Link->getURL() ?>" target="<?= ($Link->getTarget() == "_blank") ? "_blank" : "_self" ?>"><?= $Link->getText() ?></a></li>
>-<?php
>+				echo '<li><a href="' . $Link->getURL() . '" target="' . ($Link->getTarget() == "_blank" ? "_blank" : "_self") . '">' . $Link->getText() . '</a></li>';
> 			}
>-		}
>-		
>+		}		
> 	}
>-	?>
>-</ul>
>-<? echo $Nav->getHTMLBlock(); ?>
>-<? /*
>+echo "</ul>";
>+echo $Nav->getHTMLBlock();
>+/*
> 	
> 	<br />
> 	<div class="sideitem">
>@@ -60,6 +53,6 @@
> 		</p>
> 		<br />
> 	</div>
>-*/  ?>
>-
>-</div>
>+*/
>+?>
>+</div>
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 418847: 236188 | 236915 | 236958