Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 418847 | Differences between
and this patch

Collapse All | Expand All

(-).buildpath (-12 / +1 lines)
Lines 1-16 Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
1
<?xml version="1.0" encoding="UTF-8"?>
2
<buildpath>
2
<buildpath>
3
	<buildpathentry kind="src" path="classes/drops"/>
3
	<buildpathentry kind="src" path=""/>
4
	<buildpathentry kind="src" path="classes/friends"/>
5
	<buildpathentry kind="src" path="classes/membership"/>
6
	<buildpathentry kind="src" path="classes/polls"/>
7
	<buildpathentry kind="src" path="classes/projects"/>
8
	<buildpathentry kind="src" path="json"/>
9
	<buildpathentry kind="src" path="system"/>
10
	<buildpathentry kind="src" path="themes/Lazarus"/>
11
	<buildpathentry kind="src" path="themes/Miasma"/>
12
	<buildpathentry kind="src" path="themes/Nova"/>
13
	<buildpathentry kind="src" path="themes/Phoenix"/>
14
	<buildpathentry kind="src" path="themes/PlainText"/>
15
	<buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
4
	<buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
16
</buildpath>
5
</buildpath>
(-).project (+6 lines)
Lines 6-11 Link Here
6
	</projects>
6
	</projects>
7
	<buildSpec>
7
	<buildSpec>
8
		<buildCommand>
8
		<buildCommand>
9
			<name>org.eclipse.wst.common.project.facet.core.builder</name>
10
			<arguments>
11
			</arguments>
12
		</buildCommand>
13
		<buildCommand>
9
			<name>org.eclipse.wst.validation.validationbuilder</name>
14
			<name>org.eclipse.wst.validation.validationbuilder</name>
10
			<arguments>
15
			<arguments>
11
			</arguments>
16
			</arguments>
Lines 18-22 Link Here
18
	</buildSpec>
23
	</buildSpec>
19
	<natures>
24
	<natures>
20
		<nature>org.eclipse.php.core.PHPNature</nature>
25
		<nature>org.eclipse.php.core.PHPNature</nature>
26
		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
21
	</natures>
27
	</natures>
22
</projectDescription>
28
</projectDescription>
(-).settings/org.eclipse.wst.common.project.facet.core.xml (+7 lines)
Added Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
2
<faceted-project>
3
  <fixed facet="php.component"/>
4
  <fixed facet="php.core.component"/>
5
  <installed facet="php.core.component" version="1"/>
6
  <installed facet="php.component" version="5.4"/>
7
</faceted-project>
(-)system/app.class.php (-1 / +7 lines)
Lines 124-129 Link Here
124
124
125
		# Initialize backtrace storage
125
		# Initialize backtrace storage
126
		$this->query_btrace = array();
126
		$this->query_btrace = array();
127
		
128
		# Set server timezone
129
		date_default_timezone_set("America/Montreal");
127
	}
130
	}
128
131
129
132
Lines 1143-1148 Link Here
1143
		$this->set("foundation_db_class",	 	'FoundationDBConnectionRW');
1146
		$this->set("foundation_db_class",	 	'FoundationDBConnectionRW');
1144
		$this->set("foundation_db_classfile_ro",'dbconnection_foundation_ro.class.php');
1147
		$this->set("foundation_db_classfile_ro",'dbconnection_foundation_ro.class.php');
1145
		$this->set("foundation_db_class_ro", 	'DBConnectionFoundation');
1148
		$this->set("foundation_db_class_ro", 	'DBConnectionFoundation');
1149
		$this->set("gerrit_db_classfile_ro",	'dbconnection_gerrit_ro.class.php');
1150
		$this->set("gerrit_db_class_ro",		'DBConnectionGerrit');
1146
		$this->set("ipzilla_db_classfile_ro",	'dbconnection_ipzilla_ro.class.php');
1151
		$this->set("ipzilla_db_classfile_ro",	'dbconnection_ipzilla_ro.class.php');
1147
		$this->set("ipzilla_db_class_ro",	 	'DBConnectionIPZillaRO');
1152
		$this->set("ipzilla_db_class_ro",	 	'DBConnectionIPZillaRO');
1148
		$this->set("ipzilla_db_classfile",	 	'dbconnection_ipzilla_rw.class.php');
1153
		$this->set("ipzilla_db_classfile",	 	'dbconnection_ipzilla_rw.class.php');
Lines 1164-1170 Link Here
1164
		$this->set("conferences_db_classfile",	'dbconnection.conferences_rw.class.php');
1169
		$this->set("conferences_db_classfile",	'dbconnection.conferences_rw.class.php');
1165
		$this->set("conferences_db_class", 	 	'DBConnectionConferencesRW');
1170
		$this->set("conferences_db_class", 	 	'DBConnectionConferencesRW');
1166
		$this->set("marketplace_db_classfile_ro",	 	'dbconnection_marketplace_ro.class.php');
1171
		$this->set("marketplace_db_classfile_ro",	 	'dbconnection_marketplace_ro.class.php');
1167
		$this->set("marketplace_db_class_ro",	 	 	'DBConnectionMarket');
1172
		$this->set("marketplace_db_class_ro",	  	'DBConnectionMarket');
1168
		#-----------------------------------------------------------------------------------------------------
1173
		#-----------------------------------------------------------------------------------------------------
1169
	}
1174
	}
1170
1175
Lines 1314-1319 Link Here
1314
	function eclipse_sql ($statement) 	{ return $this->sql ($statement, "eclipse"); }			// Whole Eclipse database
1319
	function eclipse_sql ($statement) 	{ return $this->sql ($statement, "eclipse"); }			// Whole Eclipse database
1315
	function epic_sql ($statement) 		{ return $this->sql ($statement, "epic"); }				// EPIC (read-only!)
1320
	function epic_sql ($statement) 		{ return $this->sql ($statement, "epic"); }				// EPIC (read-only!)
1316
	function foundation_sql($statement) { return $this->sql ($statement, "foundation"); }		// Foundation internal database
1321
	function foundation_sql($statement) { return $this->sql ($statement, "foundation"); }		// Foundation internal database
1322
	function gerrit_sql($statement) 	{ return $this->sql ($statement, "gerrit"); }			// Gerrit
1317
	function ipzilla_sql ($statement) 	{ return $this->sql ($statement, "ipzilla"); }			// IPZilla
1323
	function ipzilla_sql ($statement) 	{ return $this->sql ($statement, "ipzilla"); }			// IPZilla
1318
	function ipzillatest_sql ($statement) { return $this->sql ($statement, "ipzillatest"); }	// IPZilla test database
1324
	function ipzillatest_sql ($statement) { return $this->sql ($statement, "ipzillatest"); }	// IPZilla test database
1319
	function live_sql ($statement) 		{ return $this->sql ($statement, "live"); }				// Eclipse Live (read-only!)
1325
	function live_sql ($statement) 		{ return $this->sql ($statement, "live"); }				// Eclipse Live (read-only!)
(-)themes/Nova/footer.php (-4 / +4 lines)
Lines 1-4 Link Here
1
<? 
1
<?php
2
/*******************************************************************************
2
/*******************************************************************************
3
 * Copyright (c) 2008 Eclipse Foundation and others.
3
 * Copyright (c) 2008 Eclipse Foundation and others.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
Lines 12-18 Link Here
12
	
12
	
13
?>
13
?>
14
		<br style="clear:both;height:1em;"/>&nbsp;
14
		<br style="clear:both;height:1em;"/>&nbsp;
15
		</div> <?//This Div tag is used to close #novaContent?>
15
		</div> <?php //This Div tag is used to close #novaContent?>
16
		<div id="clearFooter"></div>
16
		<div id="clearFooter"></div>
17
		<div id="footer">
17
		<div id="footer">
18
			<ul id="footernav">
18
			<ul id="footernav">
Lines 22-28 Link Here
22
<li><a href="<?= $App->getWWWPrefix() ?>/legal/copyright.php">Copyright Agent</a></li>
22
<li><a href="<?= $App->getWWWPrefix() ?>/legal/copyright.php">Copyright Agent</a></li>
23
<li><a href="<?= $App->getWWWPrefix() ?>/legal/">Legal</a></li>
23
<li><a href="<?= $App->getWWWPrefix() ?>/legal/">Legal</a></li>
24
<li><a href="<?= $App->getWWWPrefix() ?>/org/foundation/contact.php">Contact Us</a></li></ul>
24
<li><a href="<?= $App->getWWWPrefix() ?>/org/foundation/contact.php">Contact Us</a></li></ul>
25
			<span id="copyright">Copyright &copy; <?=date("Y");?> The Eclipse Foundation. All Rights Reserved.</span>
25
			<span id="copyright">Copyright &copy; <?=date("Y", time());?> The Eclipse Foundation. All Rights Reserved.</span>
26
		</div>
26
		</div>
27
	</div> <?//This Div tag is used to close #novaWrapper?>
27
	</div> <?php //This Div tag is used to close #novaWrapper?>
28
</body></html>
28
</body></html>
(-)themes/Nova/header.php (-8 / +7 lines)
Lines 1-6 Link Here
1
<?
1
<?php
2
/*******************************************************************************
2
/*******************************************************************************
3
 * Copyright (c) 2008 Eclipse Foundation and others.
3
 * Copyright (c) 2008-2013 Eclipse Foundation and others.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 15-23 Link Here
15
if(isset($App)) {
15
if(isset($App)) {
16
	$www_prefix = $App->getWWWPrefix();
16
	$www_prefix = $App->getWWWPrefix();
17
}
17
}
18
?>
19
<?php print $this->getDoctype();?>
20
18
19
print $this->getDoctype();
20
?>
21
<head>
21
<head>
22
	<title><?= $pageTitle ?></title><meta name="author" content="<?= $pageAuthor ?>" />
22
	<title><?= $pageTitle ?></title><meta name="author" content="<?= $pageAuthor ?>" />
23
	<?php
23
	<?php
Lines 42-57 Link Here
42
	<!-- Dependencies -->
42
	<!-- Dependencies -->
43
	<!-- Source File -->
43
	<!-- Source File -->
44
<?php if($App->getjQuery()) echo $App->getjQuery(); ?>
44
<?php if($App->getjQuery()) echo $App->getjQuery(); ?>
45
45
<?php if( isset($extraHtmlHeaders) ) echo $extraHtmlHeaders; ?>
46
	<?php if( isset($extraHtmlHeaders) ) echo $extraHtmlHeaders; ?>
47
</head>
46
</head>
48
<body>
47
<body>
49
	<div id="novaWrapper"<?php if ($App->OutDated == TRUE) print ' class="deprecated"';?>><?//This Div is closed in footer.php?>
48
	<div id="novaWrapper"<?php if ($App->OutDated == TRUE) print ' class="deprecated"';?>><?//This Div is closed in footer.php?>
50
		<div id="clearHeader">
49
		<div id="clearHeader">
51
			<div id="logo">
50
			<div id="logo">
52
				<? if ($App->Promotion == FALSE) { ?>
51
				<?php if ($App->Promotion == FALSE) { ?>
53
					 <img src="/eclipse.org-common/themes/Nova/images/eclipse.png" alt="Eclipse.org"/>
52
					 <img src="/eclipse.org-common/themes/Nova/images/eclipse.png" alt="Eclipse.org"/>
54
				<? } else {
53
				<?php } else {
55
						if ($App->CustomPromotionPath != "") {
54
						if ($App->CustomPromotionPath != "") {
56
							include($App->CustomPromotionPath);
55
							include($App->CustomPromotionPath);
57
						}
56
						}
(-)themes/Nova/menu.php (-5 / +5 lines)
Lines 1-4 Link Here
1
<?
1
<?php
2
/*******************************************************************************
2
/*******************************************************************************
3
 * Copyright (c) 2008-2012 Eclipse Foundation and others.
3
 * Copyright (c) 2008-2012 Eclipse Foundation and others.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
Lines 29-35 Link Here
29
29
30
		?>
30
		?>
31
		<li><a href="<?= $MenuItem->getURL(); ?>" target="<?= $MenuItem->getTarget(); ?>"><?= $MenuItem->getText(); ?></a></li>
31
		<li><a href="<?= $MenuItem->getURL(); ?>" target="<?= $MenuItem->getTarget(); ?>"><?= $MenuItem->getText(); ?></a></li>
32
	<? }
32
	<?php }
33
	$menuHTML = ob_get_clean();
33
	$menuHTML = ob_get_clean();
34
	?>
34
	?>
35
<div id="header">
35
<div id="header">
Lines 43-54 Link Here
43
		<script type="text/javascript" src="//www.google.com/coop/cse/brand?form=searchbox_017941334893793413703%3Asqfrdtd112s&amp;lang=en"></script>
43
		<script type="text/javascript" src="//www.google.com/coop/cse/brand?form=searchbox_017941334893793413703%3Asqfrdtd112s&amp;lang=en"></script>
44
	</div>
44
	</div>
45
</div>
45
</div>
46
	<? if ($Nav == NULL) { ?>
46
	<?php if ($Nav == NULL) { ?>
47
	<div id="novaContent">
47
	<div id="novaContent">
48
	<? }
48
	<?php }
49
	else { ?>
49
	else { ?>
50
	<div id="novaContent" class="faux"><br id="faux-br" style="clear:both;height:1em;"/>
50
	<div id="novaContent" class="faux"><br id="faux-br" style="clear:both;height:1em;"/>
51
	<? } ?>
51
	<?php } ?>
52
	<?php if ($App->OutDated == TRUE) {?>
52
	<?php if ($App->OutDated == TRUE) {?>
53
		<div class="message-box-container">
53
		<div class="message-box-container">
54
			<div class="message-box error">This page is deprecated and may contain some information that is no longer relevant or accurate.</div>
54
			<div class="message-box error">This page is deprecated and may contain some information that is no longer relevant or accurate.</div>
(-)themes/Nova/nav.php (-22 / +15 lines)
Lines 1-4 Link Here
1
<? 
1
<?php
2
/*******************************************************************************
2
/*******************************************************************************
3
 * Copyright (c) 2006 Eclipse Foundation and others.
3
 * Copyright (c) 2006 Eclipse Foundation and others.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
Lines 19-50 Link Here
19
		$Link = $Nav->getLinkAt($i);
19
		$Link = $Nav->getLinkAt($i);
20
		if( $Link->getURL() == "" ) {
20
		if( $Link->getURL() == "" ) {
21
			if($Link->getTarget() == "__SEPARATOR") {
21
			if($Link->getTarget() == "__SEPARATOR") {
22
			   
22
			   echo '<li class="separator"><a class="separator">';
23
			   ?><li class="separator"><a class="separator"><?php
23
			   echo $Link->getText() . '<img src="/eclipse.org-common/themes/Nova/images/separator.png" alt="navigation image"/></a></li>';
24
			   ?><?= $Link->getText() ?><img src="/eclipse.org-common/themes/Nova/images/separator.png" alt="navigation image"/></a></li>
25
<?php
26
			} else {
24
			} else {
27
				?><li><a class="nolink" href="#"><?= $Link->getText() ?></a></li>
25
				echo '<li><a class="nolink" href="#">' . $Link->getText() . '</a></li>';
28
<?php
29
			}
26
			}
30
		} elseif (stripos($Link->getURL(), 'project_summary.php') !== FALSE) { 
27
		} elseif (stripos($Link->getURL(), 'project_summary.php') !== FALSE) { 
31
				?><li class="about"><a href="<?= $Link->getURL() ?>"><?=$Link->getText();?></a></li> <?
28
				echo '<li class="about"><a href="' . $Link->getURL() . '">' . $Link->getText() . '</a></li>';
32
		} else {
29
		} else {
33
			if($Link->getTarget() == "__SEPARATOR") {
30
			if($Link->getTarget() == "__SEPARATOR") {
34
				?><li class="separator"><a class="separator" href="<?= $Link->getURL() ?>">
31
				echo '<li class="separator"><a class="separator" href="' . $Link->getURL() . '">';
35
				<?= $Link->getText() ?><img src="/eclipse.org-common/themes/Nova/images/separator.png" alt="navigation image"/></a></li>
32
				echo $Link->getText() . '<img src="/eclipse.org-common/themes/Nova/images/separator.png" alt="navigation image"/></a></li>';
36
<?php
37
			} else {
33
			} else {
38
				?><li><a href="<?= $Link->getURL() ?>" target="<?= ($Link->getTarget() == "_blank") ? "_blank" : "_self" ?>"><?= $Link->getText() ?></a></li>
34
				echo '<li><a href="' . $Link->getURL() . '" target="' . ($Link->getTarget() == "_blank" ? "_blank" : "_self") . '">' . $Link->getText() . '</a></li>';
39
<?php
40
			}
35
			}
41
		}
36
		}		
42
		
43
	}
37
	}
44
	?>
38
echo "</ul>";
45
</ul>
39
echo $Nav->getHTMLBlock();
46
<? echo $Nav->getHTMLBlock(); ?>
40
/*
47
<? /*
48
	
41
	
49
	<br />
42
	<br />
50
	<div class="sideitem">
43
	<div class="sideitem">
Lines 60-65 Link Here
60
		</p>
53
		</p>
61
		<br />
54
		<br />
62
	</div>
55
	</div>
63
*/  ?>
56
*/
64
57
?>
65
</div>
58
</div>

Return to bug 418847