Fixes a bug in the statistics link in ManageCrawls, a=chris
Fixes a bug in the statistics link in ManageCrawls, a=chris
diff --git a/src/controllers/StatisticsController.php b/src/controllers/StatisticsController.php
index 256ccec0f..bd0932318 100644
--- a/src/controllers/StatisticsController.php
+++ b/src/controllers/StatisticsController.php
@@ -89,9 +89,11 @@ class StatisticsController extends Controller implements CrawlConstants
if (isset($_SESSION['USER_ID'])) {
$user_id = $_SESSION['USER_ID'];
$token_okay = $this->checkCSRFToken(C\CSRF_TOKEN, $user_id);
+ $is_admin = true;
if ($token_okay === false) {
unset($_SESSION['USER_ID']);
$user = $_SERVER['REMOTE_ADDR'];
+ $is_admin = false;
}
} else {
$user_id = $_SERVER['REMOTE_ADDR'];
@@ -102,7 +104,7 @@ class StatisticsController extends Controller implements CrawlConstants
$this->clean($_REQUEST['its'], "string"), 0, C\TIMESTAMP_LEN);
//validate timestamp against list
//(some crawlers replay deleted crawls)
- $crawls = $this->model("crawl")->getCrawlList(false,true,
+ $crawls = $this->model("crawl")->getCrawlList(false, true,
$this->machine_urls, true);
$found_crawl = false;
foreach ($crawls as $crawl) {
@@ -165,6 +167,9 @@ class StatisticsController extends Controller implements CrawlConstants
exit(); //bail
}
$data[C\CSRF_TOKEN] = $this->generateCSRFToken($user_id);
+ if ($is_admin) {
+ $data['ADMIN'] = true;
+ }
$data["its"] = $this->index_time_stamp;
$this->view("statistics")->head_objects["robots"] = "NOINDEX, NOFOLLOW";
$this->displayView($view, $data);
diff --git a/src/views/CrawlstatusView.php b/src/views/CrawlstatusView.php
index f2816abbb..e8506c9b6 100755
--- a/src/views/CrawlstatusView.php
+++ b/src/views/CrawlstatusView.php
@@ -222,7 +222,7 @@ class CrawlstatusView extends View
?>
<tr><td><b><?php e($description); ?></b><br />
[<a href="<?= $statistics_url .
- C\CSRF_TOKEN."=". $data[C\CSRF_TOKEN] ?>its=<?=
+ C\CSRF_TOKEN."=". $data[C\CSRF_TOKEN] ?>&its=<?=
$crawl['CRAWL_TIME'] ?>"><?=
tl('crawlstatus_view_statistics') ?></a>]</td><?php
if (!C\MOBILE) { ?>