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

[phpwiki-checkins] SF.net SVN: phpwiki:[9187] trunk/lib/ziplib.php

[<var...@us...>]

Revision: 9187
          http://sourceforge.net/p/phpwiki/code/9187
Author:   vargenau
Date:     2014-10-03 16:06:26 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
Remove unused functions gzip_compress and gzip_uncompress

Modified Paths:
--------------
    trunk/lib/ziplib.php

Modified: trunk/lib/ziplib.php
===================================================================
--- trunk/lib/ziplib.php	2014-10-03 15:26:18 UTC (rev 9186)
+++ trunk/lib/ziplib.php	2014-10-03 16:06:26 UTC (rev 9187)
@@ -10,72 +10,7 @@
  * checksum, and since not all PHP's have gzcompress(), we'll just
  * stick with gzopen().
  */
-function gzip_cleanup()
-{
-    global $gzip_tmpfile;
 
-    if ($gzip_tmpfile)
-        @unlink($gzip_tmpfile);
-}
-
-function gzip_tempnam()
-{
-    global $gzip_tmpfile;
-
-    if (!$gzip_tmpfile) {
-        //FIXME: does this work on non-unix machines?
-        if (is_writable("/tmp"))
-            $gzip_tmpfile = tempnam("/tmp", "wkzip");
-        else
-            $gzip_tmpfile = tempnam(TEMP_DIR, "wkzip");
-        register_shutdown_function("gzip_cleanup");
-    }
-    return $gzip_tmpfile;
-}
-
-function gzip_compress($data)
-{
-    $filename = gzip_tempnam();
-    if (!($fp = gzopen($filename, "wb")))
-        trigger_error(sprintf("%s failed", 'gzopen'), E_USER_ERROR);
-    gzwrite($fp, $data, strlen($data));
-    if (!gzclose($fp)) {
-        trigger_error(sprintf("%s failed", 'gzclose'), E_USER_ERROR);
-    }
-    $z = NULL;
-    if (!($fp = fopen($filename, "rb"))) {
-        trigger_error(sprintf("%s failed", 'fopen'), E_USER_ERROR);
-    }
-    while (!feof($fp)) {
-        $z .= fread($fp, 1024);
-    }
-    if (!fclose($fp))
-        trigger_error(sprintf("%s failed", 'fclose'), E_USER_ERROR);
-    unlink($filename);
-    return $z;
-}
-
-function gzip_uncompress($data)
-{
-    $filename = gzip_tempnam();
-    if (!($fp = fopen($filename, "wb")))
-        trigger_error(sprintf("%s failed", 'fopen'), E_USER_ERROR);
-    fwrite($fp, $data, strlen($data));
-    if (!fclose($fp))
-        trigger_error(sprintf("%s failed", 'fclose'), E_USER_ERROR);
-
-    if (!($fp = gzopen($filename, "rb")))
-        trigger_error(sprintf("%s failed", 'gzopen'), E_USER_ERROR);
-    $unz = '';
-    while ($buf = gzread($fp, 4096))
-        $unz .= $buf;
-    if (!gzclose($fp))
-        trigger_error(sprintf("%s failed", 'gzclose'), E_USER_ERROR);
-
-    unlink($filename);
-    return $unz;
-}
-
 /**
  * CRC32 computation.  Hacked from Info-zip's zip-2.3 source code.
  */

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9186] trunk/lib/IniConfig.php

[<var...@us...>]

Revision: 9186
          http://sourceforge.net/p/phpwiki/code/9186
Author:   vargenau
Date:     2014-10-03 15:26:18 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function crypt exists

Modified Paths:
--------------
    trunk/lib/IniConfig.php

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2014-10-03 15:25:29 UTC (rev 9185)
+++ trunk/lib/IniConfig.php	2014-10-03 15:26:18 UTC (rev 9186)
@@ -798,21 +798,6 @@
     if (!defined('THEME'))
         define('THEME', 'default');
 
-    /*$configurator_link = HTML(HTML::br(), "=>",
-                              HTML::a(array('href'=>DATA_PATH."/configurator.php"),
-                                      _("Configurator")));*/
-    // check whether the crypt() function is needed and present
-    if (defined('ENCRYPTED_PASSWD') && !function_exists('crypt')) {
-        $error = sprintf("Encrypted passwords cannot be used: %s.",
-            "'function crypt()' not available in this version of php");
-        trigger_error($error, E_USER_WARNING);
-        if (!preg_match("/config\-dist\.ini$/", $file)) { // protect against recursion
-            include_once(dirname(__FILE__) . "/install.php");
-            run_install("_part1");
-            exit();
-        }
-    }
-
     // Basic configurator validation
     if (!defined('ADMIN_USER') or ADMIN_USER == '') {
         $error = sprintf("%s may not be empty. Please update your configuration.",

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9185] trunk/configurator.php

[<var...@us...>]

Revision: 9185
          http://sourceforge.net/p/phpwiki/code/9185
Author:   vargenau
Date:     2014-10-03 15:25:29 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function is_a exists

Modified Paths:
--------------
    trunk/configurator.php

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2014-10-03 15:22:58 UTC (rev 9184)
+++ trunk/configurator.php	2014-10-03 15:25:29 UTC (rev 9185)
@@ -142,7 +142,7 @@
         _http_logout();
     }
     // check password
-    if (ENCRYPTED_PASSWD and function_exists('crypt')) {
+    if (ENCRYPTED_PASSWD) {
         if (crypt($admin_pw, ADMIN_PASSWD) != ADMIN_PASSWD)
             _http_logout();
     } elseif ($admin_pw != ADMIN_PASSWD) {
@@ -2063,23 +2063,15 @@
             $p .= "\n;ENCRYPTED_PASSWD = true";
             return $p;
         } else {
-            if (function_exists('crypt')) {
-                $salt_length = max(CRYPT_SALT_LENGTH,
-                    2 * CRYPT_STD_DES,
-                    9 * CRYPT_EXT_DES,
-                    12 * CRYPT_MD5,
-                    16 * CRYPT_BLOWFISH);
-                // generate an encrypted password
-                $crypt_pass = crypt($posted_value, rand_ascii($salt_length));
-                $p = "${n}" . $this->_config_format($crypt_pass);
-                return $p . "\nENCRYPTED_PASSWD = true";
-            } else {
-                $p = "${n}" . $this->_config_format($posted_value);
-                $p .= "\n; Encrypted passwords cannot be used:";
-                $p .= "\n; 'function crypt()' not available in this version of php";
-                $p .= "\nENCRYPTED_PASSWD = false";
-                return $p;
-            }
+            $salt_length = max(CRYPT_SALT_LENGTH,
+                2 * CRYPT_STD_DES,
+                9 * CRYPT_EXT_DES,
+                12 * CRYPT_MD5,
+                16 * CRYPT_BLOWFISH);
+            // generate an encrypted password
+            $crypt_pass = crypt($posted_value, rand_ascii($salt_length));
+            $p = "${n}" . $this->_config_format($crypt_pass);
+            return $p . "\nENCRYPTED_PASSWD = true";
         }
     }
 
@@ -2539,14 +2531,6 @@
 /////////////////////////////
 // begin auto generation code
 
-if (!function_exists('is_a')) {
-    function is_a($object, $class)
-    {
-        $class = strtolower($class);
-        return (get_class($object) == $class) or is_subclass_of($object, $class);
-    }
-}
-
 if (!empty($HTTP_POST_VARS['action'])
     and $HTTP_POST_VARS['action'] == 'make_config'
         and !empty($HTTP_POST_VARS['ADMIN_USER'])

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9184] trunk/lib/Request.php

[<var...@us...>]

Revision: 9184
          http://sourceforge.net/p/phpwiki/code/9184
Author:   vargenau
Date:     2014-10-03 15:22:58 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function ob_get_level

Modified Paths:
--------------
    trunk/lib/Request.php

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2014-10-03 15:22:05 UTC (rev 9183)
+++ trunk/lib/Request.php	2014-10-03 15:22:58 UTC (rev 9184)
@@ -431,8 +431,7 @@
     function chunkOutput()
     {
         if (!empty($this->_is_buffering_output)
-            or
-            (function_exists('ob_get_level') and @ob_get_level())
+            or (@ob_get_level())
         ) {
             $this->_do_chunked_output = true;
             if (empty($this->_ob_get_length)) $this->_ob_get_length = 0;
@@ -476,7 +475,7 @@
             }
             $this->_is_buffering_output = false;
             ob_end_flush();
-        } elseif (function_exists('ob_get_level') and @ob_get_level()) {
+        } elseif (@ob_get_level()) {
             ob_end_flush();
         }
         session_write_close();

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9183] trunk/lib/WikiUser

[<var...@us...>]

Revision: 9183
          http://sourceforge.net/p/phpwiki/code/9183
Author:   vargenau
Date:     2014-10-03 15:22:05 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function crypt exists

Modified Paths:
--------------
    trunk/lib/WikiUser/AdoDb.php
    trunk/lib/WikiUser/PdoDb.php
    trunk/lib/WikiUser/PearDb.php

Modified: trunk/lib/WikiUser/AdoDb.php
===================================================================
--- trunk/lib/WikiUser/AdoDb.php	2014-10-03 15:20:42 UTC (rev 9182)
+++ trunk/lib/WikiUser/AdoDb.php	2014-10-03 15:22:05 UTC (rev 9183)
@@ -285,8 +285,7 @@
         }
 
         if ($this->_auth_crypt_method == 'crypt') {
-            if (function_exists('crypt'))
-                $submitted_password = crypt($submitted_password);
+            $submitted_password = crypt($submitted_password);
         }
         $rs = $dbh->Execute(sprintf($this->_authupdate,
             $dbh->qstr($submitted_password),

Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php	2014-10-03 15:20:42 UTC (rev 9182)
+++ trunk/lib/WikiUser/PdoDb.php	2014-10-03 15:22:05 UTC (rev 9183)
@@ -273,8 +273,7 @@
         }
 
         if ($this->_auth_crypt_method == 'crypt') {
-            if (function_exists('crypt'))
-                $submitted_password = crypt($submitted_password);
+            $submitted_password = crypt($submitted_password);
         }
         try {
             $this->_authupdate->bindParam("password", $submitted_password, PDO::PARAM_STR, 48);

Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php	2014-10-03 15:20:42 UTC (rev 9182)
+++ trunk/lib/WikiUser/PearDb.php	2014-10-03 15:22:05 UTC (rev 9183)
@@ -250,8 +250,7 @@
         }
 
         if ($this->_auth_crypt_method == 'crypt') {
-            if (function_exists('crypt'))
-                $submitted_password = crypt($submitted_password);
+            $submitted_password = crypt($submitted_password);
         }
         $dbh->simpleQuery(sprintf($this->_authupdate,
             $dbh->quote($submitted_password), $dbh->quote($this->_userid)));

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9182] trunk

[<var...@us...>]

Revision: 9182
          http://sourceforge.net/p/phpwiki/code/9182
Author:   vargenau
Date:     2014-10-03 15:20:42 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function finfo_open exists

Modified Paths:
--------------
    trunk/lib/plugin/FileInfo.php
    trunk/view.php

Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php	2014-10-03 15:19:03 UTC (rev 9181)
+++ trunk/lib/plugin/FileInfo.php	2014-10-03 15:20:42 UTC (rev 9182)
@@ -182,16 +182,13 @@
 
     function magic($file)
     {
-        if (function_exists('finfo_file') or loadPhpExtension('fileinfo')) {
-            // Valid finfo_open (i.e. libmagic) options:
-            // FILEINFO_NONE | FILEINFO_SYMLINK | FILEINFO_MIME | FILEINFO_COMPRESS | FILEINFO_DEVICES |
-            // FILEINFO_CONTINUE | FILEINFO_PRESERVE_ATIME | FILEINFO_RAW
-            $f = finfo_open( /*FILEINFO_MIME*/);
-            $result = finfo_file(realpath($file));
-            finfo_close($res);
-            return $result;
-        }
-        return '';
+        // Valid finfo_open (i.e. libmagic) options:
+        // FILEINFO_NONE | FILEINFO_SYMLINK | FILEINFO_MIME | FILEINFO_COMPRESS | FILEINFO_DEVICES |
+        // FILEINFO_CONTINUE | FILEINFO_PRESERVE_ATIME | FILEINFO_RAW
+        $f = finfo_open( /*FILEINFO_MIME*/);
+        $result = finfo_file(realpath($file));
+        finfo_close($res);
+        return $result;
     }
 
     function mime_type($file)

Modified: trunk/view.php
===================================================================
--- trunk/view.php	2014-10-03 15:19:03 UTC (rev 9181)
+++ trunk/view.php	2014-10-03 15:20:42 UTC (rev 9182)
@@ -93,12 +93,8 @@
     $filename = str_replace('"', '', $filename);
     header('Content-disposition: filename="' . $filename . '"');
 
-    if (function_exists('finfo_open')) {
-        $finfo = finfo_open(FILEINFO_MIME_TYPE);
-        $mimetype = finfo_file($finfo, $filepath);
-    } else {
-        $mimetype = 'application/octet-stream';
-    }
+    $finfo = finfo_open(FILEINFO_MIME_TYPE);
+    $mimetype = finfo_file($finfo, $filepath);
     header("Content-type: $mimetype");
 
     $length = filesize($filepath);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9181] trunk/lib/MailNotify.php

[<var...@us...>]

Revision: 9181
          http://sourceforge.net/p/phpwiki/code/9181
Author:   vargenau
Date:     2014-10-03 15:19:03 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function quoted_printable_encode exists in PHP 5.3

Modified Paths:
--------------
    trunk/lib/MailNotify.php

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2014-10-03 14:57:26 UTC (rev 9180)
+++ trunk/lib/MailNotify.php	2014-10-03 15:19:03 UTC (rev 9181)
@@ -449,14 +449,8 @@
             return $subject;
         }
 
-        // Let us try quoted printable first
-        if (function_exists('quoted_printable_encode')) { // PHP 5.3
-            // quoted_printable_encode inserts "\r\n" if line is too long, use "\n" only
-            return "=?UTF-8?Q?" . str_replace("\r\n", "\n", quoted_printable_encode($subject)) . "?=";
-        }
-
-        // If not, encode in base64 (less human-readable)
-        return "=?UTF-8?B?" . base64_encode($subject) . "?=";
+        // quoted_printable_encode inserts "\r\n" if line is too long, use "\n" only
+        return "=?UTF-8?Q?" . str_replace("\r\n", "\n", quoted_printable_encode($subject)) . "?=";
     }
 }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9180] trunk/lib/WikiPluginCached.php

[<var...@us...>]

Revision: 9180
          http://sourceforge.net/p/phpwiki/code/9180
Author:   vargenau
Date:     2014-10-03 14:57:26 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function ImageFontWidth exists

Modified Paths:
--------------
    trunk/lib/WikiPluginCached.php

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2014-10-03 14:54:29 UTC (rev 9179)
+++ trunk/lib/WikiPluginCached.php	2014-10-03 14:57:26 UTC (rev 9180)
@@ -977,13 +977,8 @@
             'width' => 600,
             'height' => 350);
 
-        if (function_exists('ImageFontWidth')) {
-            $charx = ImageFontWidth($fontnr);
-            $chary = ImageFontHeight($fontnr);
-        } else {
-            $charx = 10;
-            $chary = 10;
-        }
+        $charx = ImageFontWidth($fontnr);
+        $chary = ImageFontHeight($fontnr);
         $marginx = $charx;
         $marginy = floor($chary / 2);
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9179] trunk/lib

[<var...@us...>]

Revision: 9179
          http://sourceforge.net/p/phpwiki/code/9179
Author:   vargenau
Date:     2014-10-03 14:54:29 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function ImageTypes exists

Modified Paths:
--------------
    trunk/lib/WikiPluginCached.php
    trunk/lib/plugin/TeX2png.php

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2014-10-03 14:47:32 UTC (rev 9178)
+++ trunk/lib/WikiPluginCached.php	2014-10-03 14:54:29 UTC (rev 9179)
@@ -539,16 +539,10 @@
             'xbm'   => IMG_XBM,
             */
         );
-        if (function_exists('ImageTypes')) {
-            $presenttypes = ImageTypes();
-            foreach ($imagetypes as $imgtype => $bitmask)
-                if ($presenttypes && $bitmask)
-                    array_push($supportedtypes, $imgtype);
-        } else {
-            foreach ($imagetypes as $imgtype => $bitmask)
-                if (function_exists("Image" . $imgtype))
-                    array_push($supportedtypes, $imgtype);
-        }
+        $presenttypes = ImageTypes();
+        foreach ($imagetypes as $imgtype => $bitmask)
+            if ($presenttypes && $bitmask)
+                 array_push($supportedtypes, $imgtype);
         if (in_array($wish, $supportedtypes))
             return $wish;
         elseif (!empty($supportedtypes))

Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php	2014-10-03 14:47:32 UTC (rev 9178)
+++ trunk/lib/plugin/TeX2png.php	2014-10-03 14:54:29 UTC (rev 9179)
@@ -221,9 +221,7 @@
     function run($dbi, $argstr, &$request, $basepage)
     {
         // from text2png.php
-        if ((function_exists('ImageTypes') and (ImageTypes() & IMG_PNG))
-            or function_exists("ImagePNG")
-        ) {
+        if (ImageTypes() & IMG_PNG) {
             // we have gd & png so go ahead.
             extract($this->getArgs($argstr, $request));
             return $this->tex2png($text);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9178] trunk/lib/TextSearchQuery.php

[<var...@us...>]

Revision: 9178
          http://sourceforge.net/p/phpwiki/code/9178
Author:   vargenau
Date:     2014-10-03 14:47:32 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function token_get_all exists

Modified Paths:
--------------
    trunk/lib/TextSearchQuery.php

Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php	2014-10-03 14:43:00 UTC (rev 9177)
+++ trunk/lib/TextSearchQuery.php	2014-10-03 14:47:32 UTC (rev 9178)
@@ -419,49 +419,28 @@
         }
 
         // Strictly check for illegal functions and operators, which are no placeholders.
-        if (function_exists('token_get_all')) {
-            $parsed = token_get_all("<?$query?>");
-            foreach ($parsed as $x) { // flat, non-recursive array
-                if (is_string($x) and !isset($this->_parser_check[$x])) {
-                    // single char op or name
-                    trigger_error("Illegal string or operator in query: \"$x\"", E_USER_WARNING);
+        $parsed = token_get_all("<?$query?>");
+        foreach ($parsed as $x) { // flat, non-recursive array
+            if (is_string($x) and !isset($this->_parser_check[$x])) {
+                // single char op or name
+                trigger_error("Illegal string or operator in query: \"$x\"", E_USER_WARNING);
+                $query = '';
+            } elseif (is_array($x)) {
+                $n = token_name($x[0]);
+                if ($n == 'T_OPEN_TAG' or $n == 'T_WHITESPACE'
+                    or $n == 'T_CLOSE_TAG' or $n == 'T_LNUMBER'
+                    or $n == 'T_CONST' or $n == 'T_DNUMBER'
+                ) continue;
+                if ($n == 'T_VARIABLE') { // but we do allow consts
+                    trigger_error("Illegal variable in query: \"$x[1]\"", E_USER_WARNING);
                     $query = '';
-                } elseif (is_array($x)) {
-                    $n = token_name($x[0]);
-                    if ($n == 'T_OPEN_TAG' or $n == 'T_WHITESPACE'
-                        or $n == 'T_CLOSE_TAG' or $n == 'T_LNUMBER'
-                        or $n == 'T_CONST' or $n == 'T_DNUMBER'
-                    ) continue;
-                    if ($n == 'T_VARIABLE') { // but we do allow consts
-                        trigger_error("Illegal variable in query: \"$x[1]\"", E_USER_WARNING);
-                        $query = '';
-                    }
-                    if (is_string($x[1]) and !isset($this->_parser_check[$x[1]])) {
-                        // multi-char char op or name
-                        trigger_error("Illegal $n in query: \"$x[1]\"", E_USER_WARNING);
-                        $query = '';
-                    }
                 }
+                if (is_string($x[1]) and !isset($this->_parser_check[$x[1]])) {
+                    // multi-char char op or name
+                    trigger_error("Illegal $n in query: \"$x[1]\"", E_USER_WARNING);
+                    $query = '';
+                }
             }
-            //echo "$query <br>";
-            //$this->_parse_token($parsed);
-            //echo "<br>\n";
-            //var_dump($parsed);
-            /*
-    "_x > 0" =>
-    { T_OPEN_TAG "<?"} { T_STRING "_x"} { T_WHITESPACE " "} ">" { T_WHITESPACE " "} { T_LNUMBER "0"} { T_CLOSE_TAG "?>"}
-        Interesting: on-char ops, as ">" are not tokenized.
-    "_x <= 0"
-    { T_OPEN_TAG "< ?" } { T_STRING "_x" } { T_WHITESPACE " " } { T_IS_SMALLER_OR_EQUAL "<=" } { T_WHITESPACE " " } { T_LNUMBER "0" } { T_CLOSE_TAG "?>" }
-             */
-        } else {
-            // Detect illegal characters besides nums, words and ops.
-            // So attribute names can not be utf-8
-            $c = "/([^\d\w.,\s" . preg_quote(join("", $this->_allowed_operators), "/") . "])/";
-            if (preg_match($c, $query, $m)) {
-                trigger_error("Illegal character in query: " . $m[1], E_USER_WARNING);
-                return '';
-            }
         }
         return $query;
     }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9177] trunk/lib/prepend.php

[<var...@us...>]

Revision: 9177
          http://sourceforge.net/p/phpwiki/code/9177
Author:   vargenau
Date:     2014-10-03 14:43:00 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function posix_times exists

Modified Paths:
--------------
    trunk/lib/prepend.php

Modified: trunk/lib/prepend.php
===================================================================
--- trunk/lib/prepend.php	2014-10-03 14:39:58 UTC (rev 9176)
+++ trunk/lib/prepend.php	2014-10-03 14:43:00 UTC (rev 9177)
@@ -81,8 +81,7 @@
     function DebugTimer()
     {
         $this->_start = $this->microtime();
-        if (function_exists('posix_times'))
-            $this->_times = posix_times();
+        $this->_times = posix_times();
     }
 
     /**
@@ -106,10 +105,6 @@
 
     function getStats()
     {
-        if (!isset($this->_times)) {
-            // posix_times() not available.
-            return sprintf("real: %.3f", $this->getTime('real'));
-        }
         $now = posix_times();
         return sprintf("real: %.3f, user: %.3f, sys: %.3f",
             $this->getTime('real'),

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9176] trunk/locale

[<var...@us...>]

Revision: 9176
          http://sourceforge.net/p/phpwiki/code/9176
Author:   vargenau
Date:     2014-10-03 14:39:58 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2014-10-03 14:38:55 UTC (rev 9175)
+++ trunk/locale/po/de.po	2014-10-03 14:39:58 UTC (rev 9176)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:47+0200\n"
+"POT-Creation-Date: 2014-10-03 16:39+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -5175,11 +5175,6 @@
 msgid "xml-rpc change"
 msgstr ""
 
-msgid "Can't inflate data: zlib support not enabled in this PHP"
-msgstr ""
-"Kann Daten nicht dekomprimieren: Die zlib-Bibliothek wurde in PHP nicht "
-"installiert/aktiviert."
-
 #, php-format
 msgid "Can't open zip file “%s” for reading"
 msgstr "Konnte ZIP-Datei »%s« nicht zum Lesen öffnen"
@@ -6038,6 +6033,11 @@
 msgid "Edit this page"
 msgstr "Diese Seite bearbeiten"
 
+#~ msgid "Can't inflate data: zlib support not enabled in this PHP"
+#~ msgstr ""
+#~ "Kann Daten nicht dekomprimieren: Die zlib-Bibliothek wurde in PHP nicht "
+#~ "installiert/aktiviert."
+
 #~ msgid "Missing ldap extension"
 #~ msgstr "Fehlende php LDAP extension"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2014-10-03 14:38:55 UTC (rev 9175)
+++ trunk/locale/po/es.po	2014-10-03 14:39:58 UTC (rev 9176)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:47+0200\n"
+"POT-Creation-Date: 2014-10-03 16:39+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -5054,9 +5054,6 @@
 msgid "xml-rpc change"
 msgstr ""
 
-msgid "Can't inflate data: zlib support not enabled in this PHP"
-msgstr ""
-
 #, php-format
 msgid "Can't open zip file “%s” for reading"
 msgstr ""

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-10-03 14:38:55 UTC (rev 9175)
+++ trunk/locale/po/fr.po	2014-10-03 14:39:58 UTC (rev 9176)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:47+0200\n"
+"POT-Creation-Date: 2014-10-03 16:39+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -5107,11 +5107,6 @@
 msgid "xml-rpc change"
 msgstr ""
 
-msgid "Can't inflate data: zlib support not enabled in this PHP"
-msgstr ""
-"Impossible de décompresser les données : le support de zlib n'a pas été "
-"validé dans ce PHP"
-
 #, php-format
 msgid "Can't open zip file “%s” for reading"
 msgstr "Impossible d'ouvrir le fichier zip « %s » en lecture"
@@ -5948,6 +5943,11 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid "Can't inflate data: zlib support not enabled in this PHP"
+#~ msgstr ""
+#~ "Impossible de décompresser les données : le support de zlib n'a pas été "
+#~ "validé dans ce PHP"
+
 #~ msgid "No LDAP in this PHP version"
 #~ msgstr "Pas de LDAP dans cette version de php"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2014-10-03 14:38:55 UTC (rev 9175)
+++ trunk/locale/po/it.po	2014-10-03 14:39:58 UTC (rev 9176)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:47+0200\n"
+"POT-Creation-Date: 2014-10-03 16:39+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -5000,9 +5000,6 @@
 msgid "xml-rpc change"
 msgstr ""
 
-msgid "Can't inflate data: zlib support not enabled in this PHP"
-msgstr ""
-
 #, php-format
 msgid "Can't open zip file “%s” for reading"
 msgstr ""

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2014-10-03 14:38:55 UTC (rev 9175)
+++ trunk/locale/po/ja.po	2014-10-03 14:39:58 UTC (rev 9176)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:47+0200\n"
+"POT-Creation-Date: 2014-10-03 16:39+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5148,9 +5148,6 @@
 msgid "xml-rpc change"
 msgstr ""
 
-msgid "Can't inflate data: zlib support not enabled in this PHP"
-msgstr ""
-
 #, php-format
 msgid "Can't open zip file “%s” for reading"
 msgstr ""

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2014-10-03 14:38:55 UTC (rev 9175)
+++ trunk/locale/po/nl.po	2014-10-03 14:39:58 UTC (rev 9176)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:47+0200\n"
+"POT-Creation-Date: 2014-10-03 16:39+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -4992,9 +4992,6 @@
 msgid "xml-rpc change"
 msgstr ""
 
-msgid "Can't inflate data: zlib support not enabled in this PHP"
-msgstr ""
-
 #, php-format
 msgid "Can't open zip file “%s” for reading"
 msgstr ""

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2014-10-03 14:38:55 UTC (rev 9175)
+++ trunk/locale/po/phpwiki.pot	2014-10-03 14:39:58 UTC (rev 9176)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:47+0200\n"
+"POT-Creation-Date: 2014-10-03 16:39+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -4984,9 +4984,6 @@
 msgid "xml-rpc change"
 msgstr ""
 
-msgid "Can't inflate data: zlib support not enabled in this PHP"
-msgstr ""
-
 #, php-format
 msgid "Can't open zip file “%s” for reading"
 msgstr ""

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2014-10-03 14:38:55 UTC (rev 9175)
+++ trunk/locale/po/sv.po	2014-10-03 14:39:58 UTC (rev 9176)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:47+0200\n"
+"POT-Creation-Date: 2014-10-03 16:39+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -4985,9 +4985,6 @@
 msgid "xml-rpc change"
 msgstr ""
 
-msgid "Can't inflate data: zlib support not enabled in this PHP"
-msgstr ""
-
 #, php-format
 msgid "Can't open zip file “%s” for reading"
 msgstr ""

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2014-10-03 14:38:55 UTC (rev 9175)
+++ trunk/locale/po/zh.po	2014-10-03 14:39:58 UTC (rev 9176)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:47+0200\n"
+"POT-Creation-Date: 2014-10-03 16:39+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -5243,9 +5243,6 @@
 msgid "xml-rpc change"
 msgstr ""
 
-msgid "Can't inflate data: zlib support not enabled in this PHP"
-msgstr "無法壓縮資料: 此 PHP 的 zlib 支援未被啟動"
-
 #, php-format
 msgid "Can't open zip file “%s” for reading"
 msgstr "無法開啟 zip 檔案 “%s” 進行讀取"
@@ -6107,6 +6104,9 @@
 msgid "Edit this page"
 msgstr "編輯此頁面"
 
+#~ msgid "Can't inflate data: zlib support not enabled in this PHP"
+#~ msgstr "無法壓縮資料: 此 PHP 的 zlib 支援未被啟動"
+
 #~ msgid "No LDAP in this PHP version"
 #~ msgstr "此版本的 PHP 無 LDAP"
 

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9175] trunk/lib

[<var...@us...>]

Revision: 9175
          http://sourceforge.net/p/phpwiki/code/9175
Author:   vargenau
Date:     2014-10-03 14:38:55 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
gzcompress, gzuncompress, gzinflate and gzopen exist

Modified Paths:
--------------
    trunk/lib/CachedMarkup.php
    trunk/lib/ziplib.php

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2014-10-03 14:26:30 UTC (rev 9174)
+++ trunk/lib/CachedMarkup.php	2014-10-03 14:38:55 UTC (rev 9175)
@@ -49,12 +49,7 @@
             return serialize($this);
         }
 
-        if (function_exists('gzcompress'))
-            return gzcompress(serialize($this), 9);
-        return serialize($this);
-
-        // FIXME: probably should implement some sort of "compression"
-        //   when no gzcompress is available.
+        return gzcompress(serialize($this), 9);
     }
 
     function unpack($packed)
@@ -69,17 +64,9 @@
             or (substr($packed, 0, 2) == "x\332")
         ) // 120, 218
         {
-            if (function_exists('gzuncompress')) {
-                // Looks like ZLIB.
-                $data = gzuncompress($packed);
-                return unserialize($data);
-            } else {
-                // user our php lib. TESTME
-                include_once 'ziplib.php';
-                $zip = new ZipReader($packed);
-                list(, $data, $attrib) = $zip->readFile();
-                return unserialize($data);
-            }
+            // Looks like ZLIB.
+            $data = gzuncompress($packed);
+            return unserialize($data);
         }
         if (substr($packed, 0, 2) == "O:") {
             // Looks like a serialized object

Modified: trunk/lib/ziplib.php
===================================================================
--- trunk/lib/ziplib.php	2014-10-03 14:26:30 UTC (rev 9174)
+++ trunk/lib/ziplib.php	2014-10-03 14:38:55 UTC (rev 9175)
@@ -186,33 +186,19 @@
 
 function zip_inflate($data, $crc32, $uncomp_size)
 {
-    if (function_exists('gzinflate')) {
-        $data = gzinflate($data);
-        if (strlen($data) != $uncomp_size)
-            trigger_error("not enough output from gzinflate", E_USER_ERROR);
-        $zcrc32 = zip_crc32($data);
-        if ($zcrc32 < 0) { // force unsigned
-            $zcrc32 += 4294967296;
-        }
-        if ($crc32 < 0) { // force unsigned
-            $crc32 += 4294967296;
-        }
-        if ($zcrc32 != $crc32)
-            trigger_error("CRC32 mismatch: calculated=$zcrc32, expected=$crc32", E_USER_ERROR);
-        return $data;
+    $data = gzinflate($data);
+    if (strlen($data) != $uncomp_size)
+        trigger_error("not enough output from gzinflate", E_USER_ERROR);
+    $zcrc32 = zip_crc32($data);
+    if ($zcrc32 < 0) { // force unsigned
+        $zcrc32 += 4294967296;
     }
-
-    if (!function_exists('gzopen')) {
-        global $request;
-        $request->finish(_("Can't inflate data: zlib support not enabled in this PHP"));
+    if ($crc32 < 0) { // force unsigned
+        $crc32 += 4294967296;
     }
-
-    // Reconstruct gzip header and ungzip the data.
-    $mtime = time(); //(Bogus mtime)
-
-    return gzip_uncompress(pack("a2CxV@10", GZIP_MAGIC, GZIP_DEFLATE, $mtime)
-        . $data
-        . pack("VV", $crc32, $uncomp_size));
+    if ($zcrc32 != $crc32)
+        trigger_error("CRC32 mismatch: calculated=$zcrc32, expected=$crc32", E_USER_ERROR);
+    return $data;
 }
 
 function unixtime2dostime($unix_time)
@@ -278,18 +264,12 @@
     function addRegularFile($filename, $content, $attrib = array())
     {
         $size = strlen($content);
-        if (function_exists('gzopen')) {
-            list ($data, $crc32, $os_type) = zip_deflate($content);
-            if (strlen($data) < $size) {
-                $content = $data; // Use compressed data.
-                $comp_type = ZIP_DEFLATE;
-            } else
-                unset($crc32); // force plain store.
-        } else {
-            // Punt:
-            $os_type = 3; // 0 = FAT --- hopefully this is good enough.
-            /* (Another choice might be 3 = Unix) */
-        }
+        list ($data, $crc32, $os_type) = zip_deflate($content);
+        if (strlen($data) < $size) {
+            $content = $data; // Use compressed data.
+            $comp_type = ZIP_DEFLATE;
+        } else
+            unset($crc32); // force plain store.
 
         if (!isset($crc32)) {
             $comp_type = ZIP_STORE;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9174] trunk/lib/stdlib.php

[<var...@us...>]

Revision: 9174
          http://sourceforge.net/p/phpwiki/code/9174
Author:   vargenau
Date:     2014-10-03 14:26:30 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function debug_print_backtrace exists

Modified Paths:
--------------
    trunk/lib/stdlib.php

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2014-10-03 14:24:21 UTC (rev 9173)
+++ trunk/lib/stdlib.php	2014-10-03 14:26:30 UTC (rev 9174)
@@ -2057,19 +2057,8 @@
 
 function printSimpleTrace($bt)
 {
-    //print_r($bt);
     echo "\nTraceback:\n";
-    if (function_exists('debug_print_backtrace')) { // >= 5
-        debug_print_backtrace();
-    } else {
-        foreach ($bt as $i => $elem) {
-            if (!array_key_exists('file', $elem)) {
-                continue;
-            }
-            //echo join(" ",array_values($elem)),"\n";
-            echo "  ", $elem['file'], ':', $elem['line'], " ", $elem['function'], "\n";
-        }
-    }
+    debug_print_backtrace();
 }
 
 /**

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9173] trunk/lib/stdlib.php

[<var...@us...>]

Revision: 9173
          http://sourceforge.net/p/phpwiki/code/9173
Author:   vargenau
Date:     2014-10-03 14:24:21 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function memory_get_usage exists

Modified Paths:
--------------
    trunk/lib/stdlib.php

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2014-10-03 14:19:30 UTC (rev 9172)
+++ trunk/lib/stdlib.php	2014-10-03 14:24:21 UTC (rev 9173)
@@ -2074,44 +2074,10 @@
 
 /**
  * Return the used process memory, in bytes.
- * Enable the section which will work for you. They are very slow.
- * Special quirks for Windows: Requires cygwin.
  */
 function getMemoryUsage()
 {
-    //if (!(DEBUG & _DEBUG_VERBOSE)) return;
-    if (function_exists('memory_get_usage') and memory_get_usage()) {
-        return memory_get_usage();
-    } elseif (function_exists('getrusage') and ($u = @getrusage()) and !empty($u['ru_maxrss'])) {
-        return $u['ru_maxrss'];
-    } elseif (substr(PHP_OS, 0, 3) == 'WIN') { // may require a newer cygwin
-        // what we want is the process memory only: apache or php (if CGI)
-        $pid = getmypid();
-        $memstr = '';
-        // win32_ps_stat_proc, win32_ps_stat_mem
-        if (function_exists('win32_ps_list_procs')) {
-            $info = win32_ps_stat_proc($pid);
-            $memstr = $info['mem']['working_set_size'];
-        } elseif (0) {
-            // This works only if it's a cygwin process (apache or php).
-            // Requires a newer cygwin
-            $memstr = exec("cat /proc/$pid/statm |cut -f1");
-
-            // if it's native windows use something like this:
-            //   (requires pslist from sysinternals.com, grep, sed and perl)
-            //$memstr = exec("pslist $pid|grep -A1 Mem|sed 1d|perl -ane\"print \$"."F[5]\"");
-        }
-        return (integer)trim($memstr);
-    } else {
-        $pid = getmypid();
-        //%MEM: Percentage of total memory in use by this process
-        //VSZ: Total virtual memory size, in 1K blocks.
-        //RSS: Real Set Size, the actual amount of physical memory allocated to this process.
-        //CPU time used by process since it started.
-        //echo "%",`ps -o%mem,vsz,rss,time -p $pid|sed 1d`,"\n";
-        $memstr = exec("ps -orss -p $pid|sed 1d");
-        return (integer)trim($memstr);
-    }
+    return memory_get_usage();
 }
 
 /**

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9172] trunk

[<var...@us...>]

Revision: 9172
          http://sourceforge.net/p/phpwiki/code/9172
Author:   vargenau
Date:     2014-10-03 14:19:30 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
As of PHP 4.2.0, there is no need to seed the random number generator with srand() or mt_srand() as this is now done automatically.

Modified Paths:
--------------
    trunk/configurator.php
    trunk/lib/Captcha.php
    trunk/lib/WikiUser/HttpAuth.php
    trunk/lib/WikiUser/HttpAuthUpper.php
    trunk/lib/fortune.php
    trunk/lib/plugin/ModeratedPage.php
    trunk/lib/plugin/RandomPage.php
    trunk/lib/stdlib.php
    trunk/passencrypt.php
    trunk/themes/Hawaiian/lib/random.php

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2014-10-03 14:11:26 UTC (rev 9171)
+++ trunk/configurator.php	2014-10-03 14:19:30 UTC (rev 9172)
@@ -105,7 +105,6 @@
         if (!isset($_SERVER))
             $_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
         // maybe we should random the realm to really force a logout. but the next login will fail.
-        // better_srand(); $realm = microtime().rand();
         header('WWW-Authenticate: Basic realm="' . WIKI_NAME . '"');
         if (strstr(php_sapi_name(), 'apache'))
             header('HTTP/1.0 401 Unauthorized');
@@ -2518,7 +2517,6 @@
     $valid_chars = "!#%&+-.0123456789=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz";
     $start = ord($valid_chars);
     $end = ord(substr($valid_chars, -1));
-    better_srand();
     $length = mt_rand($minlength, $maxlength);
     while ($length > 0) {
         $newchar = mt_rand($start, $end);

Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php	2014-10-03 14:11:26 UTC (rev 9171)
+++ trunk/lib/Captcha.php	2014-10-03 14:19:30 UTC (rev 9172)
@@ -95,7 +95,6 @@
 
         // Pick a Word
         $word = "";
-        better_srand();
         while (strlen(trim($word)) == 0) {
             $x = mt_rand(0, count($text));
             return $text[$x];

Modified: trunk/lib/WikiUser/HttpAuth.php
===================================================================
--- trunk/lib/WikiUser/HttpAuth.php	2014-10-03 14:11:26 UTC (rev 9171)
+++ trunk/lib/WikiUser/HttpAuth.php	2014-10-03 14:19:30 UTC (rev 9172)
@@ -74,7 +74,6 @@
             $_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
         // Maybe we should random the realm to really force a logout.
         // But the next login will fail.
-        // better_srand(); $realm = microtime().rand();
         // TODO: On AUTH_TYPE=NTLM this will fail. Only Basic supported so far.
         header('WWW-Authenticate: Basic realm="' . WIKI_NAME . '"');
         if (strstr(php_sapi_name(), 'apache'))

Modified: trunk/lib/WikiUser/HttpAuthUpper.php
===================================================================
--- trunk/lib/WikiUser/HttpAuthUpper.php	2014-10-03 14:11:26 UTC (rev 9171)
+++ trunk/lib/WikiUser/HttpAuthUpper.php	2014-10-03 14:19:30 UTC (rev 9172)
@@ -78,7 +78,6 @@
             $_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
         // Maybe we should random the realm to really force a logout.
         // But the next login will fail.
-        // better_srand(); $realm = microtime().rand();
         // TODO: On AUTH_TYPE=NTLM this will fail. Only Basic supported so far.
         header('WWW-Authenticate: Basic realm="' . WIKI_NAME . '"');
         if (strstr(php_sapi_name(), 'apache'))

Modified: trunk/lib/fortune.php
===================================================================
--- trunk/lib/fortune.php	2014-10-03 14:11:26 UTC (rev 9171)
+++ trunk/lib/fortune.php	2014-10-03 14:19:30 UTC (rev 9172)
@@ -36,7 +36,6 @@
                 }
             }
 
-            srand((double)microtime() * 1000000);
             $index = rand(0, $amount);
             $i = 0;
 

Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php	2014-10-03 14:11:26 UTC (rev 9171)
+++ trunk/lib/plugin/ModeratedPage.php	2014-10-03 14:19:30 UTC (rev 9172)
@@ -200,7 +200,6 @@
 
     function generateId()
     {
-        better_srand();
         $s = "";
         for ($i = 1; $i <= 25; $i++) {
             $r = mt_rand(55, 90);

Modified: trunk/lib/plugin/RandomPage.php
===================================================================
--- trunk/lib/plugin/RandomPage.php	2014-10-03 14:11:26 UTC (rev 9171)
+++ trunk/lib/plugin/RandomPage.php	2014-10-03 14:19:30 UTC (rev 9172)
@@ -77,7 +77,6 @@
 
         $allpages = $dbi->getAllPages(false, $sortby, $limit, $exclude);
         $pagearray = $allpages->asArray();
-        better_srand(); // Start with a good seed.
 
         if (($numpages == 1) && $pagearray) {
             $page = $pagearray[array_rand($pagearray)];

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2014-10-03 14:11:26 UTC (rev 9171)
+++ trunk/lib/stdlib.php	2014-10-03 14:19:30 UTC (rev 9172)
@@ -67,7 +67,6 @@
     can ($object, $method)
     function_usable ($function_name)
     wikihash ($x)
-    better_srand ($seed = '')
     count_all ($arg)
     isSubPage ($pagename)
     subPageSlice ($pagename, $pos)
@@ -1616,29 +1615,8 @@
     return false;
 }
 
-/**
- * Seed the random number generator.
- *
- * better_srand() ensures the randomizer is seeded only once.
- *
- * How random do you want it? See:
- * http://www.php.net/manual/en/function.srand.php
- * http://www.php.net/manual/en/function.mt-srand.php
- */
-function better_srand($seed = '')
-{
-    static $wascalled = FALSE;
-    if (!$wascalled) {
-        $seed = $seed === '' ? (double)microtime() * 1000000 : $seed;
-        function_exists('mt_srand') ? mt_srand($seed) : srand($seed);
-        $wascalled = TRUE;
-        //trigger_error("new random seed", E_USER_NOTICE); //debugging
-    }
-}
-
 function rand_ascii($length = 1)
 {
-    better_srand();
     $s = "";
     for ($i = 1; $i <= $length; $i++) {
         // return only typeable 7 bit ascii, avoid quotes
@@ -1653,7 +1631,6 @@
 {
     // Pick a few random letters or numbers
     $word = "";
-    better_srand();
     // Don't use 1lI0O, because they're hard to read
     $letters = "abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
     $letter_len = strlen($letters);

Modified: trunk/passencrypt.php
===================================================================
--- trunk/passencrypt.php	2014-10-03 14:11:26 UTC (rev 9171)
+++ trunk/passencrypt.php	2014-10-03 14:19:30 UTC (rev 9172)
@@ -26,38 +26,8 @@
 <body>
 <h1>Password Encryption Tool</h1>
 <?php
-/**
- * Seed the random number generator.
- *
- * better_srand() ensures the randomizer is seeded only once.
- *
- * How random do you want it? See:
- * http://www.php.net/manual/en/function.srand.php
- * http://www.php.net/manual/en/function.mt-srand.php
- */
-function better_srand($seed = '')
-{
-    static $wascalled = FALSE;
-    if (!$wascalled) {
-        if ($seed === '') {
-            list($usec, $sec) = explode(" ", microtime());
-            if ($usec > 0.1)
-                $seed = (double)$usec * $sec;
-            else // once in a while use the combined LCG entropy
-                $seed = (double)1000000 * substr(uniqid("", true), 13);
-        }
-        if (function_exists('mt_srand')) {
-            mt_srand($seed); // mersenne twister
-        } else {
-            srand($seed);
-        }
-        $wascalled = TRUE;
-    }
-}
-
 function rand_ascii($length = 1)
 {
-    better_srand();
     $s = "";
     for ($i = 1; $i <= $length; $i++) {
         // return only typeable 7 bit ascii, avoid quotes
@@ -78,7 +48,6 @@
     $valid_chars = "!#%&+-.0123456789=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz";
     $start = ord($valid_chars);
     $end = ord(substr($valid_chars, -1));
-    better_srand();
     $length = mt_rand($minlength, $maxlength);
     while ($length > 0) {
         $newchar = mt_rand($start, $end);

Modified: trunk/themes/Hawaiian/lib/random.php
===================================================================
--- trunk/themes/Hawaiian/lib/random.php	2014-10-03 14:11:26 UTC (rev 9171)
+++ trunk/themes/Hawaiian/lib/random.php	2014-10-03 14:19:30 UTC (rev 9172)
@@ -26,7 +26,6 @@
 
     function pickRandom()
     {
-        better_srand(); // Start with a good seed.
         $this->filename = $this->imageList[array_rand($this->imageList)];
         //trigger_error(sprintf(_("random image chosen: %s"),
         //                      $this->filename),

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9171] trunk/lib

[<var...@us...>]

Revision: 9171
          http://sourceforge.net/p/phpwiki/code/9171
Author:   vargenau
Date:     2014-10-03 14:11:26 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function gzencode exists

Modified Paths:
--------------
    trunk/lib/stdlib.php
    trunk/lib/ziplib.php

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2014-10-03 13:59:53 UTC (rev 9170)
+++ trunk/lib/stdlib.php	2014-10-03 14:11:26 UTC (rev 9171)
@@ -1792,8 +1792,7 @@
 
 function phpwiki_gzhandler($ob)
 {
-    if (function_exists('gzencode'))
-        $ob = gzencode($ob);
+    $ob = gzencode($ob);
     $GLOBALS['request']->_ob_get_length = strlen($ob);
     if (!headers_sent()) {
         header(sprintf("Content-Length: %d", $GLOBALS['request']->_ob_get_length));

Modified: trunk/lib/ziplib.php
===================================================================
--- trunk/lib/ziplib.php	2014-10-03 13:59:53 UTC (rev 9170)
+++ trunk/lib/ziplib.php	2014-10-03 14:11:26 UTC (rev 9171)
@@ -157,10 +157,7 @@
 function zip_deflate($content)
 {
     // Compress content, and suck information from gzip header.
-    if (function_exists('gzencode'))
-        $z = gzencode($content);
-    else
-        $z = gzip_compress($content);
+    $z = gzencode($content);
 
     // Suck OS type byte from gzip header. FIXME: this smells bad.
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9170] trunk

[<var...@us...>]

Revision: 9170
          http://sourceforge.net/p/phpwiki/code/9170
Author:   vargenau
Date:     2014-10-03 13:59:53 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function mt_rand exists

Modified Paths:
--------------
    trunk/configurator.php
    trunk/lib/Captcha.php
    trunk/lib/plugin/ModeratedPage.php
    trunk/lib/stdlib.php
    trunk/passencrypt.php

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2014-10-03 13:54:30 UTC (rev 9169)
+++ trunk/configurator.php	2014-10-03 13:59:53 UTC (rev 9170)
@@ -2519,15 +2519,9 @@
     $start = ord($valid_chars);
     $end = ord(substr($valid_chars, -1));
     better_srand();
-    if (function_exists('mt_rand')) // mersenne twister
-        $length = mt_rand($minlength, $maxlength);
-    else // the usually bad glibc rand()
-        $length = rand($minlength, $maxlength);
+    $length = mt_rand($minlength, $maxlength);
     while ($length > 0) {
-        if (function_exists('mt_rand'))
-            $newchar = mt_rand($start, $end);
-        else
-            $newchar = rand($start, $end);
+        $newchar = mt_rand($start, $end);
         if (!strrpos($valid_chars, $newchar)) continue; // skip holes
         $newpass .= sprintf("%c", $newchar);
         $length--;

Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php	2014-10-03 13:54:30 UTC (rev 9169)
+++ trunk/lib/Captcha.php	2014-10-03 13:59:53 UTC (rev 9170)
@@ -97,10 +97,7 @@
         $word = "";
         better_srand();
         while (strlen(trim($word)) == 0) {
-            if (function_exists('mt_rand'))
-                $x = mt_rand(0, count($text));
-            else
-                $x = rand(0, count($text));
+            $x = mt_rand(0, count($text));
             return $text[$x];
         }
     }

Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php	2014-10-03 13:54:30 UTC (rev 9169)
+++ trunk/lib/plugin/ModeratedPage.php	2014-10-03 13:59:53 UTC (rev 9170)
@@ -203,10 +203,10 @@
         better_srand();
         $s = "";
         for ($i = 1; $i <= 25; $i++) {
-            $r = function_exists('mt_rand') ? mt_rand(55, 90) : rand(55, 90);
+            $r = mt_rand(55, 90);
             $s .= chr(($r < 65) ? ($r - 17) : $r);
         }
-        $len = $r = function_exists('mt_rand') ? mt_rand(15, 25) : rand(15, 25);
+        $len = $r = mt_rand(15, 25);
         return substr(base64_encode($s), 3, $len);
     }
 

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2014-10-03 13:54:30 UTC (rev 9169)
+++ trunk/lib/stdlib.php	2014-10-03 13:59:53 UTC (rev 9170)
@@ -1642,11 +1642,7 @@
     $s = "";
     for ($i = 1; $i <= $length; $i++) {
         // return only typeable 7 bit ascii, avoid quotes
-        if (function_exists('mt_rand'))
-            $s .= chr(mt_rand(40, 126));
-        else
-            // the usually bad glibc srand()
-            $s .= chr(rand(40, 126));
+        $s .= chr(mt_rand(40, 126));
     }
     return $s;
 }
@@ -1662,10 +1658,7 @@
     $letters = "abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
     $letter_len = strlen($letters);
     for ($i = 0; $i < $length; $i++) {
-        if (function_exists('mt_rand'))
-            $word .= $letters[mt_rand(0, $letter_len - 1)];
-        else
-            $word .= $letters[rand(0, $letter_len - 1)];
+        $word .= $letters[mt_rand(0, $letter_len - 1)];
     }
     return $word;
 }

Modified: trunk/passencrypt.php
===================================================================
--- trunk/passencrypt.php	2014-10-03 13:54:30 UTC (rev 9169)
+++ trunk/passencrypt.php	2014-10-03 13:59:53 UTC (rev 9170)
@@ -61,11 +61,7 @@
     $s = "";
     for ($i = 1; $i <= $length; $i++) {
         // return only typeable 7 bit ascii, avoid quotes
-        if (function_exists('mt_rand'))
-            // the usually bad glibc srand()
-            $s .= chr(mt_rand(40, 126));
-        else
-            $s .= chr(rand(40, 126));
+        $s .= chr(mt_rand(40, 126));
     }
     return $s;
 }
@@ -83,15 +79,9 @@
     $start = ord($valid_chars);
     $end = ord(substr($valid_chars, -1));
     better_srand();
-    if (function_exists('mt_rand')) // mersenne twister
-        $length = mt_rand($minlength, $maxlength);
-    else // the usually bad glibc rand()
-        $length = rand($minlength, $maxlength);
+    $length = mt_rand($minlength, $maxlength);
     while ($length > 0) {
-        if (function_exists('mt_rand'))
-            $newchar = mt_rand($start, $end);
-        else
-            $newchar = rand($start, $end);
+        $newchar = mt_rand($start, $end);
         if (!strrpos($valid_chars, $newchar))
             continue; // skip holes
         $newpass .= sprintf("%c", $newchar);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9169] trunk/lib/stdlib.php

[<var...@us...>]

Revision: 9169
          http://sourceforge.net/p/phpwiki/code/9169
Author:   vargenau
Date:     2014-10-03 13:54:30 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function mime_content_type exists

Modified Paths:
--------------
    trunk/lib/stdlib.php

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2014-10-03 13:51:44 UTC (rev 9168)
+++ trunk/lib/stdlib.php	2014-10-03 13:54:30 UTC (rev 9169)
@@ -656,7 +656,7 @@
     }
     $type = $img->getAttr('type');
     if (!$type) {
-        if (function_exists('mime_content_type') && file_exists($url)) {
+        if (file_exists($url)) {
             $type = mime_content_type($url);
         }
     }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9168] trunk

[<var...@us...>]

Revision: 9168
          http://sourceforge.net/p/phpwiki/code/9168
Author:   vargenau
Date:     2014-10-03 13:51:44 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function imap_open exists

Modified Paths:
--------------
    trunk/configurator.php
    trunk/lib/WikiUser.php

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2014-10-03 13:48:15 UTC (rev 9167)
+++ trunk/configurator.php	2014-10-03 13:51:44 UTC (rev 9168)
@@ -1179,10 +1179,8 @@
 The entries in this ou must have a gidNumber and cn attribute.
 Default: ou=Groups");
 
-if (function_exists('imap_open')) {
-
-    $properties["IMAP Auth Host"] =
-        new _define_optional('IMAP_AUTH_HOST', 'localhost:143/imap/notls', "
+$properties["IMAP Auth Host"] =
+    new _define_optional('IMAP_AUTH_HOST', 'localhost:143/imap/notls', "
 If USER_AUTH_ORDER contains IMAP:
 
 The IMAP server to check usernames from. Defaults to localhost.
@@ -1191,21 +1189,6 @@
   localhost, localhost:143/imap/notls,
   localhost:993/imap/ssl/novalidate-cert (SuSE refuses non-SSL conections)");
 
-} else { // function_exists('imap_open')
-
-    $properties["IMAP Authentication"] =
-        new unchangeable_variable('IMAP_AUTH_HOST', "
-; If USER_AUTH_ORDER contains IMAP:
-; The IMAP server to check usernames from. Defaults to localhost.
-;
-; Some IMAP_AUTH_HOST samples:
-;   localhost, localhost:143/imap/notls,
-;   localhost:993/imap/ssl/novalidate-cert (SuSE refuses non-SSL conections)
-;IMAP_AUTH_HOST = localhost:143/imap/notls", "
-Ignored. No IMAP support in this php. configure --with-imap");
-
-}
-
 $properties["POP3 Authentication"] =
     new _define_optional('POP3_AUTH_HOST', 'localhost:110', "
 If USER_AUTH_ORDER contains POP3:

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2014-10-03 13:48:15 UTC (rev 9167)
+++ trunk/lib/WikiUser.php	2014-10-03 13:51:44 UTC (rev 9168)
@@ -1013,7 +1013,7 @@
                         include_once 'lib/WikiUser/LDAP.php';
                         return new _LDAPPassUser($UserName, $this->_prefs);
                     } elseif (in_array('IMAP', $dbh->getAuthParam('USER_AUTH_ORDER')) and
-                        defined('IMAP_AUTH_HOST') and function_exists('imap_open')
+                        defined('IMAP_AUTH_HOST')
                     ) {
                         include_once 'lib/WikiUser/IMAP.php';
                             return new _IMAPPassUser($UserName, $this->_prefs);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9167] trunk/locale

[<var...@us...>]

Revision: 9167
          http://sourceforge.net/p/phpwiki/code/9167
Author:   vargenau
Date:     2014-10-03 13:48:15 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2014-10-03 13:46:33 UTC (rev 9166)
+++ trunk/locale/po/de.po	2014-10-03 13:48:15 UTC (rev 9167)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:35+0200\n"
+"POT-Creation-Date: 2014-10-03 15:47+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -1845,9 +1845,6 @@
 msgid "Search an LDAP directory."
 msgstr "Durchsuche ein LDAP Verzeichnis."
 
-msgid "Missing ldap extension"
-msgstr "Fehlende php LDAP extension"
-
 msgid "Failed to connect to LDAP host"
 msgstr "LDAP Server nicht gefunden"
 
@@ -4872,9 +4869,6 @@
 msgid "%s not defined"
 msgstr "%s nicht definiert"
 
-msgid "No LDAP in this PHP version"
-msgstr "Kein LDAP in dieser PHP Version"
-
 #, php-format
 msgid "Unable to connect to LDAP server %s"
 msgstr "Konnte LDAP Server %s nicht finden"
@@ -6044,6 +6038,12 @@
 msgid "Edit this page"
 msgstr "Diese Seite bearbeiten"
 
+#~ msgid "Missing ldap extension"
+#~ msgstr "Fehlende php LDAP extension"
+
+#~ msgid "No LDAP in this PHP version"
+#~ msgstr "Kein LDAP in dieser PHP Version"
+
 #~ msgid ""
 #~ "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 #~ "change ADMIN_PASSWD."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2014-10-03 13:46:33 UTC (rev 9166)
+++ trunk/locale/po/es.po	2014-10-03 13:48:15 UTC (rev 9167)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:35+0200\n"
+"POT-Creation-Date: 2014-10-03 15:47+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -1814,9 +1814,6 @@
 msgid "Search an LDAP directory."
 msgstr ""
 
-msgid "Missing ldap extension"
-msgstr ""
-
 msgid "Failed to connect to LDAP host"
 msgstr "Incapaz conectar con el servidor de LDAP"
 
@@ -4747,9 +4744,6 @@
 msgid "%s not defined"
 msgstr "%s no definido"
 
-msgid "No LDAP in this PHP version"
-msgstr "Ningún LDAP en esta versión de PHP"
-
 #, php-format
 msgid "Unable to connect to LDAP server %s"
 msgstr "Incapaz conectar con el servidor %s de LDAP"
@@ -5869,6 +5863,9 @@
 msgid "Edit this page"
 msgstr "Corrija esta página"
 
+#~ msgid "No LDAP in this PHP version"
+#~ msgstr "Ningún LDAP en esta versión de PHP"
+
 #~ msgid "The crypt function is not available in this version of PHP."
 #~ msgstr "La función de la cripta no está disponible en esta versión de PHP."
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-10-03 13:46:33 UTC (rev 9166)
+++ trunk/locale/po/fr.po	2014-10-03 13:48:15 UTC (rev 9167)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:35+0200\n"
+"POT-Creation-Date: 2014-10-03 15:47+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1823,9 +1823,6 @@
 msgid "Search an LDAP directory."
 msgstr "Chercher dans un annuaire LDAP."
 
-msgid "Missing ldap extension"
-msgstr ""
-
 msgid "Failed to connect to LDAP host"
 msgstr "Impossible de se connecter au serveur LDAP "
 
@@ -4809,9 +4806,6 @@
 msgid "%s not defined"
 msgstr "%s non défini"
 
-msgid "No LDAP in this PHP version"
-msgstr "Pas de LDAP dans cette version de php"
-
 #, php-format
 msgid "Unable to connect to LDAP server %s"
 msgstr "Impossible de se connecter à l'annuaire LDAP de l'hôte %s"
@@ -5954,6 +5948,9 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid "No LDAP in this PHP version"
+#~ msgstr "Pas de LDAP dans cette version de php"
+
 #~ msgid "The crypt function is not available in this version of PHP."
 #~ msgstr ""
 #~ "La fonction de cryptage n'est pas disponible dans cette version de PHP."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2014-10-03 13:46:33 UTC (rev 9166)
+++ trunk/locale/po/it.po	2014-10-03 13:48:15 UTC (rev 9167)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:35+0200\n"
+"POT-Creation-Date: 2014-10-03 15:47+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -1796,9 +1796,6 @@
 msgid "Search an LDAP directory."
 msgstr ""
 
-msgid "Missing ldap extension"
-msgstr ""
-
 msgid "Failed to connect to LDAP host"
 msgstr "Non riesco a stabilire una connessione col LDAP"
 
@@ -4709,9 +4706,6 @@
 msgid "%s not defined"
 msgstr "%s: non definito"
 
-msgid "No LDAP in this PHP version"
-msgstr ""
-
 #, php-format
 msgid "Unable to connect to LDAP server %s"
 msgstr ""

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2014-10-03 13:46:33 UTC (rev 9166)
+++ trunk/locale/po/ja.po	2014-10-03 13:48:15 UTC (rev 9167)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:35+0200\n"
+"POT-Creation-Date: 2014-10-03 15:47+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1813,9 +1813,6 @@
 msgid "Search an LDAP directory."
 msgstr ""
 
-msgid "Missing ldap extension"
-msgstr ""
-
 msgid "Failed to connect to LDAP host"
 msgstr ""
 
@@ -4851,9 +4848,6 @@
 msgid "%s not defined"
 msgstr "%s: 未定義でした。"
 
-msgid "No LDAP in this PHP version"
-msgstr ""
-
 #, php-format
 msgid "Unable to connect to LDAP server %s"
 msgstr ""

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2014-10-03 13:46:33 UTC (rev 9166)
+++ trunk/locale/po/nl.po	2014-10-03 13:48:15 UTC (rev 9167)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:35+0200\n"
+"POT-Creation-Date: 2014-10-03 15:47+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -1787,9 +1787,6 @@
 msgid "Search an LDAP directory."
 msgstr ""
 
-msgid "Missing ldap extension"
-msgstr ""
-
 msgid "Failed to connect to LDAP host"
 msgstr ""
 
@@ -4701,9 +4698,6 @@
 msgid "%s not defined"
 msgstr ""
 
-msgid "No LDAP in this PHP version"
-msgstr ""
-
 #, php-format
 msgid "Unable to connect to LDAP server %s"
 msgstr ""

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2014-10-03 13:46:33 UTC (rev 9166)
+++ trunk/locale/po/phpwiki.pot	2014-10-03 13:48:15 UTC (rev 9167)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:35+0200\n"
+"POT-Creation-Date: 2014-10-03 15:47+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1781,9 +1781,6 @@
 msgid "Search an LDAP directory."
 msgstr ""
 
-msgid "Missing ldap extension"
-msgstr ""
-
 msgid "Failed to connect to LDAP host"
 msgstr ""
 
@@ -4693,9 +4690,6 @@
 msgid "%s not defined"
 msgstr ""
 
-msgid "No LDAP in this PHP version"
-msgstr ""
-
 #, php-format
 msgid "Unable to connect to LDAP server %s"
 msgstr ""

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2014-10-03 13:46:33 UTC (rev 9166)
+++ trunk/locale/po/sv.po	2014-10-03 13:48:15 UTC (rev 9167)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:35+0200\n"
+"POT-Creation-Date: 2014-10-03 15:47+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -1782,9 +1782,6 @@
 msgid "Search an LDAP directory."
 msgstr ""
 
-msgid "Missing ldap extension"
-msgstr ""
-
 msgid "Failed to connect to LDAP host"
 msgstr ""
 
@@ -4694,9 +4691,6 @@
 msgid "%s not defined"
 msgstr ""
 
-msgid "No LDAP in this PHP version"
-msgstr ""
-
 #, php-format
 msgid "Unable to connect to LDAP server %s"
 msgstr ""

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2014-10-03 13:46:33 UTC (rev 9166)
+++ trunk/locale/po/zh.po	2014-10-03 13:48:15 UTC (rev 9167)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 15:35+0200\n"
+"POT-Creation-Date: 2014-10-03 15:47+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -1860,10 +1860,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Missing ldap extension"
-msgstr "個別頁面權限"
-
-#, fuzzy
 msgid "Failed to connect to LDAP host"
 msgstr "無法連結到 LDAP 伺服器"
 
@@ -4936,9 +4932,6 @@
 msgid "%s not defined"
 msgstr "%s: 未被定義"
 
-msgid "No LDAP in this PHP version"
-msgstr "此版本的 PHP 無 LDAP"
-
 #, php-format
 msgid "Unable to connect to LDAP server %s"
 msgstr "無法連結到 LDAP 伺服器 %s"
@@ -6114,6 +6107,9 @@
 msgid "Edit this page"
 msgstr "編輯此頁面"
 
+#~ msgid "No LDAP in this PHP version"
+#~ msgstr "此版本的 PHP 無 LDAP"
+
 #~ msgid "The crypt function is not available in this version of PHP."
 #~ msgstr "此版本的 PHP 沒有 crypt 函數."
 

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9166] trunk

[<var...@us...>]

Revision: 9166
          http://sourceforge.net/p/phpwiki/code/9166
Author:   vargenau
Date:     2014-10-03 13:46:33 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function ldap_connect exists

Modified Paths:
--------------
    trunk/configurator.php
    trunk/lib/WikiGroup.php
    trunk/lib/WikiUser.php
    trunk/lib/plugin/LdapSearch.php

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2014-10-03 13:37:54 UTC (rev 9165)
+++ trunk/configurator.php	2014-10-03 13:46:33 UTC (rev 9166)
@@ -1128,106 +1128,57 @@
 $properties["DBAUTH_USER_GROUPS"] =
     new _define_optional('DBAUTH_USER_GROUPS', "SELECT group FROM user WHERE user='\$userid'", "");
 
-if (function_exists('ldap_connect')) {
-
-    $properties["LDAP AUTH Host"] =
-        new _define_optional('LDAP_AUTH_HOST', "ldap://localhost:389", "
+$properties["LDAP AUTH Host"] =
+    new _define_optional('LDAP_AUTH_HOST', "ldap://localhost:389", "
 If USER_AUTH_ORDER contains Ldap:
 
 The LDAP server to connect to.  Can either be a hostname, or a complete
 URL to the server (useful if you want to use ldaps or specify a different
 port number).");
 
-    $properties["LDAP BASE DN"] =
-        new _define_optional('LDAP_BASE_DN', "ou=mycompany.com,o=My Company", "
+$properties["LDAP BASE DN"] =
+    new _define_optional('LDAP_BASE_DN', "ou=mycompany.com,o=My Company", "
 The organizational or domain BASE DN: e.g. \"dc=mydomain,dc=com\".
 
 Note: ou=Users and ou=Groups are used for GroupLdap Membership
 Better use LDAP_OU_USERS and LDAP_OU_GROUP with GROUP_METHOD=LDAP.");
 
-    $properties["LDAP SET OPTION"] =
-        new _define_optional('LDAP_SET_OPTION', "LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0", "
+$properties["LDAP SET OPTION"] =
+    new _define_optional('LDAP_SET_OPTION', "LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0", "
 Some LDAP servers need some more options, such as the Windows Active
 Directory Server.  Specify the options (as allowed by the PHP LDAP module)
 and their values as NAME=value pairs separated by colons.");
 
-    $properties["LDAP AUTH USER"] =
-        new _define_optional('LDAP_AUTH_USER', "CN=ldapuser,ou=Users,o=Development,dc=mycompany.com", "
+$properties["LDAP AUTH USER"] =
+    new _define_optional('LDAP_AUTH_USER', "CN=ldapuser,ou=Users,o=Development,dc=mycompany.com", "
 DN to initially bind to the LDAP server as. This is needed if the server doesn't
 allow anonymous queries. (Windows Active Directory Server)");
 
-    $properties["LDAP AUTH PASSWORD"] =
-        new _define_optional('LDAP_AUTH_PASSWORD', "secret", "
+$properties["LDAP AUTH PASSWORD"] =
+    new _define_optional('LDAP_AUTH_PASSWORD', "secret", "
 Password to use to initially bind to the LDAP server, as the DN
 specified in the LDAP_AUTH_USER option (above).");
 
-    $properties["LDAP SEARCH FIELD"] =
-        new _define_optional('LDAP_SEARCH_FIELD', "uid", "
+$properties["LDAP SEARCH FIELD"] =
+    new _define_optional('LDAP_SEARCH_FIELD', "uid", "
 If you want to match usernames against an attribute other than uid,
 specify it here. Default: uid
 
 e.g.: LDAP_SEARCH_FIELD = sAMAccountName");
 
-    $properties["LDAP OU USERS"] =
-        new _define_optional('LDAP_OU_USERS', "ou=Users", "
+$properties["LDAP OU USERS"] =
+    new _define_optional('LDAP_OU_USERS', "ou=Users", "
 If you have an organizational unit for all users, define it here.
 This narrows the search, and is needed for LDAP group membership (if GROUP_METHOD=LDAP)
 Default: ou=Users");
 
-    $properties["LDAP OU GROUP"] =
-        new _define_optional('LDAP_OU_GROUP', "ou=Groups", "
+$properties["LDAP OU GROUP"] =
+    new _define_optional('LDAP_OU_GROUP', "ou=Groups", "
 If you have an organizational unit for all groups, define it here.
 This narrows the search, and is needed for LDAP group membership (if GROUP_METHOD=LDAP)
 The entries in this ou must have a gidNumber and cn attribute.
 Default: ou=Groups");
 
-} else { // function_exists('ldap_connect')
-
-    $properties["LDAP Authentication"] =
-        new unchangeable_variable('LDAP Authentication', "
-; If USER_AUTH_ORDER contains Ldap:
-;
-; The LDAP server to connect to.  Can either be a hostname, or a complete
-; URL to the server (useful if you want to use ldaps or specify a different
-; port number).
-;LDAP_AUTH_HOST = \"ldap://localhost:389\"
-;
-; The organizational or domain BASE DN: e.g. \"dc=mydomain,dc=com\".
-;
-; Note: ou=Users and ou=Groups are used for GroupLdap Membership
-; Better use LDAP_OU_USERS and LDAP_OU_GROUP with GROUP_METHOD=LDAP.
-;LDAP_BASE_DN = \"ou=Users,o=Development,dc=mycompany.com\"
-
-; Some LDAP servers need some more options, such as the Windows Active
-; Directory Server.  Specify the options (as allowed by the PHP LDAP module)
-; and their values as NAME=value pairs separated by colons.
-; LDAP_SET_OPTION = \"LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0\"
-
-; DN to initially bind to the LDAP server as. This is needed if the server doesn't
-; allow anonymous queries. (Windows Active Directory Server)
-; LDAP_AUTH_USER = \"CN=ldapuser,ou=Users,o=Development,dc=mycompany.com\"
-
-; Password to use to initially bind to the LDAP server, as the DN
-; specified in the LDAP_AUTH_USER option (above).
-; LDAP_AUTH_PASSWORD = secret
-
-; If you want to match usernames against an attribute other than uid,
-; specify it here. Default: uid
-; LDAP_SEARCH_FIELD = sAMAccountName
-
-; If you have an organizational unit for all users, define it here.
-; This narrows the search, and is needed for LDAP group membership (if GROUP_METHOD=LDAP)
-; Default: ou=Users
-; LDAP_OU_USERS = ou=Users
-
-; If you have an organizational unit for all groups, define it here.
-; This narrows the search, and is needed for LDAP group membership (if GROUP_METHOD=LDAP)
-; The entries in this ou must have a gidNumber and cn attribute.
-; Default: ou=Groups
-; LDAP_OU_GROUP = ou=Groups", "
-; Ignored. No LDAP support in this php. configure --with-ldap");
-}
-
 if (function_exists('imap_open')) {
 
     $properties["IMAP Auth Host"] =

Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2014-10-03 13:37:54 UTC (rev 9165)
+++ trunk/lib/WikiGroup.php	2014-10-03 13:46:33 UTC (rev 9166)
@@ -963,16 +963,6 @@
                 E_USER_WARNING);
             return;
         }
-        // We should ignore multithreaded environments, not generally windows.
-        // CGI does work.
-        if (!function_exists('ldap_connect') and (!isWindows() or isCGI())) {
-            // on MacOSX >= 4.3 you'll need PHP_SHLIB_SUFFIX instead.
-            dl("ldap" . defined('PHP_SHLIB_SUFFIX') ? PHP_SHLIB_SUFFIX : DLL_EXT);
-            if (!function_exists('ldap_connect')) {
-                trigger_error(_("No LDAP in this PHP version"), E_USER_WARNING);
-                return;
-            }
-        }
         if (!defined("LDAP_BASE_DN"))
             define("LDAP_BASE_DN", '');
         $this->base_dn = LDAP_BASE_DN;

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2014-10-03 13:37:54 UTC (rev 9165)
+++ trunk/lib/WikiUser.php	2014-10-03 13:46:33 UTC (rev 9166)
@@ -1008,8 +1008,7 @@
                     ) {
                         return new _DbPassUser($UserName, $this->_prefs);
                     } elseif (in_array('LDAP', $dbh->getAuthParam('USER_AUTH_ORDER')) and
-                        defined('LDAP_AUTH_HOST') and defined('LDAP_BASE_DN') and
-                            function_exists('ldap_connect')
+                        defined('LDAP_AUTH_HOST') and defined('LDAP_BASE_DN')
                     ) {
                         include_once 'lib/WikiUser/LDAP.php';
                         return new _LDAPPassUser($UserName, $this->_prefs);

Modified: trunk/lib/plugin/LdapSearch.php
===================================================================
--- trunk/lib/plugin/LdapSearch.php	2014-10-03 13:37:54 UTC (rev 9165)
+++ trunk/lib/plugin/LdapSearch.php	2014-10-03 13:46:33 UTC (rev 9166)
@@ -67,8 +67,6 @@
         );
     }
 
-    // I ought to require the ldap extension, but fail sanely, if I cant get it.
-    // - however at the moment this seems to work as is
     /**
      * @param WikiDB $dbi
      * @param string $argstr
@@ -78,10 +76,6 @@
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
-        if (!function_exists('ldap_connect')) {
-            if (!loadPhpExtension('ldap'))
-                return $this->error(_("Missing ldap extension"));
-        }
         $args = $this->getArgs($argstr, $request);
         extract($args);
         //include_once("lib/WikiUser/LDAP.php");

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9165] trunk/locale

[<var...@us...>]

Revision: 9165
          http://sourceforge.net/p/phpwiki/code/9165
Author:   vargenau
Date:     2014-10-03 13:37:54 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2014-10-03 13:35:42 UTC (rev 9164)
+++ trunk/locale/po/de.po	2014-10-03 13:37:54 UTC (rev 9165)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-02 16:33+0200\n"
+"POT-Creation-Date: 2014-10-03 15:35+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -5119,16 +5119,6 @@
 "Sie können sich leider nicht anmelden.\n"
 " Sie müssen den System Administrator bitten, Ihr Passwort neu zu setzen."
 
-msgid "The crypt function is not available in this version of PHP."
-msgstr ""
-
-msgid ""
-"Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
-"change ADMIN_PASSWD."
-msgstr ""
-"Sie haben vergessen ENCRYPTED_PASSWD auf true zu setzen. Bitte aktualisieren "
-"Sie config/config.ini und überprüfen sie auch ADMIN_PASSWD."
-
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 "Sie haben vergessen ENCRYPTED_PASSWD auf true in config/config.ini zu setzen."
@@ -6055,6 +6045,13 @@
 msgstr "Diese Seite bearbeiten"
 
 #~ msgid ""
+#~ "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
+#~ "change ADMIN_PASSWD."
+#~ msgstr ""
+#~ "Sie haben vergessen ENCRYPTED_PASSWD auf true zu setzen. Bitte "
+#~ "aktualisieren Sie config/config.ini und überprüfen sie auch ADMIN_PASSWD."
+
+#~ msgid ""
 #~ "You forgot to set ENCRYPTED_PASSWD to true. Please update your config/"
 #~ "config.ini"
 #~ msgstr ""

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2014-10-03 13:35:42 UTC (rev 9164)
+++ trunk/locale/po/es.po	2014-10-03 13:37:54 UTC (rev 9165)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-02 16:33+0200\n"
+"POT-Creation-Date: 2014-10-03 15:35+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -5000,16 +5000,6 @@
 " Usted tiene que pedir que el administrador de sistema reajuste su "
 "contraseña."
 
-msgid "The crypt function is not available in this version of PHP."
-msgstr "La función de la cripta no está disponible en esta versión de PHP."
-
-msgid ""
-"Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
-"change ADMIN_PASSWD."
-msgstr ""
-"En ENCRYPTED_PASSWD por favor fijado a falso config/config.ini y "
-"probablemente cambio ADMIN_PASSWD."
-
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr "ENCRYPTED_PASSWD por favor fijado a verdad en config/config.ini."
 
@@ -5879,7 +5869,17 @@
 msgid "Edit this page"
 msgstr "Corrija esta página"
 
+#~ msgid "The crypt function is not available in this version of PHP."
+#~ msgstr "La función de la cripta no está disponible en esta versión de PHP."
+
 #~ msgid ""
+#~ "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
+#~ "change ADMIN_PASSWD."
+#~ msgstr ""
+#~ "En ENCRYPTED_PASSWD por favor fijado a falso config/config.ini y "
+#~ "probablemente cambio ADMIN_PASSWD."
+
+#~ msgid ""
 #~ "You forgot to set ENCRYPTED_PASSWD to true. Please update your config/"
 #~ "config.ini"
 #~ msgstr ""

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-10-03 13:35:42 UTC (rev 9164)
+++ trunk/locale/po/fr.po	2014-10-03 13:37:54 UTC (rev 9165)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-02 16:33+0200\n"
+"POT-Creation-Date: 2014-10-03 15:35+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -5053,17 +5053,6 @@
 "La taille de votre mot de passe est trop petite, vous ne pouvez pas vous "
 "connecter. Veuillez contacter l'administrateur pour le changer."
 
-msgid "The crypt function is not available in this version of PHP."
-msgstr ""
-"La fonction de cryptage n'est pas disponible dans cette version de PHP."
-
-msgid ""
-"Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
-"change ADMIN_PASSWD."
-msgstr ""
-"Veuillez définir ENCRYPTED_PASSWD à false dans config/config.ini et "
-"probablement l'ADMIN_PASSWD."
-
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr "Veuillez définir ENCRYPTED_PASSWD à true dans config/config.ini."
 
@@ -5965,7 +5954,18 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid "The crypt function is not available in this version of PHP."
+#~ msgstr ""
+#~ "La fonction de cryptage n'est pas disponible dans cette version de PHP."
+
 #~ msgid ""
+#~ "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
+#~ "change ADMIN_PASSWD."
+#~ msgstr ""
+#~ "Veuillez définir ENCRYPTED_PASSWD à false dans config/config.ini et "
+#~ "probablement l'ADMIN_PASSWD."
+
+#~ msgid ""
 #~ "You forgot to set ENCRYPTED_PASSWD to true. Please update your config/"
 #~ "config.ini"
 #~ msgstr ""

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2014-10-03 13:35:42 UTC (rev 9164)
+++ trunk/locale/po/it.po	2014-10-03 13:37:54 UTC (rev 9165)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-02 16:33+0200\n"
+"POT-Creation-Date: 2014-10-03 15:35+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -4950,14 +4950,6 @@
 " You have to ask the System Administrator to reset your password."
 msgstr ""
 
-msgid "The crypt function is not available in this version of PHP."
-msgstr ""
-
-msgid ""
-"Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
-"change ADMIN_PASSWD."
-msgstr ""
-
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2014-10-03 13:35:42 UTC (rev 9164)
+++ trunk/locale/po/ja.po	2014-10-03 13:37:54 UTC (rev 9165)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-02 16:33+0200\n"
+"POT-Creation-Date: 2014-10-03 15:35+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5093,14 +5093,6 @@
 " You have to ask the System Administrator to reset your password."
 msgstr ""
 
-msgid "The crypt function is not available in this version of PHP."
-msgstr ""
-
-msgid ""
-"Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
-"change ADMIN_PASSWD."
-msgstr ""
-
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2014-10-03 13:35:42 UTC (rev 9164)
+++ trunk/locale/po/nl.po	2014-10-03 13:37:54 UTC (rev 9165)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-02 16:33+0200\n"
+"POT-Creation-Date: 2014-10-03 15:35+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -4942,14 +4942,6 @@
 " You have to ask the System Administrator to reset your password."
 msgstr ""
 
-msgid "The crypt function is not available in this version of PHP."
-msgstr ""
-
-msgid ""
-"Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
-"change ADMIN_PASSWD."
-msgstr ""
-
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2014-10-03 13:35:42 UTC (rev 9164)
+++ trunk/locale/po/phpwiki.pot	2014-10-03 13:37:54 UTC (rev 9165)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-02 16:33+0200\n"
+"POT-Creation-Date: 2014-10-03 15:35+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -4934,14 +4934,6 @@
 " You have to ask the System Administrator to reset your password."
 msgstr ""
 
-msgid "The crypt function is not available in this version of PHP."
-msgstr ""
-
-msgid ""
-"Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
-"change ADMIN_PASSWD."
-msgstr ""
-
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2014-10-03 13:35:42 UTC (rev 9164)
+++ trunk/locale/po/sv.po	2014-10-03 13:37:54 UTC (rev 9165)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-02 16:33+0200\n"
+"POT-Creation-Date: 2014-10-03 15:35+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -4935,14 +4935,6 @@
 " You have to ask the System Administrator to reset your password."
 msgstr ""
 
-msgid "The crypt function is not available in this version of PHP."
-msgstr ""
-
-msgid ""
-"Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
-"change ADMIN_PASSWD."
-msgstr ""
-
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2014-10-03 13:35:42 UTC (rev 9164)
+++ trunk/locale/po/zh.po	2014-10-03 13:37:54 UTC (rev 9165)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-02 16:33+0200\n"
+"POT-Creation-Date: 2014-10-03 15:35+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -5184,17 +5184,7 @@
 "密碼長度小於系統原則所允許的長度. 抱歉,你無法登入. \n"
 " 你必須詢問系統管理者以重設密碼."
 
-msgid "The crypt function is not available in this version of PHP."
-msgstr "此版本的 PHP 沒有 crypt 函數."
-
 #, fuzzy
-msgid ""
-"Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
-"change ADMIN_PASSWD."
-msgstr ""
-"請在 index.php 中設定 ENCRYPTED_PASSWD 為 false 或許也要變更 ADMIN_PASSWD."
-
-#, fuzzy
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr "請在 index.php 中設定 ENCRYPTED_PASSWD 為 true."
 
@@ -6124,6 +6114,9 @@
 msgid "Edit this page"
 msgstr "編輯此頁面"
 
+#~ msgid "The crypt function is not available in this version of PHP."
+#~ msgstr "此版本的 PHP 沒有 crypt 函數."
+
 #~ msgid ""
 #~ "Your home page has not been created yet so your preferences cannot not be "
 #~ "saved."

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9164] trunk/lib/WikiUser.php

[<var...@us...>]

Revision: 9164
          http://sourceforge.net/p/phpwiki/code/9164
Author:   vargenau
Date:     2014-10-03 13:35:42 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function crypt exists

Modified Paths:
--------------
    trunk/lib/WikiUser.php

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2014-10-02 14:47:14 UTC (rev 9163)
+++ trunk/lib/WikiUser.php	2014-10-03 13:35:42 UTC (rev 9164)
@@ -1308,29 +1308,20 @@
             }
             if (ENCRYPTED_PASSWD) {
                 // Verify against encrypted password.
-                if (function_exists('crypt')) {
-                    if (crypt($submitted_password, $stored_password) == $stored_password)
-                        return true; // matches encrypted password
-                    else
-                        return false;
-                } else {
-                    trigger_error(_("The crypt function is not available in this version of PHP.") . " "
-                            . _("Please set ENCRYPTED_PASSWD to false in config/config.ini and probably change ADMIN_PASSWD."),
-                        E_USER_WARNING);
+                if (crypt($submitted_password, $stored_password) == $stored_password)
+                    return true; // matches encrypted password
+                else
                     return false;
-                }
             } else {
                 // Verify against cleartext password.
                 if ($submitted_password == $stored_password)
                     return true;
                 else {
                     // Check whether we forgot to enable ENCRYPTED_PASSWD
-                    if (function_exists('crypt')) {
-                        if (crypt($submitted_password, $stored_password) == $stored_password) {
-                            trigger_error(_("Please set ENCRYPTED_PASSWD to true in config/config.ini."),
-                                E_USER_WARNING);
-                            return true;
-                        }
+                    if (crypt($submitted_password, $stored_password) == $stored_password) {
+                        trigger_error(_("Please set ENCRYPTED_PASSWD to true in config/config.ini."),
+                            E_USER_WARNING);
+                        return true;
                     }
                 }
             }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9163] branches/release-1.5.1/

[<var...@us...>]

Revision: 9163
          http://sourceforge.net/p/phpwiki/code/9163
Author:   vargenau
Date:     2014-10-02 14:47:14 +0000 (Thu, 02 Oct 2014)
Log Message:
-----------
Create branch release-1.5.1

Added Paths:
-----------
    branches/release-1.5.1/

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