[43661] trunk/www

[ryandesign at macports.org]

Revision: 43661
          http://trac.macports.org/changeset/43661
Author:   ryandesign at macports.org
Date:     2008-12-12 22:35:29 -0800 (Fri, 12 Dec 2008)
Log Message:
-----------
MacPorts web site: Delete $MPWEB variable, which was apparently meant to hold the path to the current directory but didn't actually do so in the case where I have a local copy of the site in my Sites folder in my home folder for testing. It's not necessary either because PHP searches for includes relative to the current directory already.

Modified Paths:
--------------
    trunk/www/contact.php
    trunk/www/docs.php
    trunk/www/includes/common.inc
    trunk/www/index.php
    trunk/www/install.php
    trunk/www/ports.php

Modified: trunk/www/contact.php
===================================================================
--- trunk/www/contact.php	2008-12-13 06:12:05 UTC (rev 43660)
+++ trunk/www/contact.php	2008-12-13 06:35:29 UTC (rev 43661)
@@ -2,8 +2,7 @@
     /* -*- coding: utf-8; mode: php; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=php:et:sw=4:ts=4:sts=4 */
     /* $Id$ */
     /* Copyright (c) 2007, The MacPorts Project. */
-    $MPWEB = $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['SCRIPT_NAME']);
-    include_once("$MPWEB/includes/common.inc");
+    include_once("includes/common.inc");
     print_header('The MacPorts Project -- Contact Us', 'utf-8');
 ?>
 

Modified: trunk/www/docs.php
===================================================================
--- trunk/www/docs.php	2008-12-13 06:12:05 UTC (rev 43660)
+++ trunk/www/docs.php	2008-12-13 06:35:29 UTC (rev 43661)
@@ -2,8 +2,7 @@
     /* -*- coding: utf-8; mode: php; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=php:et:sw=4:ts=4:sts=4 */
     /* $Id:$ */
     /* Copyright (c) 2008, The MacPorts Project. */
-    $MPWEB = $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['SCRIPT_NAME']);
-    include_once("$MPWEB/includes/common.inc");
+    include_once("includes/common.inc");
     print_header('The MacPorts Project -- Documentation', 'utf-8');
 ?>
 

Modified: trunk/www/includes/common.inc
===================================================================
--- trunk/www/includes/common.inc	2008-12-13 06:12:05 UTC (rev 43660)
+++ trunk/www/includes/common.inc	2008-12-13 06:35:29 UTC (rev 43661)
@@ -41,7 +41,7 @@
 
 # Page header:
 function print_header($title, $encoding) {
-    global $MPWEB, $trac_url, $svn_url, $downloads, $guide_url;
+    global $trac_url, $svn_url, $downloads, $guide_url;
 
     require_once 'AcceptMime.class.php';
     $accept_mime = new AcceptMime();
@@ -51,7 +51,7 @@
     }
     header("Content-Type: $mime_type; charset=$encoding");
 
-    include("$MPWEB/includes/header.inc");
+    include("header.inc");
     print_warnings();
 }
 
@@ -60,9 +60,7 @@
 
 # Print some useful warnings:
 function print_warnings() {
-    global $MPWEB;
-    
-    include("$MPWEB/includes/warnings.inc");
+    include("warnings.inc");
 
 }
 
@@ -160,7 +158,5 @@
 
 # Page footer:
 function print_footer() {
-    global $MPWEB;
-
-    include("$MPWEB/includes/footer.inc");
+    include("footer.inc");
 }

Modified: trunk/www/index.php
===================================================================
--- trunk/www/index.php	2008-12-13 06:12:05 UTC (rev 43660)
+++ trunk/www/index.php	2008-12-13 06:35:29 UTC (rev 43661)
@@ -2,8 +2,7 @@
     /* -*- coding: utf-8; mode: php; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=php:et:sw=4:ts=4:sts=4 */
     /* Copyright (c) 2007, The MacPorts Project. */
     /* $Id$ */
-    $MPWEB = $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['SCRIPT_NAME']);
-    include_once("$MPWEB/includes/common.inc");
+    include_once("includes/common.inc");
     print_header('The MacPorts Project -- Home', 'utf-8');
     $portsdb_info = portsdb_connect($portsdb_host, $portsdb_user, $portsdb_passwd);
 ?>

Modified: trunk/www/install.php
===================================================================
--- trunk/www/install.php	2008-12-13 06:12:05 UTC (rev 43660)
+++ trunk/www/install.php	2008-12-13 06:35:29 UTC (rev 43661)
@@ -3,8 +3,7 @@
     /* $Id$ */
     /* Copyright (c) 2004, OpenDarwin. */
     /* Copyright (c) 2004-2007, The MacPorts Project. */
-    $MPWEB = $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['SCRIPT_NAME']);
-    include_once("$MPWEB/includes/common.inc");
+    include_once("includes/common.inc");
     print_header('The MacPorts Project -- Download & Installation', 'utf-8');
 ?>
 

Modified: trunk/www/ports.php
===================================================================
--- trunk/www/ports.php	2008-12-13 06:12:05 UTC (rev 43660)
+++ trunk/www/ports.php	2008-12-13 06:35:29 UTC (rev 43661)
@@ -5,8 +5,7 @@
     /* Copyright (c) 2004, OpenDarwin. */
     /* Copyright (c) 2004-2007, The MacPorts Project. */
     
-    $MPWEB = $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['SCRIPT_NAME']);
-    include_once("$MPWEB/includes/common.inc");
+    include_once("includes/common.inc");
     
     $portsdb_info = portsdb_connect($portsdb_host, $portsdb_user, $portsdb_passwd);
     $sql = "SELECT UNIX_TIMESTAMP(activity_time) FROM $portsdb_name.log ORDER BY UNIX_TIMESTAMP(activity_time) DESC";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081212/a26da4aa/attachment-0001.html>