From 9f825ed647d48ac155badc9a2ec863455f2e371e Mon Sep 17 00:00:00 2001
From: Simon DELAGE <simon.geekitude@gmail.com>
Date: Sat, 6 Sep 2014 10:16:04 +0200
Subject: [PATCH] Improved helper

Can now provide different types of link to private namespace or public
page
---
 helper.php       |  54 +++++++++++++++++++++++++++--------------------
 images/ns.png    | Bin 0 -> 792 bytes
 images/user.png  | Bin 0 -> 742 bytes
 lang/en/lang.php |   2 ++
 style.css        |   7 ++++++
 5 files changed, 40 insertions(+), 23 deletions(-)
 create mode 100644 images/ns.png
 create mode 100644 images/user.png
 create mode 100644 style.css

diff --git a/helper.php b/helper.php
index 03caa52..30c02a8 100644
--- a/helper.php
+++ b/helper.php
@@ -11,23 +11,47 @@ if(!defined('DOKU_INC')) die();
 
 class helper_plugin_userhomepage extends DokuWiki_Plugin {
 
-    function getPrivateNs() {
+    function getPrivateID() {
         if ($this->getConf('group_by_name')) {
-            // private:s:simon
+            // private:s:simon or private:s:simon_delage
             $this->private_ns = cleanID($this->getConf('users_namespace').':'.strtolower(substr($this->privateNamespace(), 0, 1)).':'. $this->privateNamespace());
         } else {
-            // private:simon
+            // private:simon or private:simon_delage
             $this->private_ns = cleanID($this->getConf('users_namespace').':'. $this->privateNamespace());
         }
-        // private:simon:start.txt
-        return $this->private_page = cleanID($this->private_ns . ':' . $this->privatePage());
+        // ...:start.txt
+        return $this->private_page = cleanID($this->private_ns.':'.$this->privateStart());
 
     }
 
-    function getPublicPage() {
+    function getPublicID() {
         return $this->public_page = cleanID($this->getConf('public_pages_ns').':'. $_SERVER['REMOTE_USER']);
     }
 
+    function getPrivateLink($param=null) {
+        global $INFO;
+        global $lang;
+        if ($param == "loggedinas") {
+			return '<li>'.$lang['loggedinas'].' : <a href="'.wl($this->getPrivateID()).'"  class="uhp_private" rel="nofollow" title="'.$this->getLang('privatenamespace').'">'.$INFO['userinfo']['name'].' ('.$_SERVER['REMOTE_USER'].')</a></li>';
+		} elseif ($param != null) {
+			return '<a href="'.wl($this->getPrivateID()).'"  rel="nofollow" title="'.$this->getLang('privatenamespace').'">'.$param.'</a>';
+		} else {
+			return '<a href="'.wl($this->getPrivateID()).'"  rel="nofollow" title="'.$this->getLang('privatenamespace').'">'.$this->getLang('privatenamespace').'</a>';
+		}
+    }
+
+    function getPublicLink($param=null) {
+        global $INFO;
+        global $lang;
+        if ($param == "loggedinas") {
+			return '<li>'.$lang['loggedinas'].' : <a href="'.wl($this->getPublicID()).'"  class="uhp_public" rel="nofollow" title="'.$this->getLang('publicpage').'">'.$INFO['userinfo']['name'].' ('.$_SERVER['REMOTE_USER'].')</a></li>';
+		} elseif ($param != null) {
+			return '<a href="'.wl($this->getPublicID()).'"  rel="nofollow" title="'.$this->getLang('publicpage').'">'.$param.'</a>';
+		} else {
+			return '<a href="'.wl($this->getPublicID()).'"  rel="nofollow" title="'.$this->getLang('publicpage').'">'.$this->getLang('publicpage').'</a>';
+		}
+    }
+
     function privateNamespace() {
         if ( $this->getConf('use_name_string')) {
             global $INFO;
@@ -40,7 +64,7 @@ class helper_plugin_userhomepage extends DokuWiki_Plugin {
         }
     }
 
-    function privatePage() {
+    function privateStart() {
         if ( $this->getConf('use_start_page')) {
             global $conf;
             return $conf['start'];
@@ -49,20 +73,4 @@ class helper_plugin_userhomepage extends DokuWiki_Plugin {
         }
     }
 
-//    //draws a home button, used by calls from main.php in template folder
-//    function homeButton() {
-//        $this->init();
-//        if ($_SERVER['REMOTE_USER']!=null) {
-//            echo '<form class="button btn_show" method="post" action="doku.php?id='.$this->private_page.'"><input class="button" type="submit" value="Home"/></form>';
-//        }
-//    }
-//    //draws a home link, used by calls from main.php in template folder
-//    function privateLink() {
-//        $this->init();
-//        if ($_SERVER['REMOTE_USER']!=null) {
-//            echo '<li>'.$lang['loggedinas'].' : <a href="'.wl($privatens).'"  class="iw_user" rel="nofollow" title="Private NS">'.$INFO['userinfo']['name'].' ('.$_SERVER['REMOTE_USER'].')</a></li>';
-//            echo '<a href="doku.php?id='.$this->private_page.'">Home</a>';
-//        }
-//    }
-
 }
diff --git a/images/ns.png b/images/ns.png
new file mode 100644
index 0000000000000000000000000000000000000000..37c04c71e79e6a991eeb5d5fad364af00886d1d4
GIT binary patch
literal 792
zcmV+z1LypSP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U$W<6c!R}^yB~l0;Ner
zK~yNuJ<?BX6lEO7@$bB|yR*C9S<+T*w?Hcz0ihB+REe6P7!8pGl(Qa<1PtNk)eub(
z!-1G^Fd=%-gHbLLEr}#1RUsbaPXhh3q===I-KC|wGrK!GGw<(xJydzl&*$>wajKIC
zFvhTT-+2J8e^Vh>-ubjr-bpLsOA;NeUbr~>&RGDMKDU=R3~~4`H-8v$tTVbH*EjZ_
za`PVzJo#2RZQrN4IMvm?=<}#m`&uMec=3aI1FXTB^KTA0PJXZFZ#>rb#Kg|WHXp#z
zG0Qi<!yg=GdEp9S<JOI+SwEe09{jxPXm!b%o7}(OYJIr8e$VU0$0st%>qjRcI=Id1
z%sIxkzXHl9PK0J{#<Z5^e@)trGfs8#;L^x*?^m!{;_xof>H^*7A`kD~VcQ$WD3(gl
zxq~t-aLaU>x0(Ipr@FG1a$jYFe4#+jhWK8}@bCab{fc5SkLze$m0(t{5mdiLc|KNb
zDPzS5VsP_=lty-utXxH!(-iX=XitL#bnpE_M}v^Zi3KZ0GFHsmtTqMZkQ;awlgXib
z%jm@)38aJ0`bexXQ4dp2v7%8{M4?=;0@4KuQTYM<$~c{@Lz*cd-5A~Opd-O(!D^$F
z5uHY@e?WPlT#z2<0CIzfSWGuYhcOtR?7DG!tu97HyNBK$YlQW=N*cA+d!-TFVtEbf
zHeu}=CeGrOcVM$)1S<{df8V$wX>h^;`16aWp2-x34i?sp9_iok{Knz&-H^6foxgxh
zJy!1432L*oZmV%dCl9~h^U2EWqsv`BHJY*3-QtxhA37>~XwysY(yiU%{@iuqVBxDI
zYMur?{o3&dDFA<c`NIE}t7mruaOvdMmoJ~%aq-e;+opd1bn~kKzkR&rQE%$_CjJF?
WTvSUvD7CWy0000<MNUMnLSTY`o_UG@

literal 0
HcmV?d00001

diff --git a/images/user.png b/images/user.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a3a305586345db92a151623624b183e217d5ff1
GIT binary patch
literal 742
zcmV<C0vY{@P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U$T;3Le@+?B@Ug0&_`3
zK~yNuZIDe!6k!<0|L@E@`{_r!tDB#dS)fT6VIQyui$o|T^pKzxf*q=rz`9szbO@;q
z)j^WVK*-F@E<sR6T1W>eTPw)Q(#<ZK?b_<@&g{&-Gj9hIR_cN0_WM2jcnIeliPN|}
z{an7wXck4ouIU_MO^~M+=(W3}bFGOSNfeKjxSETz`9;Y_hyg&0b3_yaa}mxbLehoD
z?*r$TSt0StmJI!p)ketgMIG~D9g!Gd2qsXG5{JZ^64@1ED6Av1)Qh?kE!bV%fSD*o
zFh(KMRj^qEYxkM`=4F;9ifQXy^QF~?o!aCOaw)};<6fjB*^s)a3<H;Il%j%M{$Eki
z?Vpq%Z#~SM28W%&k)DMJ6M^{&gf-jO&Gpx{e^N6l?@8^`yQT)ZuObBtAk+dv%}5e8
zyzIS#_HUkPclmAWim$pW?wbumZ?Gbx<LRxP_;|Ap97|OM1X%}rP}}qdGV?bP#5)6n
zM`hyL+eb7V^-fcE*OMDt;e!>v5THZ>O#zq;<k^98w}RSJV+cgQc&Vs%itCH_RTWrf
zde5FdfX{Ig#)2H`BEX_R{O`^NID*WClENJ5lg}zd%KXIFTEKF4REZCMc`%w;36TQ^
z<6s)VR6tWX;wnK@CMXpK(O5W)iRb-sK_o<=W*c6O1h9e1h{=E|1Dd>)Do6qZ3&FNL
z6(eJ_5U2!EBvcSKmbLg_bTeywhCS+e4O23Q#R1q?1F5+{lAFVk#qqFn0QshI*+1N`
zT8s9y5zaZj_j!}MK4hEjj2E}@P_ROjY)%kCg2BOc#tasVNKV(g%C){jCp|xvH8maK
YKel}hL}enro&W#<07*qoM6N<$f|<Zd7ytkO

literal 0
HcmV?d00001

diff --git a/lang/en/lang.php b/lang/en/lang.php
index 7fc1def..93778c1 100644
--- a/lang/en/lang.php
+++ b/lang/en/lang.php
@@ -6,3 +6,5 @@
  */
 
 $lang['created'] = 'Created from template by Userhompage plugin';
+$lang['privatenamespace'] = 'Private Namespace';
+$lang['publicpage'] = 'Public Page';
diff --git a/style.css b/style.css
new file mode 100644
index 0000000..1e7ae9a
--- /dev/null
+++ b/style.css
@@ -0,0 +1,7 @@
+/********************************************************************
+Screen Styles for the Userhomepage Plugin (additional to all.css)
+********************************************************************/
+
+a.uhp_private,a.uhp_public { padding-left:19px; }
+a.uhp_private { background:url(images/ns.png) no-repeat left; }
+a.uhp_public { background:url(images/user.png) no-repeat left; }