SF.net SVN: phpwiki:[11098] trunk

Revision: 11098
          http://sourceforge.net/p/phpwiki/code/11098
Author:   carstenklapp
Date:     2025-02-14 05:17:25 +0000 (Fri, 14 Feb 2025)
Log Message:
-----------
Added 404 error to HttpClient?.php which is displyed now in PhotoAlbum? plugin. Removed url of defunct example website that broke PhpWikiManual.

Modified Paths:
--------------
    trunk/lib/HttpClient.php
    trunk/lib/plugin/PhotoAlbum.php
    trunk/pgsrc/Help%2FPhotoAlbumPlugin
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/HttpClient.php
===================================================================
--- trunk/lib/HttpClient.php	2025-02-14 04:37:31 UTC (rev 11097)
+++ trunk/lib/HttpClient.php	2025-02-14 05:17:25 UTC (rev 11098)
@@ -240,6 +240,10 @@
             $this->errormsg = '401 ' . $status_string;
             return false;
         }
+        if ($this->status == '404') {
+            $this->errormsg = '404 ' . $status_string;
+            return false;
+        }
         // If $persist_referers, set the referer ready for the next request
         if (isset($this->persist_referers)) {
             $this->debug('Persisting referer: ' . $this->getRequestURL());

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2025-02-14 04:37:31 UTC (rev 11097)
+++ trunk/lib/plugin/PhotoAlbum.php	2025-02-14 05:17:25 UTC (rev 11098)
@@ -576,6 +576,7 @@
         }
         if (preg_match('/^(http|ftp|https):\/\//i', $src)) {
             $contents = url_get_contents($src);
+            //fixme: check for error returned
             $web_location = 1;
         } else {
             $web_location = 0;

Modified: trunk/pgsrc/Help%2FPhotoAlbumPlugin
===================================================================
--- trunk/pgsrc/Help%2FPhotoAlbumPlugin	2025-02-14 04:37:31 UTC (rev 11097)
+++ trunk/pgsrc/Help%2FPhotoAlbumPlugin	2025-02-14 05:17:25 UTC (rev 11098)
@@ -1,12 +1,14 @@
-Date: Fri, 16 Dec 2022 15:26:20 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.6.4)
+Date: Thu, 13 Feb 2025 07:36:15 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPhotoAlbumPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
+  author=The%20PhpWiki%20Team;
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-The **~PhotoAlbum** [[Help:WikiPlugin|plugin]] makes an 'album' by displaying a set of photos listed in a text file with optional descriptions.
+The **~PhotoAlbum** [[Help:WikiPlugin|plugin]] makes an 'album' by displaying
+a set of photos listed in a text file with optional descriptions.
 
 == Usage ==
 
@@ -66,7 +68,7 @@
 | **link**
 |
 Boolean. If true, each image will be hyperlinked to a page where
-the single photo will be shown full-size. Only works when mode 
+the single photo will be shown full-size. Only works when mode
 is different from 'normal'
 | true
 |-
@@ -163,16 +165,16 @@
          duration=1
 >>
 
-or via external URL:
+or via external URL: (this can be slow)
 {{{
 <<PhotoAlbum
-src="http://phpwiki.demo.free.fr/themes/Hawaiian/images/pictures/PhotoAlbum.csv"
+src="http://localhost/phpwiki/themes/Hawaiian/images/pictures/PhotoAlbum.csv"
 mode=tiles
 >>
 }}}
 
-<<PhotoAlbum
-src="http://phpwiki.demo.free.fr/themes/Hawaiian/images/pictures/PhotoAlbum.csv"
+<<!PhotoAlbum
+src="http://localhost/phpwiki/themes/Hawaiian/images/pictures/PhotoAlbum.csv"
 mode=tiles
 >>
 

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2025-02-14 04:37:31 UTC (rev 11097)
+++ trunk/pgsrc/ReleaseNotes	2025-02-14 05:17:25 UTC (rev 11098)
@@ -1,4 +1,4 @@
-Date: Fri, 14 Feb 2025 04:29:43 +0000
+Date: Fri, 14 Feb 2025 05:10:22 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.5)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -25,8 +25,9 @@
 * Improved formatting output for debugging, adjusted code for themes
   which depend on default theme. Added signature template (can be disabled
   by adding this line to themeinfo.php: ##$this->addImageAlias('signature', false);)##
+* Added 404 error to HttpClient.php which is displyed now in PhotoAlbum plugin.
+  Removed url of defunct example website that broke PhpWikiManual.
 
-
 == 1.6.4 2024-03-13 Marc-Etienne Vargenau, Christof Meerwald ==
 
 * Upgrade PEAR to relase 1.10.14, PEAR DB to release 1.12.1

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.