Remove deprecated function use.
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=423377
diff --git a/woolsey/functions.php b/woolsey/functions.php
index 0029cda..bb63478 100644
--- a/woolsey/functions.php
+++ b/woolsey/functions.php
@@ -1,34 +1,27 @@
<?
/*******************************************************************************
- * Copyright (c) 2009 Eclipse Foundation and others.
+ * Copyright (c) 2007,2014 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
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Wayne Beaton (Eclipse Foundation)- initial API and implementation
+ * Wayne Beaton (Eclipse Foundation) - initial API and implementation
+ * Wayne Beaton (Eclipse Foundation) - Bug 423377
*******************************************************************************/
-function get_meta_tags_from_html_document($file_name) {
+function get_title_from_html_document($file_name) {
$header = get_header_from_html_document($file_name);
-
+
/*
- * Break the header up into multiple lines. Handle the
- * case where line breaks are lf, crlf, or cr.
+ * If we can match a title tag, extract it.
*/
-
- $lines = preg_split("/\r?\n|\r/", $header);
- $tags = array();
- foreach ($lines as $line) {
- /*
- * If we can match a title tag, extract it.
- */
- if (eregi("<meta *name= *\"([^\"]*)\" *content *= *\"([^\"]*)\" */?>", $line, $matches)) {
- if (count(matches > 2)) $tags[$matches[1]] = $matches[2];
- }
+ if (preg_match('/<title>(.*)<\/title>/i', $header, $title)) {
+ return $title[1];
}
- return $tags;
+
+ return "An Eclipse Proposal";
}
function get_header_from_html_document(&$file_name) {
@@ -42,7 +35,7 @@
* Only read up to the part that includes the
* end tag for the header area.
*/
- if (eregi("</head>", $part)) break;
+ if (preg_match('/<\/head>/i', $part)) break;
}
fclose($handle);
return $content;
diff --git a/woolsey/index.php b/woolsey/index.php
index 94e9d21..a6f4f70 100644
--- a/woolsey/index.php
+++ b/woolsey/index.php
@@ -1,12 +1,7 @@
<?php require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); $App = new App(); $Nav = new Nav(); $Menu = new Menu(); include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop'
require_once("functions.php");
-$meta_tags = get_meta_tags_from_html_document("proposal.html");
-
-$proposal_title = $meta_tags['proposal-name'];
-$container_name = $meta_tags['container-name'];
-$communication_channel_url = $meta_tags['communication-channel-url'];
-$communication_channel_name = $meta_tags['communication-channel-name'];
+$proposal_title = get_title_from_html_document("proposal.html");
$pageTitle = $proposal_title;
$pageKeywords = "Eclipse, proposal, <?= $proposal_title ?>";
@@ -16,23 +11,15 @@
?>
<div id="maincontent">
<div id="midcolumn">
+
+ <h1><?= $proposal_title ?></h1>
+
<?php
include_once($_SERVER['DOCUMENT_ROOT'] . "/projects/fragments/proposal-page-header.php");
generate_header($proposal_title);
+
+ include("proposal.html");
?>
-
- <h1><?= $proposal_title ?></h1>
-
- <p>The <?= $proposal_title ?> project is a proposed open source project under the
- <?= $container_name ?> Project</a>.</p>
-
- <p>This proposal is in the Project Proposal Phase (as defined in the
- Eclipse Development Process) and is written to declare its intent and
- scope. We solicit additional participation and input from the Eclipse
- community. Please send all feedback to
- <a href="<?= $communication_channel_url ?>"><?= $communication_channel_name ?></a>.</p>
-
- <?php include("proposal.html"); ?>
</div>
</div>
<?php
diff --git a/woolsey/proposal.html b/woolsey/proposal.html
index a96aaf5..2725cfb 100644
--- a/woolsey/proposal.html
+++ b/woolsey/proposal.html
@@ -57,6 +57,7 @@
<meta name="communication-channel-url" content="http://www.eclipse.org/forums/eclipse.woolsey" />
<meta name="communication-channel-name" content="Woolsey forum" />
+<title>Woolsey</title>
</head>
<body>
