From 3c94d07beba64154ecd707805fa87f2eaf5e4d02 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 26 Jan 2013 16:53:23 +0000
Subject: store choices for recent changes and diff views in cookie (FS#2438
 and FS#2700)

Note: These changes don't work yet. The cookie is not set and deletes the old
one.
---
 inc/template.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index 4af35cc2b..aa0fd5c00 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -124,7 +124,11 @@ function tpl_content_core() {
             html_diff();
             break;
         case 'recent':
-            html_recent($INPUT->extract('first')->int('first'), $INPUT->str('show_changes'));
+            $show_changes = $INPUT->str('show_changes');
+            if (empty($show_changes)) {
+                $show_changes = get_doku_pref('show_changes', $show_changes);
+            }
+            html_recent($INPUT->extract('first')->int('first'), $show_changes);
             break;
         case 'index':
             html_index($IDX); #FIXME can this be pulled from globals? is it sanitized correctly?
-- 
cgit v1.2.3


From d08527ab16aedc53a592c024ec7da7b7150ad78e Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 27 Jan 2013 22:59:02 +0000
Subject: open fullscreen media manager in current namespace (FS#2420)

---
 inc/template.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index 4af35cc2b..a8960fcc4 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -703,6 +703,7 @@ function tpl_get_action($type) {
             }
             break;
         case 'media':
+            $params['ns'] = getNS($ID);
             break;
         default:
             return '[unknown %s type]';
-- 
cgit v1.2.3


From fca4df27d2d1c92086bd70be4407a732ef4aadc2 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 3 Feb 2013 17:29:49 +0000
Subject: added 'home' class to first link in hierarchical breadcrumbs

---
 inc/template.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index a8960fcc4..2c083c964 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -840,7 +840,9 @@ function tpl_youarehere($sep = ' » ') {
     echo '<span class="bchead">'.$lang['youarehere'].': </span>';
 
     // always print the startpage
+    echo '<span class="home">';
     tpl_pagelink(':'.$conf['start']);
+    echo '</span>';
 
     // print intermediate namespace links
     $part = '';
-- 
cgit v1.2.3


From 7a4d121f8568b0aee5f0e117737f3675dcc85100 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Mon, 18 Feb 2013 18:51:01 +0000
Subject: change tpl_actiondropdown request method to 'get'

---
 inc/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index a5bcabf1e..e9c0f1699 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1373,7 +1373,7 @@ function tpl_actiondropdown($empty = '', $button = '&gt;') {
     global $REV;
     global $lang;
 
-    echo '<form action="'.DOKU_SCRIPT.'" method="post" accept-charset="utf-8">';
+    echo '<form action="'.DOKU_SCRIPT.'" method="get" accept-charset="utf-8">';
     echo '<div class="no">';
     echo '<input type="hidden" name="id" value="'.$ID.'" />';
     if($REV) echo '<input type="hidden" name="rev" value="'.$REV.'" />';
-- 
cgit v1.2.3


From a02e0d0ea02e11f105aeb3b9cc4dabdd5a1bc217 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Mon, 18 Feb 2013 18:55:33 +0000
Subject: remove security token from tpl_actiondropdown - its not necessary,
 we're not posting any system change

---
 inc/template.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index e9c0f1699..1734b08a0 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1377,7 +1377,6 @@ function tpl_actiondropdown($empty = '', $button = '&gt;') {
     echo '<div class="no">';
     echo '<input type="hidden" name="id" value="'.$ID.'" />';
     if($REV) echo '<input type="hidden" name="rev" value="'.$REV.'" />';
-    echo '<input type="hidden" name="sectok" value="'.getSecurityToken().'" />';
 
     echo '<select name="do" class="edit quickselect" title="'.$lang['tools'].'">';
     echo '<option value="">'.$empty.'</option>';
-- 
cgit v1.2.3


From 61efcda114414f2c35c1993c75bc95909282017f Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Tue, 19 Feb 2013 00:13:25 +0000
Subject: add security token back, but not for anonymous users

---
 inc/template.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index 1734b08a0..4bfc3f572 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1377,6 +1377,9 @@ function tpl_actiondropdown($empty = '', $button = '&gt;') {
     echo '<div class="no">';
     echo '<input type="hidden" name="id" value="'.$ID.'" />';
     if($REV) echo '<input type="hidden" name="rev" value="'.$REV.'" />';
+    if ($_SERVER['REMOTE_USER']) {
+        echo '<input type="hidden" name="sectok" value="'.getSecurityToken().'" />';
+    }
 
     echo '<select name="do" class="edit quickselect" title="'.$lang['tools'].'">';
     echo '<option value="">'.$empty.'</option>';
-- 
cgit v1.2.3


From 64276bbca5e40e5c6e93b98e76bb84b33db4643b Mon Sep 17 00:00:00 2001
From: arbrk1 <arbrk1@gmail.com>
Date: Wed, 20 Feb 2013 22:26:45 +0400
Subject: Update inc/template.php

changed nonexistant actionOk to actionOK
---
 inc/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index a5bcabf1e..e52158a53 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -764,7 +764,7 @@ function tpl_searchform($ajax = true, $autocomplete = true) {
     global $QUERY;
 
     // don't print the search form if search action has been disabled
-    if(!actionOk('search')) return false;
+    if(!actionOK('search')) return false;
 
     print '<form action="'.wl().'" accept-charset="utf-8" class="search" id="dw__search" method="get"><div class="no">';
     print '<input type="hidden" name="do" value="search" />';
-- 
cgit v1.2.3


From e63eccff3ef8998a3dac6034132970be5dad0069 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 3 May 2013 12:11:34 +0200
Subject: use correct endpoint in tpl_actiondropdown FS#2760

---
 inc/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/template.php')

diff --git a/inc/template.php b/inc/template.php
index 415b56de7..a87650b84 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1373,7 +1373,7 @@ function tpl_actiondropdown($empty = '', $button = '&gt;') {
     global $REV;
     global $lang;
 
-    echo '<form action="'.DOKU_SCRIPT.'" method="get" accept-charset="utf-8">';
+    echo '<form action="'.script().'" method="get" accept-charset="utf-8">';
     echo '<div class="no">';
     echo '<input type="hidden" name="id" value="'.$ID.'" />';
     if($REV) echo '<input type="hidden" name="rev" value="'.$REV.'" />';
-- 
cgit v1.2.3