Commit:    389ba1477681715c9b34b7574eba737ea27d150b
Author:    Hannes Magnusson <[email protected]>         Wed, 20 Nov 2013 
12:26:48 -0800
Parents:   734e32bfbedceddbdfdd886735be38ac1384689c
Branches:  master

Link:       
http://git.php.net/?p=web/php.git;a=commitdiff;h=389ba1477681715c9b34b7574eba737ea27d150b

Log:
Kill these rouge views, and simplify the mirrorlisting page

Changed paths:
  M  index-beta.php
  M  mirrors.php
  M  styles/mirror.css
  D  views/homepage/sidebar.php
  D  views/homepage/sidebar_conferences.php
  D  views/mirrors/list.php
  D  views/mirrors/main.php

diff --git a/index-beta.php b/index-beta.php
index 8955cfd..612e869 100644
--- a/index-beta.php
+++ b/index-beta.php
@@ -140,7 +140,6 @@ EOF;
 site_header("Hypertext Preprocessor",
     array(
         'current' => 'home',
-        'onload' => 'boldEvents();',
         'headtags' => array(
             '<link rel="alternate" type="application/atom+xml" title="PHP: 
Hypertext Preprocessor" href="' . $MYSITE . 'feed.atom" />',
             '<script type="text/javascript">',
@@ -169,19 +168,24 @@ site_header("Hypertext Preprocessor",
 );
 
 // Print body of home page.
-print $content;
+echo $content;
 
-ob_start();
-print_view('homepage/sidebar.php', array(
-    'announcements' => $announcements
-));
-$sidebar = ob_get_clean();
+$SIDEBAR = <<< SIDEBAR_DATA
+
+$announcements
+    <p class='panel'><a href='/tips.php'>Tips and Tricks</a></p>
+    <p class='panel'><a href='/conferences/'>Conferences</a></p>
+    <p class='panel'><a href='/cal.php'>User Group Events</a></p>
+    <p class='panel'><a href='/thanks.php'>Special Thanks</a></p>
+
+SIDEBAR_DATA;
 
 // Print the common footer.
 site_footer(
     array(
         "atom" => "/feed.atom", // Add a link to the feed at the bottom
         'elephpants' => true,
-        'sidebar' => $sidebar
+        'sidebar' => $SIDEBAR
     )
 );
+
diff --git a/mirrors.php b/mirrors.php
index 38a629a..66ef3af 100644
--- a/mirrors.php
+++ b/mirrors.php
@@ -2,38 +2,80 @@
 // $Id$
 $_SERVER['BASE_PAGE'] = 'mirrors.php';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+include_once $_SERVER['DOCUMENT_ROOT'] . '/include/layout.inc';
 
-// If Beta, load the new beta mirrors page.
-if(myphpnet_beta()) {
-    include_once $_SERVER['DOCUMENT_ROOT'] . '/include/layout.inc';
-    print_view('mirrors/main.php');
-    exit;
-}
+$header_config = array(
+    'current' => 'community',
+    'css'     => array('mirror.css')
+);
+site_header("Mirror Sites", $header_config);
+
+// Lets group the mirrors by country code, for easy output on the page.
+$grouped_mirrors = array();
+foreach($MIRRORS as $key => $mirror) {
+
+    // If the mirror is not all right or it is virtual (not an official 
mirror), skip it
+    if (mirror_status($key) != MIRROR_OK || mirror_type($key) == 
MIRROR_VIRTUAL) { continue; }
 
+    if(!isset($grouped_mirrors[$mirror[0]])) {
+        $grouped_mirrors[$mirror[0]] = array();
+    }
+
+    $grouped_mirrors[$mirror[0]][] = array(
+        'url'            => $key,
+        'country_code'   => $mirror[0],
+        'provider_title' => $mirror[1],
+        'provider_url'   => $mirror[3]
+    );
+}
 
-include_once $_SERVER['DOCUMENT_ROOT'] . '/include/mirrortable.inc';
-site_header("Mirror Sites", array("current" => "community"));
 ?>
+<div id="mirrors-container">
+
+    <h1 class="title">Mirror Sites</h1>
 
-<h1>Mirror Sites</h1>
-
-<p>
- Listed below are the official, active, and fully functional PHP.net mirrors.
- Some mirrors might be missing from this list because mirrors are
- automatically deactivated when problems arise.  Mirrors are continuously
- checked and reactivated when appropriate.
-</p>
-<p>
- We suggest you <a href="my.php">choose</a> a PHP.net mirror that is
- geographically close to you. All mirrors provide identical features and
- services, with the only difference being the increased speed that close
- mirrors provide. Your current mirror is highlighted in the list below.
-</p>
-<p>
- If you are interested in hosting a mirror of this site,
- <a href="/mirroring.php">read our mirroring page</a>.
-</p>
+    <div class="mirrors-header">
+        <p>
+         Listed below are the official, active, and fully functional PHP.net 
mirrors.
+         Some mirrors might be missing from this list because mirrors are
+         automatically deactivated when problems arise.  Mirrors are 
continuously
+         checked and reactivated when appropriate.
+        </p>
+        <p>
+         We suggest you <a href="my.php">choose</a> a PHP.net mirror that is
+         geographically close to you. All mirrors provide identical features 
and
+         services, with the only difference being the increased speed that 
close
+         mirrors provide. Your current mirror is highlighted in the list below.
+        </p>
+        <p>
+         If you are interested in hosting a mirror of this site,
+         <a href="/mirroring.php">read our mirroring page</a>.
+        </p>
+    </div>
+
+    <div class="mirrors-list">
+
+    <?php foreach($grouped_mirrors as $mirrorcode => $country): ?>
+        <div class="mirror">
+            <div class="title"><?php echo $COUNTRIES[$mirrorcode]; ?>
+                <img alt="<?php echo $mirrorcode; ?>"
+                     height="25"
+                     width="45"
+                     src="<?php echo $_SERVER['STATIC_ROOT'] . 
'/images/flags/beta/' . strtolower($mirrorcode) . '.png'; ?>">
+            </div>
+            <?php foreach($country as $mirror): ?>
+            <div class="entry ">
+                <div class="url"><a href="<?php echo $mirror['url']; ?>" 
title="<?php echo clean($mirror['url']); ?>"><?php echo clean($mirror['url']); 
?></a></div>
+                <div class="provider"><a href="<?php echo 
$mirror['provider_url']; ?>" title="<?php echo 
clean($mirror['provider_title']); ?>"><?php echo 
clean($mirror['provider_title']); ?></a></div>
+            </div>
+            <?php endforeach; ?>
+        </div>
+    <?php endforeach ?>
+
+    </div>
+
+</div>
 
 <?php
-mirror_list();
 site_footer();
+
diff --git a/styles/mirror.css b/styles/mirror.css
index c18a675..1ac768e 100644
--- a/styles/mirror.css
+++ b/styles/mirror.css
@@ -45,59 +45,38 @@ div#usernotes a.usernotes-voted:hover {
     font-size: 1.7em;
 }
 
-#mirrors-container .mirrors-header {
 
+#mirrors-container .mirrors-list .mirror {
+       display: inline-block;
+       vertical-align: middle;
+       width: 375px;
+    height: 150px;
+    border: 1px solid #CCC;
+       padding: 20px;
+       margin: 5px;
 }
 
-#mirrors-container .mirrors-header p {
-    margin-bottom: 12px;
-}
-
-#mirrors-container .mirrors-list {
-    border: 1px solid #CCC;
-    border-right: none;
-    border-top: none;
+#mirrors-container .mirrors-list .mirror:hover {
+       background-color: #EEE;
 }
 
-#mirrors-container .mirrors-list .mirror:first-child {
-    margin-left: 0;
+#mirrors-container .mirrors-list .mirror .url {
+       display: inline-block;
 }
 
-#mirrors-container .mirrors-list .mirror {
-    /*margin-left: 12px;*/
-    width: 270px;
-    min-height: 150px;
-    padding: 10px;
-    float: left;
-    border-top: 1px solid #CCC;
-    border-right: 1px solid #CCC;
-    position: relative;
+#mirrors-container .mirrors-list .mirror .provider {
+       display: inline-block;
+       text-indent: 10px;
 }
 
 #mirrors-container .mirrors-list .mirror .title {
-    margin-bottom: 20px;
     font-size: 1.4em;
+       position: relative;
 }
 
-#mirrors-container .mirrors-list .mirror .flag {
-    position: absolute;
-    top: 5px;
-    right: 5px;
+#mirrors-container .mirrors-list img {
+       position: absolute;
+       right: 0px;
 }
 
-#mirrors-container .mirrors-list .mirror .entry:last-child {
-    margin-bottom: 0;
-}
-
-#mirrors-container .mirrors-list .mirror .entry {
-    margin-bottom: 12px;
-}
 
-.mirrors-list .mirror .entry .url {
-    float: left;
-}
-
-.mirrors-list .mirror .entry .provider {
-    float: left;
-    margin-left: 10px;
-}
diff --git a/views/homepage/sidebar.php b/views/homepage/sidebar.php
deleted file mode 100644
index 04155f2..0000000
--- a/views/homepage/sidebar.php
+++ /dev/null
@@ -1,10 +0,0 @@
-
-    <?php if (!empty($announcements)):
-        echo $announcements;
-    endif;?>
-
-    <p class='panel'><a href='/tips.php'>Tips and Tricks</a></p>
-    <p class='panel'><a href='/conferences/'>Conferences</a></p>
-    <p class='panel'><a href='/cal.php'>User Group Events</a></p>
-    <p class='panel'><a href='/thanks.php'>Special Thanks</a></p>
-
diff --git a/views/homepage/sidebar_conferences.php 
b/views/homepage/sidebar_conferences.php
deleted file mode 100644
index cdcf163..0000000
--- a/views/homepage/sidebar_conferences.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<span class="event_USA vevent"><abbr title="2011-07-21" 
class="dtstart">21</abbr>. <a href="/cal.php?id=1704" 
class="summary">TriPUG</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-07-21" 
class="dtstart">21</abbr>. <a href="/cal.php?id=1719" class="summary">OINK-PUG 
(Cincinnati, Ohio)</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-07-21" 
class="dtstart">21</abbr>. <a href="/cal.php?id=1820" class="summary">Utah PHP 
Users Group Meeting</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-07-21" 
class="dtstart">21</abbr>. <a href="/cal.php?id=4507" class="summary">Denver - 
FRPUG</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-07-21" 
class="dtstart">21</abbr>. <a href="/cal.php?id=4915" 
class="summary">Burlington, VT PHP Users Group</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-07-25" 
class="dtstart">25</abbr>. <a href="/cal.php?id=1099" class="summary">Long 
Island PHP Users Group</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-07-25" 
class="dtstart">25</abbr>. <a href="/cal.php?id=4648" class="summary">Tampa Bay 
Florida PHP</a></span><br />
-<span class="event_CAN vevent"><abbr title="2011-07-25" 
class="dtstart">25</abbr>. <a href="/cal.php?id=4767" class="summary">Winnipeg 
PHP</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-07-26" 
class="dtstart">26</abbr>. <a href="/cal.php?id=409" class="summary">New 
York</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-07-26" 
class="dtstart">26</abbr>. <a href="/cal.php?id=384" 
class="summary">AzPHP</a></span><br />
-<span class="event_MYS vevent"><abbr title="2011-07-26" 
class="dtstart">26</abbr>. <a href="/cal.php?id=2527" class="summary">Malaysia 
PHP Meetup</a></span><br />
-<span class="event_DEU vevent"><abbr title="2011-07-26" 
class="dtstart">26</abbr>. <a href="/cal.php?id=2600" class="summary">PHP 
Usergroup Karlsruhe</a></span><br />
-<span class="event_DEU vevent"><abbr title="2011-07-26" 
class="dtstart">26</abbr>. <a href="/cal.php?id=2660" class="summary">PHPUG 
Wuerzburg</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-07-26" 
class="dtstart">26</abbr>. <a href="/cal.php?id=3075" class="summary">DCPHP 
Beverage Subgroup</a></span><br />
-<span class="event_AUS vevent"><abbr title="2011-07-26" 
class="dtstart">26</abbr>. <a href="/cal.php?id=3653" class="summary">Brisbane 
PHP User Group</a></span><br />
-<span class="event_ITA vevent"><abbr title="2011-07-26" 
class="dtstart">26</abbr>. <a href="/cal.php?id=4626" class="summary">PHP User 
Group Roma</a></span><br />
-<span class="event_IRL vevent"><abbr title="2011-07-27" 
class="dtstart">27</abbr>. <a href="/cal.php?id=2500" class="summary">Irish PHP 
Users Group meeting</a></span><br />
-<span class="event_GBR vevent"><abbr title="2011-07-27" 
class="dtstart">27</abbr>. <a href="/cal.php?id=4304" class="summary">Edinburgh 
PHP Users Group</a></span><br />
-<span class="event_SAU vevent"><abbr title="2011-07-28" 
class="dtstart">28</abbr>. <a href="/cal.php?id=1316" class="summary">Arabic 
PHP Group Meeting</a></span><br />
-<span class="event_MYS vevent"><abbr title="2011-07-28" 
class="dtstart">28</abbr>. <a href="/cal.php?id=1708" class="summary">Malaysia 
PHP User Group Meet Up</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-07-28" 
class="dtstart">28</abbr>. <a href="/cal.php?id=2499" class="summary">Sandy PHP 
Group</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-07-28" 
class="dtstart">28</abbr>. <a href="/cal.php?id=4256" class="summary">Memphis 
PHP</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-07-30" 
class="dtstart">30</abbr>. <a href="/cal.php?id=2662" class="summary">Miami 
Linux Meetup</a></span><br />
-<span class="event_BRA vevent"><abbr title="2011-07-30" 
class="dtstart">30</abbr>. <a href="/cal.php?id=3422" class="summary">PHP RIO 
Meetup</a></span><br />
-<span class="event_HKG vevent"><abbr title="2011-07-30" 
class="dtstart">30</abbr>. <a href="/cal.php?id=4019" class="summary">PHP User 
Group Hong Kong</a></span><br />
-<h4 class="eventmonth">August</h4>
-<h4>User Group Events</h4>
-
-<h4>Training</h4>
-<span class="event_ESP vevent"><abbr title="2011-08-01" 
class="dtstart">01</abbr>. <a href="/cal.php?id=338" class="summary">MySQL 
Spain</a></span><br />
-<span class="event_ESP vevent"><abbr title="2011-08-01" 
class="dtstart">01</abbr>. <a href="/cal.php?id=456" class="summary">Curso PHP 
Madrid</a></span><br />
-<span class="event_DEU vevent"><abbr title="2011-08-01" 
class="dtstart">01</abbr>. <a href="/cal.php?id=641" class="summary">PHP 
E-Learning/Germany</a></span><br />
-<span class="event_ESP vevent"><abbr title="2011-08-01" 
class="dtstart">01</abbr>. <a href="/cal.php?id=998" class="summary">Curso 
on-line ActionScript / PHP</a></span><br />
-<span class="event_DEU vevent"><abbr title="2011-08-01" 
class="dtstart">01</abbr>. <a href="/cal.php?id=1198" class="summary">PHP &amp; 
MySQL Training in Kassel</a></span><br />
-<span class="event_BRA vevent"><abbr title="2011-08-01" 
class="dtstart">01</abbr>. <a href="/cal.php?id=1360" class="summary">PHP &amp; 
MySQL com Dreamweaver MX</a></span><br />
-<span class="event_ESP vevent"><abbr title="2011-08-01" 
class="dtstart">01</abbr>. <a href="/cal.php?id=1981" class="summary">Curso 
on-line de PHP</a></span><br />
-<span class="event_BRA vevent"><abbr title="2011-08-01" 
class="dtstart">01</abbr>. <a href="/cal.php?id=2051" class="summary">PHP &amp; 
MYSQL-Construindo WebSites</a></span><br />
-<span class="event_DEU vevent"><abbr title="2011-08-01" 
class="dtstart">01</abbr>. <a href="/cal.php?id=3053" class="summary">PHP 
Training Heilbronn</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-08-01" 
class="dtstart">01</abbr>. <a href="/cal.php?id=4827" 
class="summary">ZEND:Framework Fundamentals</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-08-01" 
class="dtstart">01</abbr>. <a href="/cal.php?id=4821" class="summary">ZEND: PHP 
I Foundations on-line</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-08-01" 
class="dtstart">01</abbr>. <a href="/cal.php?id=4822" class="summary">ZEND: PHP 
II Higher Structures</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-08-01" 
class="dtstart">01</abbr>. <a href="/cal.php?id=4824" class="summary">ZEND: 
Quick Start for PHP</a></span><br />
-<span class="event_PHL vevent"><abbr title="2011-08-01" 
class="dtstart">01</abbr>. <a href="/cal.php?id=4902" class="summary">PHP 
Training Philippines</a></span><br />
-<span class="event_ESP vevent"><abbr title="2011-08-02" 
class="dtstart">02</abbr>. <a href="/cal.php?id=841" class="summary">Curso 
on-line de PHP-MySQL</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-08-02" 
class="dtstart">02</abbr>. <a href="/cal.php?id=1490" class="summary">PHP Class 
at CalTek</a></span><br />
-<span class="event_IND vevent"><abbr title="2011-08-03" 
class="dtstart">03</abbr>. <a href="/cal.php?id=2144" class="summary">PHP 
Training - Chennai - India</a></span><br />
-<span class="event_IND vevent"><abbr title="2011-08-03" 
class="dtstart">03</abbr>. <a href="/cal.php?id=3703" class="summary">Zend 
Certification</a></span><br />
-<span class="event_ESP vevent"><abbr title="2011-08-04" 
class="dtstart">04</abbr>. <a href="/cal.php?id=1516" class="summary">Curso de 
PHP Avanzado en Bilbao</a></span><br />
-<span class="event_BRA vevent"><abbr title="2011-08-06" 
class="dtstart">06</abbr>. <a href="/cal.php?id=2702" class="summary">PHP &amp; 
AJAX -Construindo Websites</a></span><br />
-<span class="event_IND vevent"><abbr title="2011-08-06" 
class="dtstart">06</abbr>. <a href="/cal.php?id=3560" class="summary">Core and 
Advanced PHP Workshop</a></span><br />
-<span class="event_IND vevent"><abbr title="2011-08-07" 
class="dtstart">07</abbr>. <a href="/cal.php?id=2023" class="summary">Ahmedabad 
PHP Group Training</a></span><br />
-<span class="event_IND vevent"><abbr title="2011-08-07" 
class="dtstart">07</abbr>. <a href="/cal.php?id=4230" class="summary">php 
training</a></span><br />
-<span class="event_ESP vevent"><abbr title="2011-08-08" 
class="dtstart">08</abbr>. <a href="/cal.php?id=1466" class="summary">PHP para 
Expertos Curso on-line</a></span><br />
-<span class="event_ECU vevent"><abbr title="2011-08-08" 
class="dtstart">08</abbr>. <a href="/cal.php?id=1583" class="summary">Curso PHP 
y MySQL</a></span><br />
-<span class="event_GBR vevent"><abbr title="2011-08-10" 
class="dtstart">10</abbr>. <a href="/cal.php?id=3385" class="summary">UK Object 
Orientation Workshop</a></span><br />
-<span class="event_GBR vevent"><abbr title="2011-08-11" 
class="dtstart">11</abbr>. <a href="/cal.php?id=3386" class="summary">UK Smarty 
Templating Workshop</a></span><br />
-<span class="event_DEU vevent"><abbr title="2011-08-15" 
class="dtstart">15</abbr>. <a href="/cal.php?id=1200" class="summary">PHP &amp; 
MySQL Training / Gießen</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-08-15" 
class="dtstart">15</abbr>. <a href="/cal.php?id=4828" 
class="summary">ZEND:Framework Advanced On-line</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-08-15" 
class="dtstart">15</abbr>. <a href="/cal.php?id=4823" class="summary">ZEND: 
Test Prep: PHP 5.3 Cert</a></span><br />
-<span class="event_ESP vevent"><abbr title="2011-08-16" 
class="dtstart">16</abbr>. <a href="/cal.php?id=1389" class="summary">Cursos de 
PHP en Bilbao</a></span><br />
-<span class="event_PHL vevent"><abbr title="2011-08-16" 
class="dtstart">16</abbr>. <a href="/cal.php?id=4910" class="summary">Zend 
Framework Philippines</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-08-17" 
class="dtstart">17</abbr>. <a href="/cal.php?id=4908" 
class="summary">Introducing &quot;PaaS in a Box&quot;</a></span><br />
-<span class="event_IND vevent"><abbr title="2011-08-18" 
class="dtstart">18</abbr>. <a href="/cal.php?id=2408" class="summary">Chennai 
PHP Training</a></span><br />
-<span class="event_ZAF vevent"><abbr title="2011-08-22" 
class="dtstart">22</abbr>. <a href="/cal.php?id=2589" class="summary">PHP Intro 
Course South Africa</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-08-22" 
class="dtstart">22</abbr>. <a href="/cal.php?id=4830" class="summary">ZEND: 
Zend Server</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-08-22" 
class="dtstart">22</abbr>. <a href="/cal.php?id=4825" class="summary">ZEND: 
Zend Studio 8</a></span><br />
-<span class="event_GBR vevent"><abbr title="2011-08-23" 
class="dtstart">23</abbr>. <a href="/cal.php?id=231" class="summary">UK PHP 
Training</a></span><br />
-<span class="event_USA vevent"><abbr title="2011-08-23" 
class="dtstart">23</abbr>. <a href="/cal.php?id=4829" class="summary">ZEND: 
On-line PHP Security</a></span><br />
-<span class="event_DEU vevent"><abbr title="2011-08-23" 
class="dtstart">23</abbr>. <a href="/cal.php?id=4909" class="summary">Intro: 
OOP für IBM i Entwickler</a></span><br />
-<span class="event_BRA vevent"><abbr title="2011-08-25" 
class="dtstart">25</abbr>. <a href="/cal.php?id=1137" class="summary">PHP 
Brasil - Training</a></span><br />
-<span class="event_DEU vevent"><abbr title="2011-08-26" 
class="dtstart">26</abbr>. <a href="/cal.php?id=4220" class="summary">PHP 
Training</a></span><br />
-<span class="event_RUS vevent"><abbr title="2011-08-27" 
class="dtstart">27</abbr>. <a href="/cal.php?id=4404" 
class="summary">MySQL5.Проектирован�</a></span><br />
-<span class="event_IND vevent"><abbr title="2011-08-29" 
class="dtstart">29</abbr>. <a href="/cal.php?id=2421" class="summary">Basic PHP 
Course</a></span><br />
-<span class="event_RUS vevent"><abbr title="2011-08-29" 
class="dtstart">29</abbr>. <a href="/cal.php?id=4447" 
class="summary">Разработка на PHP 5</a></span><br />
-END_RSIDEBAR_DATA;
diff --git a/views/mirrors/list.php b/views/mirrors/list.php
deleted file mode 100644
index 8a24c56..0000000
--- a/views/mirrors/list.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-global $MIRRORS, $COUNTRIES;
-
-// Lets group the mirrors by country code, for easy output on the page.
-$grouped_mirrors = array();
-foreach($MIRRORS as $key => $mirror) {
-
-    if(!isset($grouped_mirrors[$mirror[0]])) {
-        $grouped_mirrors[$mirror[0]] = array();
-    }
-
-    $grouped_mirrors[$mirror[0]][] = array(
-        'url'            => $key,
-        'country_code'   => $mirror[0],
-        'title'          => $COUNTRIES[$mirror[0]],
-        'provider_title' => $mirror[1],
-        'provider_url'   => $mirror[3]
-    );
-}
-
-
-foreach($grouped_mirrors as $country) {
-
-    $first = true;
-
-    foreach($country as $mirror) {
-
-        $murl = $mirror['url'];
-        $country = $mirror['country_code'];
-
-        // If the mirror is not all right or it is virtual (not an official 
mirror), skip it
-        if (mirror_status($mirror['url']) != MIRROR_OK || 
mirror_type($mirror['url']) == MIRROR_VIRTUAL) { continue; }
-
-        // Get the country code and check if it is matching the country 
provided (or does not
-        // match the country, which it should not be)
-        $country = mirror_country($mirror['url']);
-
-        if($first):
-        ?>
-
-        <div class="mirror">
-            <div class="title"><?php echo $mirror['title']; ?></div>
-            <div class="flag">
-                <img alt="<?php echo $mirror['title']; ?>"
-                     height="25"
-                     width="45"
-                     src="<?php echo $STATIC_ROOT . '/images/flags/beta/' . 
strtolower($mirror['country_code']) . '.png'; ?>">
-            </div>
-            <?php
-            $first = false;
-
-        endif;
-
-        $mirror_url = htmlspecialchars($mirror['url']);
-        $mirror_provider_name = htmlspecialchars($mirror['provider_title']);
-        ?>
-
-            <div class="entry clearfix">
-                <div class="url"><a href="<?php echo $mirror['url']; ?>" 
title="<?php echo $mirror_url; ?>"><?php echo $mirror_url; ?></a></div>
-                <div class="provider"><a href="<?php echo 
$mirror['provider_url']; ?>" title="<?php echo $mirror_provider_name; ?>"><?php 
echo $mirror_provider_name; ?></a></div>
-            </div>
-    <?php
-    }
-
-    if(!$first):
-    ?>
-
-        </div>
-        <!-- /.mirror -->
-
-    <?php
-    endif;
-
-}
diff --git a/views/mirrors/main.php b/views/mirrors/main.php
deleted file mode 100644
index 4c55bba..0000000
--- a/views/mirrors/main.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-$header_config = array(
-    'current' => 'community',
-    'css'     => array('mirror.css')
-);
-site_header("Mirror Sites", $header_config);
-?>
-<div id="mirrors-container">
-
-    <h1 class="title">Mirror Sites</h1>
-
-    <div class="mirrors-header">
-        <p>
-         Listed below are the official, active, and fully functional PHP.net 
mirrors.
-         Some mirrors might be missing from this list because mirrors are
-         automatically deactivated when problems arise.  Mirrors are 
continuously
-         checked and reactivated when appropriate.
-        </p>
-        <p>
-         We suggest you <a href="my.php">choose</a> a PHP.net mirror that is
-         geographically close to you. All mirrors provide identical features 
and
-         services, with the only difference being the increased speed that 
close
-         mirrors provide. Your current mirror is highlighted in the list below.
-        </p>
-        <p>
-         If you are interested in hosting a mirror of this site,
-         <a href="/mirroring.php">read our mirroring page</a>.
-        </p>
-    </div>
-
-    <div class="mirrors-list clearfix">
-        <?php print_view('mirrors/list.php'); ?>
-    </div>
-    <!-- /.mirrors-list -->
-
-</div>
-<!-- /.mirrors-container -->
-
-<?php
-site_footer();
-?>
\ No newline at end of file
-- 
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to