Boost logo

Boost-Commit :

Date view Thread view Subject view Author view

From: daniel_james_at_[hidden]
Date: 2008-08-23 02:27:31

Author: danieljames
Date: 2008-08-23 02:27:30 EDT (Sat, 23 Aug 2008)
New Revision: 48305
URL: http://svn.boost.org/trac/boost/changeset/48305

Log:
Merge from beta, up to 48303.
Added:
   website/public_html/live/common/code/boost_error_page.php
      - copied unchanged from r48303, /website/public_html/beta/common/code/boost_error_page.php
Text files modified:
   website/public_html/live/common/code/boost_archive.php | 7 ++++---
   website/public_html/live/doc/libraries.xml | 12 ++++++------
   website/public_html/live/style/css_0/content.css | 1 -
   website/public_html/live/style/css_0/section-doc.css | 4 ++++
   website/public_html/live/support/bugs.html | 4 ++--
   website/public_html/live/users/download/entry.php | 5 +++++
   website/public_html/live/users/history/entry.php | 5 +++++
   website/public_html/live/users/news/entry.php | 5 +++++
   website/public_html/live/users/uses_open.html | 2 +-
   9 files changed, 32 insertions(+), 13 deletions(-)

Modified: website/public_html/live/common/code/boost_archive.php
==============================================================================
--- website/public_html/live/common/code/boost_archive.php (original)
+++ website/public_html/live/common/code/boost_archive.php 2008-08-23 02:27:30 EDT (Sat, 23 Aug 2008)
@@ -193,7 +193,7 @@
     {
         $h = '';
         
- preg_match('@text/html; charset=([^\s"]+)@i',$this->content_,$charset);
+ preg_match('@text/html; charset=([^\s"\']+)@i',$this->content_,$charset);
         if (isset($charset[1]))
         {
             $h .= <<<HTML
@@ -273,7 +273,7 @@
         /* */
         for ($i = 0; $i < 8; $i++) {
             $text = preg_replace(
- '@<img src="[\./a-z]*images/([^.]+)\.png" alt="([^"]+)"([ /]*)>@Ssm',
+ '@<img src="[\./a-z]*images/(prev|up|home|next|tip|note|warning|important|caution|sidebar|hint|alert)\.png" alt="([^"]+)"([ /]*)>@Ssm',
                 '<img src="/gfx/space.png" alt="${2}" class="${1}_image" />',
                 $text );
         }
@@ -358,8 +358,9 @@
             '@<img(.*)align="?absmiddle"?[^>]*>@i',
             '<img${1} class="inline" />',
             $text );
+ /* Remove certain attributes */
         $text = preg_replace(
- '@[\s]+(border|cellpadding|cellspacing|width|height|valign|align|frame|rules|naturalsizeflag|background)=[^\s>]+@i',
+ '@[\s]+(border|cellpadding|cellspacing|width|height|valign|align|frame|rules|naturalsizeflag|background)=("[^"]*"?|\'[^\']*\'?|[^\s/>]+)@i',
             '',
             $text );
         $text = preg_replace(

Modified: website/public_html/live/doc/libraries.xml
==============================================================================
--- website/public_html/live/doc/libraries.xml (original)
+++ website/public_html/live/doc/libraries.xml 2008-08-23 02:27:30 EDT (Sat, 23 Aug 2008)
@@ -434,7 +434,7 @@
     <std-proposal>false</std-proposal>
     <std-tr1>false</std-tr1>
     <header-only>false</header-only>
- <autolink>false</autolink>
+ <autolink>true</autolink>
   </library>
   <library>
     <key>integer</key>
@@ -504,8 +504,8 @@
     <documentation>libs/iostreams/doc/index.html</documentation>
     <std-proposal>false</std-proposal>
     <std-tr1>false</std-tr1>
- <header-only>true</header-only>
- <autolink>false</autolink>
+ <header-only>false</header-only>
+ <autolink>true</autolink>
   </library>
   <library>
     <key>iterator</key>
@@ -644,7 +644,7 @@
     <std-proposal>false</std-proposal>
     <std-tr1>false</std-tr1>
     <header-only>false</header-only>
- <autolink>false</autolink>
+ <autolink>true</autolink>
   </library>
   <library>
     <key>mpl</key>
@@ -800,8 +800,8 @@
     <documentation>doc/html/program_options.html</documentation>
     <std-proposal>false</std-proposal>
     <std-tr1>false</std-tr1>
- <header-only>true</header-only>
- <autolink>false</autolink>
+ <header-only>false</header-only>
+ <autolink>true</autolink>
   </library>
   <library>
     <key>property_map</key>

Modified: website/public_html/live/style/css_0/content.css
==============================================================================
--- website/public_html/live/style/css_0/content.css (original)
+++ website/public_html/live/style/css_0/content.css 2008-08-23 02:27:30 EDT (Sat, 23 Aug 2008)
@@ -363,7 +363,6 @@
 #content .section dl.fields dd {
   margin: 0em 0em 0em 7.5em;
   padding: 0em 0em 0em 0em;
- line-height: 1.3em;
 }
 /* A directory, as in the index for the people. */
 #content .section ul.directory,

Modified: website/public_html/live/style/css_0/section-doc.css
==============================================================================
--- website/public_html/live/style/css_0/section-doc.css (original)
+++ website/public_html/live/style/css_0/section-doc.css 2008-08-23 02:27:30 EDT (Sat, 23 Aug 2008)
@@ -260,6 +260,10 @@
 #content .section img {
   border: none;
 }
+#content .section span.inlinemediaobject img
+{
+ vertical-align: middle;
+}
 
 /* */
 #content .section h2 *,

Modified: website/public_html/live/support/bugs.html
==============================================================================
--- website/public_html/live/support/bugs.html (original)
+++ website/public_html/live/support/bugs.html 2008-08-23 02:27:30 EDT (Sat, 23 Aug 2008)
@@ -50,8 +50,8 @@
                   in</a>.</li>
 
                   <li><strong>Even if you don't have a userid</strong>, visit
- <a href="http://svn.boost.org/trac/boost/settings">the
- settings page</a> to enter or confirm an email address at
+ <a href="http://svn.boost.org/trac/boost/prefs">the
+ preferences page</a> to enter or confirm an email address at
                   which you can be reached. Most bug reports require some
                   interaction with the reporter, and if we can't follow up
                   with you, chances are good that your efforts at reporting

Modified: website/public_html/live/users/download/entry.php
==============================================================================
--- website/public_html/live/users/download/entry.php (original)
+++ website/public_html/live/users/download/entry.php 2008-08-23 02:27:30 EDT (Sat, 23 Aug 2008)
@@ -2,6 +2,11 @@
 require_once(dirname(__FILE__) . '/../../common/code/boost_feed.php');
 $_downloads = new boost_feed(dirname(__FILE__) . '/../../feed/downloads.rss', '/users/download');
 $_guid = basename($_SERVER["PATH_INFO"]);
+if(!isset($_downloads->db[$_guid])) {
+ require_once(dirname(__FILE__) . '/../../common/code/boost_error_page.php');
+ error_page_404();
+ exit(0);
+}
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

Modified: website/public_html/live/users/history/entry.php
==============================================================================
--- website/public_html/live/users/history/entry.php (original)
+++ website/public_html/live/users/history/entry.php 2008-08-23 02:27:30 EDT (Sat, 23 Aug 2008)
@@ -2,6 +2,11 @@
 require_once(dirname(__FILE__) . '/../../common/code/boost_feed.php');
 $_history = new boost_feed(dirname(__FILE__) . '/../../feed/history.rss', '/users/history');
 $_guid = basename($_SERVER["PATH_INFO"]);
+if(!isset($_history->db[$_guid])) {
+ require_once(dirname(__FILE__) . '/../../common/code/boost_error_page.php');
+ error_page_404();
+ exit(0);
+}
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

Modified: website/public_html/live/users/news/entry.php
==============================================================================
--- website/public_html/live/users/news/entry.php (original)
+++ website/public_html/live/users/news/entry.php 2008-08-23 02:27:30 EDT (Sat, 23 Aug 2008)
@@ -2,6 +2,11 @@
 require_once(dirname(__FILE__) . '/../../common/code/boost_feed.php');
 $_news = new boost_feed(dirname(__FILE__) . '/../../feed/news.rss', '/users/news');
 $_guid = basename($_SERVER["PATH_INFO"]);
+if(!isset($_news->db[$_guid])) {
+ require_once(dirname(__FILE__) . '/../../common/code/boost_error_page.php');
+ error_page_404();
+ exit(0);
+}
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

Modified: website/public_html/live/users/uses_open.html
==============================================================================
--- website/public_html/live/users/uses_open.html (original)
+++ website/public_html/live/users/uses_open.html 2008-08-23 02:27:30 EDT (Sat, 23 Aug 2008)
@@ -147,7 +147,7 @@
               <p>See <a class="external" href=
               "http://www.code-shop.com/2007/1/14/openzoep">description</a>
               and <a class="external" href=
- "http://www.code-shop.com/openzoep">trac&amp;svn</a>.</p>
+ "https://open.code-shop.com/trac/openzoep">trac&amp;svn</a>.</p>
 
               <p><em>Abonja / Whitelabelvideo</em></p>
 

Date view Thread view Subject view Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk