phpwiki-checkins Mailing List for PhpWiki (Page 147)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7541
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7541&view=rev
Author:   vargenau
Date:     2010-06-17 11:34:55 +0000 (Thu, 17 Jun 2010)

Log Message:
-----------
We assume PHP >= 4.3.10

Modified Paths:
--------------
    trunk/lib/DbaDatabase.php
    trunk/lib/HttpClient.php
    trunk/lib/WikiDB.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/XMLRPC/utils.php
    trunk/lib/XmlElement.php
    trunk/lib/plugin/SyntaxHighlighter.php
    trunk/lib/stdlib.php
    trunk/lib/ziplib.php

Modified: trunk/lib/DbaDatabase.php
===================================================================

--- trunk/lib/DbaDatabase.php	2010-06-17 10:15:47 UTC (rev 7540)
+++ trunk/lib/DbaDatabase.php	2010-06-17 11:34:55 UTC (rev 7541)
@@ -50,8 +50,7 @@
             $mode = 'r';
         }
 
-        // lock supported since 4.3.0:
-        if (check_php_version(4,3,0) and (strlen($mode) == 1)) {
+        if ((strlen($mode) == 1)) {
             // PHP 4.3.x Windows lock bug workaround: http://bugs.php.net/bug.php?id=23975
             if (isWindows()) {
                 $mode .= "-"; 			// suppress locking, or

Modified: trunk/lib/HttpClient.php
===================================================================
--- trunk/lib/HttpClient.php	2010-06-17 10:15:47 UTC (rev 7540)
+++ trunk/lib/HttpClient.php	2010-06-17 11:34:55 UTC (rev 7541)
@@ -121,8 +121,7 @@
             }
             return false;
         }
-        if (check_php_version(4,3,0))
-            socket_set_timeout($fp, $this->timeout);
+        socket_set_timeout($fp, $this->timeout);
 	if ( $this->method == 'POST' and preg_match("/\<methodCall\>/", $this->postdata))
 	    $request = $this->buildRequest("text/xml"); //xmlrpc
 	else if ( $this->method == 'POST' and strstr("\r\nContent-Disposition: form-data; filename=", 

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2010-06-17 10:15:47 UTC (rev 7540)
+++ trunk/lib/WikiDB.php	2010-06-17 11:34:55 UTC (rev 7541)
@@ -275,15 +275,6 @@
      */
     function getAllPages($include_empty=false, $sortby='', $limit='', $exclude='') 
     {
-        // HACK: memory_limit=8M will fail on too large pagesets. old php on unix only!
-        if (USECACHE) {
-            $mem = ini_get("memory_limit");
-            if ($mem and !$limit and !isWindows() and !check_php_version(4,3)) {
-                $limit = 450;
-                $GLOBALS['request']->setArg('limit', $limit);
-                $GLOBALS['request']->setArg('paging', 'auto');
-            }
-        }
         $result = $this->_backend->get_all_pages($include_empty, $sortby, $limit, 
                                                  $exclude);
         return new WikiDB_PageIterator($this, $result, 
@@ -527,12 +518,6 @@
             if ($updateWikiLinks) {
 		$lookbehind = "/(?<=[\W:])\Q";
 		$lookahead = "\E(?=[\W:])/";
-		if (!check_php_version(4,3,3)) {
-		    $lookbehind = "/(?<=[\W:])";
-		    $lookahead  = "(?=[\W:])/";
-		    $from = preg_quote($from, "/");
-		    $to   = preg_quote($to, "/");
-		}
                 require_once('lib/plugin/WikiAdminSearchReplace.php');
                 $links = $oldpage->getBackLinks();
                 while ($linked_page = $links->next()) {

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2010-06-17 10:15:47 UTC (rev 7540)
+++ trunk/lib/WikiPluginCached.php	2010-06-17 11:34:55 UTC (rev 7541)
@@ -1119,12 +1119,7 @@
 
     // run "echo $source | $commandLine" and return result
     function filterThroughCmd($source, $commandLine) {
-        if (check_php_version(4,3,0))
-            return $this->newFilterThroughCmd($source, $commandLine);
-        elseif (strlen($source) < 255)
-            return $this->oldFilterThroughCmd($source, $commandLine);
-        else
-            return $this->oldFilterThroughCmd_File($source, $commandLine);
+        return $this->newFilterThroughCmd($source, $commandLine);
     }
 
     /**

Modified: trunk/lib/XMLRPC/utils.php
===================================================================
--- trunk/lib/XMLRPC/utils.php	2010-06-17 10:15:47 UTC (rev 7540)
+++ trunk/lib/XMLRPC/utils.php	2010-06-17 11:34:55 UTC (rev 7541)
@@ -211,27 +211,8 @@
    $response_buf = "";
    if ($host && $uri && $port) {
        $request_xml = xmlrpc_encode_request($method, $args, $output);
-       if (isWindows() and !check_php_version(4,3,0)) {
-       	   include_once("lib/HttpClient.php");
-	   $http = new HttpClient($host, $port);
-	   if ($timeout)
-	       $http->timeout = $timeout;
-	   $http->setDebug($debug);
-	   // todo: new auth and/or session cookies
-	   if ($user)
-	       $http->setAuthorization($user, $pass);
-	   if ($cookies)
-	       $http->setCookies($cookies);
-	   if ($http->post($uri, $request_xml))
-	       $response_buf = $http->content;
-	   else {
-	       $response_buf = $http->errormsg;
-	       return $response_buf;
-	   }
-       } else {
-	   $response_buf = xu_query_http_post($request_xml, $host, $uri, $port, $debug,
-					      $timeout, $user, $pass, $secure);
-       }
+       $response_buf = xu_query_http_post($request_xml, $host, $uri, $port, $debug,
+                                          $timeout, $user, $pass, $secure);
        $retval = find_and_decode_xml($response_buf, $debug);
    }
    return $retval;

Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php	2010-06-17 10:15:47 UTC (rev 7540)
+++ trunk/lib/XmlElement.php	2010-06-17 11:34:55 UTC (rev 7541)
@@ -536,7 +536,7 @@
  */
 function XmlContent_quote ($string) {
     if (!$string) return $string;
-    if (check_php_version(4,1) and isset($GLOBALS['charset'])
+    if (isset($GLOBALS['charset'])
         and (!defined('IGNORE_CHARSET_NOT_SUPPORTED_WARNING') or !IGNORE_CHARSET_NOT_SUPPORTED_WARNING))
     {
         return htmlspecialchars($string, ENT_COMPAT, $GLOBALS['charset']);

Modified: trunk/lib/plugin/SyntaxHighlighter.php
===================================================================
--- trunk/lib/plugin/SyntaxHighlighter.php	2010-06-17 10:15:47 UTC (rev 7540)
+++ trunk/lib/plugin/SyntaxHighlighter.php	2010-06-17 11:34:55 UTC (rev 7541)
@@ -161,10 +161,7 @@
             if (!empty($color)) $args .= " --style $color --inline-css";
             if (!empty($style)) $args .= " -F $style";
             $commandLine = HIGHLIGHT_EXE . "$args -q -X -f -S $syntax";
-            if (check_php_version(4,3,0))
-                $code = $this->newFilterThroughCmd($source, $commandLine);
-            else
-                $code = $this->oldFilterThroughCmd($source, $commandLine);
+            $code = $this->newFilterThroughCmd($source, $commandLine);
             if (empty($code))
                 return $this->error(fmt("Couldn't start commandline '%s'",$commandLine));
             $pre = HTML::pre(HTML::raw($code));

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2010-06-17 10:15:47 UTC (rev 7540)
+++ trunk/lib/stdlib.php	2010-06-17 11:34:55 UTC (rev 7541)
@@ -529,8 +529,6 @@
             ;
         elseif (! preg_match("/\.$force_img$/i", $url))
             ;  // only valid image extensions or scripts assumed to generate images
-        elseif (!check_php_version(4,3) and preg_match("/^http.+\.png$/i",$url))
-            ; // it's safe to assume that this will fail.
         elseif (preg_match("/^http/",$url)) { // external url
             $size = @getimagesize($url); 
         } else { // local file
@@ -1050,11 +1048,9 @@
         global $WikiNameRegexp, $request;
         $bang_esc[] = "(?:" . ALLOWED_PROTOCOLS . "):[^\s<>\[\]\"'()]*[^\s<>\[\]\"'(),.?]";
         // before 4.3.9 pcre had a memory release bug, which might hit us here. so be safe.
-        if (check_php_version(4,3,9)) {
-          $map = getInterwikiMap();
-          if ($map_regex = $map->getRegexp())
+        $map = getInterwikiMap();
+        if ($map_regex = $map->getRegexp())
             $bang_esc[] = $map_regex . ":[^\\s.,;?()]+"; // FIXME: is this really needed?
-        }
         $bang_esc[] = $WikiNameRegexp;
         $orig[] = '/!((?:' . join(')|(', $bang_esc) . '))/';
         $repl[] = '~\\1';
@@ -1751,7 +1747,7 @@
 function isa ($object, $class) {
     //if (check_php_version(5)) 
     //    return $object instanceof $class;
-    if (check_php_version(4,2) and !check_php_version(5)) 
+    if (!check_php_version(5)) 
         return is_a($object, $class);
 
     $lclass = check_php_version(5) ? $class : strtolower($class);

Modified: trunk/lib/ziplib.php
===================================================================
--- trunk/lib/ziplib.php	2010-06-17 10:15:47 UTC (rev 7540)
+++ trunk/lib/ziplib.php	2010-06-17 11:34:55 UTC (rev 7541)
@@ -268,10 +268,7 @@
     function addSrcFile ($target, $src, $attrib = false) {
 	if (empty($attrib['mtime']))
 	    $attrib = array('mtime' => filemtime($src), 'is_ascii' => 0);
-	if (check_php_version(4,3))
-	    $this->addRegularFile($target, file_get_contents($src), $attrib);
-	else
-	    $this->addRegularFile($target, join('', file($src)), $attrib);
+	$this->addRegularFile($target, file_get_contents($src), $attrib);
     }
     
   function addRegularFile ($filename, $content, $attrib = false) {


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




2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (43)	Nov (73)	Dec (10)
2001	Jan (34)	Feb (110)	Mar (24)	Apr (44)	May (37)	Jun (22)	Jul (20)	Aug (28)	Sep (50)	Oct (11)	Nov (132)	Dec (595)
2002	Jan (1099)	Feb (579)	Mar (63)	Apr	May	Jun	Jul	Aug (125)	Sep (101)	Oct (25)	Nov (34)	Dec (47)
2003	Jan (82)	Feb (182)	Mar (71)	Apr (3)	May (1)	Jun (3)	Jul	Aug	Sep (14)	Oct (6)	Nov (124)	Dec (68)
2004	Jan (64)	Feb (191)	Mar (199)	Apr (298)	May (252)	Jun (426)	Jul (134)	Aug (13)	Sep (96)	Oct (75)	Nov (232)	Dec (171)
2005	Jan (205)	Feb (165)	Mar (8)	Apr (74)	May (21)	Jun (19)	Jul (37)	Aug (69)	Sep (141)	Oct (118)	Nov (31)	Dec (7)
2006	Jan (5)	Feb (10)	Mar (35)	Apr (24)	May (34)	Jun (29)	Jul (5)	Aug (38)	Sep (30)	Oct (37)	Nov (30)	Dec (86)
2007	Jan (414)	Feb (40)	Mar (18)	Apr (10)	May (66)	Jun (60)	Jul (105)	Aug (55)	Sep (64)	Oct (7)	Nov (11)	Dec (5)
2008	Jan (26)	Feb (28)	Mar (79)	Apr (34)	May (61)	Jun (24)	Jul (29)	Aug (160)	Sep (62)	Oct (70)	Nov (32)	Dec (14)
2009	Jan (140)	Feb (135)	Mar (153)	Apr (53)	May (24)	Jun (138)	Jul (90)	Aug (46)	Sep (72)	Oct (84)	Nov (32)	Dec (4)
2010	Jan (13)	Feb (7)	Mar (14)	Apr (55)	May (89)	Jun (131)	Jul (41)	Aug (38)	Sep (42)	Oct (11)	Nov (27)	Dec (54)
2011	Jan (127)	Feb (16)	Mar (71)	Apr (52)	May (32)	Jun (31)	Jul (4)	Aug	Sep (45)	Oct (26)	Nov (36)	Dec (10)
2012	Jan (23)	Feb (6)	Mar (13)	Apr (18)	May (1)	Jun (4)	Jul (3)	Aug (12)	Sep (57)	Oct (96)	Nov (163)	Dec (124)
2013	Jan (11)	Feb (17)	Mar (7)	Apr (48)	May (15)	Jun (29)	Jul (12)	Aug	Sep (9)	Oct	Nov	Dec (3)
2014	Jan (4)	Feb (1)	Mar (2)	Apr (1)	May (8)	Jun (90)	Jul (104)	Aug (12)	Sep (81)	Oct (139)	Nov (111)	Dec (64)
2015	Jan (46)	Feb (74)	Mar (56)	Apr (61)	May (3)	Jun (7)	Jul (11)	Aug (5)	Sep (15)	Oct (1)	Nov (1)	Dec (15)
2016	Jan (25)	Feb (33)	Mar (24)	Apr (4)	May (24)	Jun (3)	Jul (75)	Aug	Sep (2)	Oct (38)	Nov (4)	Dec (18)
2017	Jan (8)	Feb (1)	Mar (1)	Apr	May (14)	Jun	Jul (5)	Aug (9)	Sep	Oct (23)	Nov	Dec
2018	Jan	Feb	Mar	Apr	May	Jun (2)	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar (9)	Apr (60)	May (1)	Jun	Jul (13)	Aug	Sep (11)	Oct	Nov	Dec
2020	Jan	Feb	Mar (15)	Apr (4)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (47)
2021	Jan (24)	Feb (33)	Mar (1)	Apr	May (1)	Jun (64)	Jul (71)	Aug (114)	Sep (82)	Oct (32)	Nov (76)	Dec (86)
2022	Jan (162)	Feb (41)	Mar (11)	Apr (9)	May	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov	Dec (7)
2023	Jan	Feb (1)	Mar (2)	Apr	May	Jun	Jul (25)	Aug	Sep	Oct	Nov (7)	Dec
2024	Jan (7)	Feb (3)	Mar (3)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2025	Jan	Feb (90)	Mar (19)	Apr	May (6)	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec

phpwiki-checkins Mailing List for PhpWiki (Page 147)

phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.