diff options
| author | Ben Coburn <btcoburn@silicodon.net> | 2006-12-07 04:28:25 +0100 |
|---|---|---|
| committer | Ben Coburn <btcoburn@silicodon.net> | 2006-12-07 04:28:25 +0100 |
| commit | 5aa52fafe8be8e728c0d2c9ff12c999e80766127 (patch) | |
| tree | 7a7de279d3cc45d91154bbcf01701bbc1c933706 /inc/changelog.php | |
| parent | cd00a03445c6b5dcdaba4631150c3c7e1370f526 (diff) | |
| download | rpg-5aa52fafe8be8e728c0d2c9ff12c999e80766127.tar.gz rpg-5aa52fafe8be8e728c0d2c9ff12c999e80766127.tar.bz2 | |
identify external edits in UI
Some changes to clearly identify when wiki pages have been edited outside
Dokuwiki. Also correctly attributes external changes from an unknown
author. Avoids sending extra emails when recording old external edits.
Adds a new language string:
$lang['external_edit']
darcs-hash:20061207032825-05dcb-3234bee57cb165c848b33abb9251502589b0f3cb.gz
Diffstat (limited to 'inc/changelog.php')
| -rw-r--r-- | inc/changelog.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/inc/changelog.php b/inc/changelog.php index 85de8e2aa..43d18f148 100644 --- a/inc/changelog.php +++ b/inc/changelog.php @@ -33,9 +33,13 @@ function parseChangelogLine($line) { * @author Esther Brunner <wikidesign@gmail.com> * @author Ben Coburn <btcoburn@silicodon.net> */ -function addLogEntry($date, $id, $type='E', $summary='', $extra=''){ +function addLogEntry($date, $id, $type='E', $summary='', $extra='', $flags=null){ global $conf, $INFO; + // check for special flags as keys + if (!is_array($flags)) { $flags = array(); } + $flagExternalEdit = isset($flags['ExternalEdit']); + $id = cleanid($id); $file = wikiFN($id); $created = @filectime($file); @@ -43,8 +47,8 @@ function addLogEntry($date, $id, $type='E', $summary='', $extra=''){ $wasRemoved = ($type==='D'); if(!$date) $date = time(); //use current time if none supplied - $remote = $_SERVER['REMOTE_ADDR']; - $user = $_SERVER['REMOTE_USER']; + $remote = (!$flagExternalEdit)?$_SERVER['REMOTE_ADDR']:'127.0.0.1'; + $user = (!$flagExternalEdit)?$_SERVER['REMOTE_USER']:''; $strip = array("\t", "\n"); $logline = array( |