quenousimporte
/
bbn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: quenousimporte:4a3061fccde9c625dcc96e8768afbbb31eceaaf1
Branches Tags
quenousimporte:master
...
compare: quenousimporte:020545feb3f3d8ce9efd5ec69b59020a5318dcf3
Branches Tags
quenousimporte:master

2 Commits
4a3061fccd ... 020545feb3

Author SHA1 Message Date
quenousimporte 020545feb3 add conflict management 2024-03-15 15:11:51 +01:00
quenousimporte ce1867bcf0 attempt to fix empty screen when session lost 2024-03-15 15:11:26 +01:00
2 changed files with 21 additions and 3 deletions
Show Stats Expand all files Collapse all files

23
index.php
View File

@ -10,12 +10,13 @@
</head> </head>
<body> <body>
<?php <?php
error_reporting(E_ALL);
require 'settings.php'; require 'settings.php';
if ($password && (!isset($_SERVER['PHP_AUTH_PW']) || $_SERVER['PHP_AUTH_PW'] != $password)) { if ($password && (!isset($_SERVER['PHP_AUTH_PW']) || $_SERVER['PHP_AUTH_PW'] != $password)) {
header('WWW-Authenticate: Basic realm="bbn"'); header('WWW-Authenticate: Basic realm="bbn"');
header('HTTP/1.0 401 Unauthorized'); header('HTTP/1.0 401 Unauthorized');
echo '<p>Access denied.</p>'; echo '<p>Access denied.</p></body></html>';
exit; exit;
} }
@ -34,9 +35,23 @@
function savenote($title, $content) function savenote($title, $content)
{ {
global $dir; global $dir;
file_put_contents($dir . '/' . $title, $content); $path = $dir . '/' . $title;
$lastchanged = filemtime($path);
$previous = $_POST['lastchanged'];
if ( (int)$lastchanged > (int)$previous)
{
$tempcontent = file_get_contents($path);
if ($tempcontent != $content)
{
$temptitle = $title . '_' . $lastchanged;
file_put_contents($dir . '/' . $temptitle, $tempcontent);
array_unshift($_SESSION['index'], $dir . '/' . $temptitle);
echo '<div class="grey">Conflict detected. See backup: ' . $temptitle . '</div>';
}
}
file_put_contents($path, $content);
removefromindex($title); removefromindex($title);
array_unshift($_SESSION['index'], $dir . '/' . $title); array_unshift($_SESSION['index'], $path);
} }
function linksdiv($content) function linksdiv($content)
@ -137,6 +152,8 @@
$content = file_get_contents($dir . '/' . $title); $content = file_get_contents($dir . '/' . $title);
} }
clearstatcache();
$lastchanged = filemtime($dir . '/' . $title);
$lines = substr_count($content, "\r\n"); $lines = substr_count($content, "\r\n");
$words = substr_count($content, " ") + $lines; $words = substr_count($content, " ") + $lines;
$chars = strlen($content); $chars = strlen($content);

1
note.php
View File

@ -6,6 +6,7 @@
<input type="submit" name="links" value="links" accesskey="l"> <input type="submit" name="links" value="links" accesskey="l">
<input type="submit" name="stats" value="stats" accesskey="i"> <input type="submit" name="stats" value="stats" accesskey="i">
<input type="submit" name="delete" value="delete" accesskey="d"> <input type="submit" name="delete" value="delete" accesskey="d">
<input hidden name="lastchanged" value="<? echo $lastchanged; ?>">
<?php <?php
if (isset($_POST['stats'])) if (isset($_POST['stats']))
{ {