Commit: 9f1f2ad1239162c08fb6a301b102485ee6181b9c - pukiwiki15 (git)

PukiWiki

Commit MetaInfo

• Revision: 9f1f2ad1239162c08fb6a301b102485ee6181b9c (tree)
• Zeit: 2016-02-03 02:03:30
• Autor: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

Merge branch 'bugtrack2374_record_page_author' into branch_r1_5

* Record '#author' line that shows text modified date and author
* Implement auth username prefix that shows its auth provider

• Default list: 'default:', 'ldap:' and 'external:'
  

* Recoard Full name of author, it is included on '#author' info
* backup list shows its authors
* Hide author info when user edit wiki text

Ändern Zusammenfassung

• modified: lib/auth.php
• modified: lib/backup.php
• modified: lib/file.php
• add: plugin/author.inc.php
• modified: plugin/backup.inc.php
• modified: plugin/edit.inc.php
• modified: pukiwiki.ini.php

Diff

--- a/lib/auth.php
+++ b/lib/auth.php
@@ -243,7 +243,8 @@ function basic_auth($page, $auth_flag, $exit_flag, $auth_pages, $title_cannot)
 function ensure_valid_auth_user()
 {
 	global $auth_type, $auth_users, $_msg_auth, $auth_user, $auth_groups;
-	global $auth_user_groups;
+	global $auth_user_groups, $auth_user_fullname;
+	global $auth_provider_user_prefix;
 	switch ($auth_type) {
 		case AUTH_TYPE_BASIC:
 		{
@@ -254,6 +255,7 @@ function ensure_valid_auth_user()
 						$_SERVER['PHP_AUTH_PW'],
 						$auth_users[$user]) === $auth_users[$user]) {
 						$auth_user = $user;
+						$auth_user_fullname = $auth_user;
 						$auth_user_groups = get_groups_from_username($user);
 						return true;
 					}
@@ -269,22 +271,37 @@ function ensure_valid_auth_user()
 		case AUTH_TYPE_EXTERNAL:
 		{
 			session_start();
-			// session_regenerate_id(true);
 			$user = '';
+			$fullname = '';
 			if (isset($_SESSION['authenticated_user'])) {
 				$user = $_SESSION['authenticated_user'];
+				if (isset($_SESSION['authenticated_user_fullname'])) {
+					$fullname = $_SESSION['authenticated_user_fullname'];
+				} else {
+					if ($auth_type === AUTH_TYPE_EXTERNAL && $ldap_user_account) {
+						$ldap_user_info = ldap_get_simple_user_info($user);
+						if ($ldap_user_info) {
+							$fullname = $ldap_user_info['fullname'];
+							$_SESSION['authenticated_user_fullname'] = $fullname;
+						}
+					}
+				}
 			}
 			$auth_user = $user;
+			$auth_user_fullname = $fullname;
 			break;
 		}
 		case AUTH_TYPE_EXTERNAL_REMOTE_USER:
 			$auth_user = $_SERVER['REMOTE_USER'];
+			$auth_user_fullname = $auth_user;
 			break;
 		case AUTH_TYPE_EXTERNAL_X_FORWARDED_USER:
 			$auth_user =  $_SERVER['HTTP_X_FORWARDED_USER'];
+			$auth_user_fullname = $auth_user;
 			break;
 		default: // AUTH_TYPE_NONE
 			$auth_user = '';
+			$auth_user_fullname = '';
 			break;
 	}
 	$auth_user_groups = get_groups_from_username($auth_user);
@@ -354,8 +371,10 @@ function form_auth($username, $password)
 			if (pkwk_hash_compute(
 				$password,
 				$auth_users[$user]) === $auth_users[$user]) {
-				$_SESSION['authenticated_user'] = $user;
+				session_start();
 				session_regenerate_id(true); // require: PHP5.1+
+				$_SESSION['authenticated_user'] = $user;
+				$_SESSION['authenticated_user_fullname'] = $user;
 				return true;
 			}
 		}
@@ -379,8 +398,9 @@ function ldap_auth($username, $password)
 				if ($ldap_bind_user) {
 					$user_info = get_ldap_user_info($ldapconn, $username, $ldap_base_dn);
 					if ($user_info) {
-						$_SESSION['authenticated_user'] = $user_info['uid'];
 						session_regenerate_id(true); // require: PHP5.1+
+						$_SESSION['authenticated_user'] = $user_info['uid'];
+						$_SESSION['authenticated_user_fullname'] = $user_info['fullname'];
 						return true;
 					}
 				}
@@ -392,8 +412,9 @@ function ldap_auth($username, $password)
 					if ($user_info) {
 						$ldap_bind_user2 = ldap_bind($ldapconn, $user_info['dn'], $password);
 						if ($ldap_bind_user2) {
-							$_SESSION['authenticated_user'] = $user_info['uid'];
 							session_regenerate_id(true); // require: PHP5.1+
+							$_SESSION['authenticated_user'] = $user_info['uid'];
+							$_SESSION['authenticated_user_fullname'] = $user_info['fullname'];
 							return true;
 						}
 					}
@@ -401,6 +422,30 @@ function ldap_auth($username, $password)
 			}
 		}
 	}
+	return false;
+}
+
+// Get LDAP user info via bind DN
+function ldap_get_simple_user_info($username)
+{
+	global $ldap_url, $ldap_bind_dn, $ldap_bind_password;
+	if (preg_match('#^(ldap\:\/\/[^/]+/)(.*)$#', $ldap_url, $m)) {
+		$ldap_server = $m[1];
+		$ldap_base_dn = $m[2];
+		$ldapconn = ldap_connect($ldap_server);
+		if ($ldapconn) {
+			ldap_set_option($ldapconn, LDAP_OPT_PROTOCOL_VERSION, 3);
+			// Bind by bind dn
+			$ldap_bind = ldap_bind($ldapconn, $ldap_bind_dn, $ldap_bind_password);
+			if ($ldap_bind) {
+				$user_info = get_ldap_user_info($ldapconn, $username, $ldap_base_dn);
+				if ($user_info) {
+					return $user_info;
+				}
+			}
+		}
+	}
+	return false;
 }
 
 /**

--- a/lib/backup.php
+++ b/lib/backup.php
@@ -13,7 +13,7 @@
  * @create
  * @version $Id: backup.php,v 1.13 2011/01/25 15:01:01 henoheno Exp $
  * Copyright (C)
- *   2002-2006 PukiWiki Developers Team
+ *   2002-2016 PukiWiki Development Team
  *   2001-2002 Originally written by yu-ji
  * License: GPL v2 or (at your option) any later version
  **/
@@ -33,6 +33,7 @@ function make_backup($page, $delete = FALSE)
 {
 	global $cycle, $maxage;
 	global $do_backup, $del_backup;
+	global $auth_user;
 
 	if (PKWK_READONLY || ! $do_backup) return;
 
@@ -44,7 +45,22 @@ function make_backup($page, $delete = FALSE)
 	if (! is_page($page)) return;
 
 	$lastmod = _backup_get_filetime($page);
-	if ($lastmod == 0 || UTIME - $lastmod > 60 * 60 * $cycle)
+	$backups = get_backup($page);
+	$is_author_differ = false;
+	$need_backup_by_time = $lastmod == 0 || UTIME - $lastmod > 60 * 60 * $cycle;
+	if (!$need_backup_by_time) {
+		// Backup file is saved recently, but the author may differ.
+		$last_content = get_source($page, FALSE, TRUE);
+		$m = array();
+		if (preg_match('/^\s*#author\("([^"]+)","([^"]+)","([^"]*)"\)/m', $last_content, $m)) {
+			$prev_author = $m[2];
+			$simple_author =preg_replace('/^[^:]:/', '', $prev_author);
+			if ($simple_author !== $auth_user) {
+				$is_author_differ = true;
+			}
+		}
+	}
+	if ($need_backup_by_time || $is_author_differ)
 	{
 		$backups = get_backup($page);
 		$count   = count($backups) + 1;
@@ -105,6 +121,11 @@ function get_backup($page, $age = 0)
 
 			// Allocate
 			$retvars[$_age] = array('time'=>$match[1], 'data'=>array());
+		} else if (preg_match('/^\s*#author\("([^"]+)","([^"]+)","([^"]*)"\)/', $line, $match)) {
+			$retvars[$_age]['author_datetime'] = $match[1];
+			$retvars[$_age]['author'] = $match[2];
+			$retvars[$_age]['author_fullname'] = $match[3];
+			$retvars[$_age]['data'][] = $line;
 		} else {
 			// The first ... the last line of the data
 			$retvars[$_age]['data'][] = $line;
@@ -306,4 +327,3 @@ else
 			array();
 	}
 }
-?>

--- a/lib/file.php
+++ b/lib/file.php
@@ -84,6 +84,7 @@ function page_write($page, $postdata, $notimestamp = FALSE)
 	if (PKWK_READONLY) return; // Do nothing
 
 	$postdata = make_str_rules($postdata);
+	$postdata = add_author_info(remove_author_info($postdata));
 
 	// Create and write diff
 	$oldpostdata = is_page($page) ? join('', get_source($page)) : '';
@@ -158,6 +159,50 @@ function make_str_rules($source)
 	return implode("\n", $lines);
 }
 
+function add_author_info($wikitext)
+{
+	global $auth_user, $auth_user_fullname, $auth_type, $ldap_user_account;
+	$author = preg_replace('/"/', '', $auth_user);
+	$displayname = preg_replace('/"/', '', $auth_user_fullname);
+	$user_prefix = '';
+	switch ($auth_type) {
+		case AUTH_TYPE_BASIC:
+			$user_prefix = AUTH_PROVIDER_USER_PREFIX_DEFAULT;
+			break;
+		case AUTH_TYPE_EXTERNAL:
+		case AUTH_TYPE_EXTERNAL_REMOTE_USER:
+		case AUTH_TYPE_EXTERNAL_X_FORWARDED_USER:
+			$user_prefix = AUTH_PROVIDER_USER_PREFIX_EXTERNAL;
+			break;
+		case AUTH_TYPE_FORM:
+			if ($ldap_user_account) {
+				$user_prefix = AUTH_PROVIDER_USER_PREFIX_LDAP;
+			} else {
+				$user_prefix = AUTH_PROVIDER_USER_PREFIX_DEFAULT;
+			}
+			break;
+	}
+	$author_text = sprintf('#author("%s","%s","%s")',
+		get_date_atom(UTIME + LOCALZONE),
+		($author ? $user_prefix . $author : ''),
+		$displayname) . "\n";
+	return $author_text . $wikitext;
+}
+
+function remove_author_info($wikitext)
+{
+	return preg_replace('/^\s*#author\([^\n]*(\n|$)/m', '', $wikitext);
+}
+
+function get_date_atom($timestamp)
+{
+	// Compatible with DATE_ATOM format
+	// return date(DATE_ATOM, $timestamp);
+	$zmin = abs(LOCALZONE / 60);
+	return date('Y-m-d\TH:i:s', $timestamp) . sprintf('%s%02d:%02d',
+		(LOCALZONE < 0 ? '-' : '+') , $zmin / 60, $zmin % 60);
+}
+
 // Generate ID
 function generate_fixed_heading_anchor_id($seed)
 {

--- /dev/null
+++ b/plugin/author.inc.php
@@ -0,0 +1,9 @@
+<?php
+// PukiWiki - Yet another WikiWikiWeb clone.
+// author.inc.php
+// Copyright: 2016 PukiWiki Development Team
+// License: GPL v2 or (at your option) any later version
+//
+// author plugin
+
+function plugin_author_convert() { return ''; }

--- a/plugin/backup.inc.php
+++ b/plugin/backup.inc.php
@@ -1,8 +1,8 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: backup.inc.php,v 1.29 2011/01/25 15:01:01 henoheno Exp $
+// backup.inc.php
 // Copyright (C)
-//   2002-2005 PukiWiki Developers Team
+//   2002-2016 PukiWiki Development Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -218,12 +218,17 @@ EOD;
 			$_anchor_to   = '</a>';
 		}
 		$date = format_date($data['time'], TRUE);
+		$author_info = '';
+		if (isset($data['author'])) {
+			$author_info = htmlsc('by ' . $data['author_fullname']
+				. '(' . $data['author'] . ')');
+		}
 		$retval[1] .= <<<EOD
    <li>$_anchor_from$age $date$_anchor_to
      [ <a href="$href$age&amp;action=diff">$_msg_diff</a>
      | <a href="$href$age&amp;action=nowdiff">$_msg_nowdiff</a>
      | <a href="$href$age&amp;action=source">$_msg_source</a>
-     ]
+     ] $author_info
    </li>
 EOD;
 	}
@@ -244,4 +249,3 @@ function plugin_backup_get_list_all($withfilename = FALSE)
 		return page_list($pages, 'backup', $withfilename);
 	}
 }
-?>

--- a/plugin/edit.inc.php
+++ b/plugin/edit.inc.php
@@ -29,7 +29,7 @@ function plugin_edit_action()
 
 	$postdata = @join('', get_source($page));
 	if ($postdata == '') $postdata = auto_template($page);
-
+	$postdata = remove_author_info($postdata);
 	return array('msg'=>$_title_edit, 'body'=>edit_form($page, $postdata));
 }
 

--- a/pukiwiki.ini.php
+++ b/pukiwiki.ini.php
@@ -282,6 +282,12 @@ $ldap_user_account = 0;
 // $ldap_bind_password = '';
 
 /////////////////////////////////////////////////
+// User prefix that shows its auth provider
+define('AUTH_PROVIDER_USER_PREFIX_DEFAULT', 'default:');
+define('AUTH_PROVIDER_USER_PREFIX_LDAP', 'ldap:');
+define('AUTH_PROVIDER_USER_PREFIX_EXTERNAL', 'external:');
+
+/////////////////////////////////////////////////
 // $whatsnew: Max number of RecentChanges
 $maxshow = 60;