phpwiki-checkins Mailing List for PhpWiki

Revision: 10003
 http://sourceforge.net/p/phpwiki/code/10003
Author: vargenau
Date: 2017年01月18日 15:49:41 +0000 (2017年1月18日)
Log Message:
-----------
Make XHTML ZIP Snapshot work again (real fix)
Modified Paths:
--------------
 trunk/lib/loadsave.php
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2017年01月11日 15:34:42 UTC (rev 10002)
+++ trunk/lib/loadsave.php	2017年01月18日 15:49:41 UTC (rev 10003)
@@ -754,7 +754,7 @@
 }
 } else {
 $target = "images/" . basename($from);
- $zip->addFile($target);
+ $zip->addFile($from, $target);
 }
 } elseif (!$silent) {
 _copyMsg($from, _("... not found"));
@@ -789,7 +789,7 @@
 }
 } else {
 $target = "images/buttons/" . basename($from);
- $zip->addFile($target);
+ $zip->addFile($from, $target);
 }
 } elseif (!$silent) {
 _copyMsg($from, _("... not found"));
@@ -819,7 +819,7 @@
 } else {
 //$attrib = array('is_ascii' => 0);
 $target = basename($css_file);
- $zip->addFile($target);
+ $zip->addFile($from, $target);
 }
 } elseif (!$silent) {
 _copyMsg($from, _("... not found"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10002
 http://sourceforge.net/p/phpwiki/code/10002
Author: vargenau
Date: 2017年01月11日 15:34:42 +0000 (2017年1月11日)
Log Message:
-----------
Add braces
Modified Paths:
--------------
 trunk/lib/WikiUser/FusionForge.php
Modified: trunk/lib/WikiUser/FusionForge.php
===================================================================
--- trunk/lib/WikiUser/FusionForge.php	2017年01月11日 15:29:56 UTC (rev 10001)
+++ trunk/lib/WikiUser/FusionForge.php	2017年01月11日 15:34:42 UTC (rev 10002)
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
 * Copyright © 2006 Alain Peyrat
 *
 * This file is part of PhpWiki.
@@ -26,7 +26,8 @@
 *
 */
 
-class _FusionForgePassUser extends _PassUser
+class _FusionForgePassUser
+ extends _PassUser
 {
 
 public $_is_external = 0;
@@ -36,15 +37,17 @@
 if ($prefs) $this->_prefs = $prefs;
 if (!isset($this->_prefs->_method))
 parent::__construct($UserName);
- if ($UserName) $this->_userid = $UserName;
+ if ($UserName)
+ $this->_userid = $UserName;
 $this->_authmethod = 'FusionForge';
 
 // Is this double check really needed?
 // It is not expensive so we keep it for now.
- if ($this->userExists())
+ if ($this->userExists()) {
 return $this;
- else
+ } else {
 return $GLOBALS['ForbiddenUser'];
+ }
 }
 
 function userExists()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10001
 http://sourceforge.net/p/phpwiki/code/10001
Author: vargenau
Date: 2017年01月11日 15:29:56 +0000 (2017年1月11日)
Log Message:
-----------
Whitespace
Modified Paths:
--------------
 trunk/lib/WikiUser/HttpAuth.php
Modified: trunk/lib/WikiUser/HttpAuth.php
===================================================================
--- trunk/lib/WikiUser/HttpAuth.php	2017年01月11日 15:10:19 UTC (rev 10000)
+++ trunk/lib/WikiUser/HttpAuth.php	2017年01月11日 15:29:56 UTC (rev 10001)
@@ -23,7 +23,7 @@
 */
 
 /**
- * We have two possibilities here.
+ * We have two possibilities here:
 * 1) The webserver location is already HTTP protected. Usually Basic, but also
 * NTLM or Digest. Then just use this username and do nothing.
 * 2) The webserver location is not protected, so we enforce basic HTTP Protection
@@ -43,7 +43,8 @@
 if ($prefs) $this->_prefs = $prefs;
 if (!isset($this->_prefs->_method))
 parent::__construct($UserName);
- if ($UserName) $this->_userid = $UserName;
+ if ($UserName)
+ $this->_userid = $UserName;
 $this->_authmethod = 'HttpAuth';
 
 // Is this double check really needed?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10000
 http://sourceforge.net/p/phpwiki/code/10000
Author: vargenau
Date: 2017年01月11日 15:10:19 +0000 (2017年1月11日)
Log Message:
-----------
Remove unused USE_PREFS_IN_PAGE
Modified Paths:
--------------
 trunk/lib/main.php
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2017年01月11日 15:08:45 UTC (rev 9999)
+++ trunk/lib/main.php	2017年01月11日 15:10:19 UTC (rev 10000)
@@ -24,9 +24,6 @@
 *
 */
 
-define ('USE_PREFS_IN_PAGE', true);
-
-//include "lib/config.php";
 require_once 'lib/stdlib.php';
 require_once 'lib/Request.php';
 require_once 'lib/WikiDB.php';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9999
 http://sourceforge.net/p/phpwiki/code/9999
Author: vargenau
Date: 2017年01月11日 15:08:45 +0000 (2017年1月11日)
Log Message:
-----------
Remove obsolete comment
Modified Paths:
--------------
 trunk/lib/config.php
Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2017年01月11日 15:07:17 UTC (rev 9998)
+++ trunk/lib/config.php	2017年01月11日 15:08:45 UTC (rev 9999)
@@ -31,7 +31,6 @@
 /*
 * NOTE: The settings here should probably not need to be changed.
 * The user-configurable settings have been moved to IniConfig.php
- * The run-time code has been moved to lib/IniConfig.php:fix_configs()
 */
 
 if (!defined("LC_ALL")) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9998
 http://sourceforge.net/p/phpwiki/code/9998
Author: vargenau
Date: 2017年01月11日 15:07:17 +0000 (2017年1月11日)
Log Message:
-----------
Remove obsolete comment
Modified Paths:
--------------
 trunk/lib/WikiUser.php
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2017年01月11日 12:26:18 UTC (rev 9997)
+++ trunk/lib/WikiUser.php	2017年01月11日 15:07:17 UTC (rev 9998)
@@ -1096,7 +1096,6 @@
 $this->getAuthDbh();
 // "'\$userid"' => %s
 // variables can be old-style: '"\$userid"' or new-style: "'$userid'" or just "userid"
- // old-style strings don't survive pear/Config/IniConfig treatment, that's why we changed it.
 $new = array();
 if (is_array($variables)) {
 //$sprintfstyle = false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9997
 http://sourceforge.net/p/phpwiki/code/9997
Author: vargenau
Date: 2017年01月11日 12:26:18 +0000 (2017年1月11日)
Log Message:
-----------
Remove unused global $FieldSeparator
Modified Paths:
--------------
 trunk/lib/IniConfig.php
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2017年01月11日 12:14:43 UTC (rev 9996)
+++ trunk/lib/IniConfig.php	2017年01月11日 12:26:18 UTC (rev 9997)
@@ -50,7 +50,7 @@
 * (namespace pollution). (FusionForge, phpnuke, postnuke, phpBB2, carolina, ...)
 * Use one global $phpwiki object instead which holds the cfg vars, constants
 * and all other globals.
- * (global $FieldSeparator, $WikiNameRegexp, $KeywordLinkRegexp;
+ * (global $WikiNameRegexp, $KeywordLinkRegexp;
 * global $DisabledActions, $DBParams, $LANG, $AllActionPages)
 *
 * - Resurrect the larger "config object" code (in config/) so it'll aid the
@@ -556,14 +556,11 @@
 // moved from lib/config.php [1ms]
 function fixup_static_configs($file)
 {
- global $FieldSeparator, $AllActionPages;
+ global $AllActionPages;
 global $DBParams;
 // init FileFinder to add proper include paths
 findFile("lib/interwiki.map", true);
 
- // $FieldSeparator = "\xFF"; // this byte should never appear in utf-8
- $FieldSeparator = "\xFF";
-
 // All pages containing plugins of the same name as the filename
 $ActionPages = explode(':',
 'AllPages:AllUsers:AppendText:AuthorHistory:'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9996
 http://sourceforge.net/p/phpwiki/code/9996
Author: vargenau
Date: 2017年01月11日 12:14:43 +0000 (2017年1月11日)
Log Message:
-----------
Remove obsolete comment
Modified Paths:
--------------
 trunk/lib/WikiUser.php
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2016年12月16日 14:53:55 UTC (rev 9995)
+++ trunk/lib/WikiUser.php	2017年01月11日 12:14:43 UTC (rev 9996)
@@ -1298,8 +1298,6 @@
 * the db password method is 'plain', which means that the DB SQL
 * statement just returns 1 or 0. To use CRYPT() or PASSWORD() and
 * don't store plain passwords in the DB.
- *
- * TODO: remove crypt() function check from config.php:396 ??
 */
 function _checkPass($submitted_password, $stored_password)
 {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.