From d7cfbf03d424fe6bc907987e723930d25bfb13da Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Thu, 8 Nov 2012 13:08:21 +0100
Subject: [PATCH] Fixes: #1479 plSection should only be set in plInfo of plugin
that must appear in the menu
---
contrib/fusiondirectory.conf | 6 ------
html/plugins/config/images/plugin.png | Bin 0 -> 4804 bytes
include/class_config.inc | 10 ++++++++++
plugins/config/class_configInLdap.inc | 2 ++
plugins/personal/password/class_password.inc | 19 +++++++++----------
5 files changed, 21 insertions(+), 16 deletions(-)
create mode 100644 html/plugins/config/images/plugin.png
diff --git a/contrib/fusiondirectory.conf b/contrib/fusiondirectory.conf
index c33665d28..040a9c4e6 100644
--- a/contrib/fusiondirectory.conf
+++ b/contrib/fusiondirectory.conf
@@ -40,15 +40,9 @@
<!-- Section to enable addon plugins -->
<section name="Addons">
- <plugin acl="configuration" class="configInLdap" />
- <plugin acl="board" class="board" />
- <plugin acl="server/serviceSyslog" class="rsyslog" />
- <plugin acl="addressbook" class="addressbook" />
<!-- <plugin acl="mailqueue" class="mailqueue" /> -->
<plugin acl="faxreport/faxreport:self,faxreport" class="faxreport" />
<plugin acl="fonreport/fonreport:self,fonreport" class="fonreport" />
- <plugin acl="gotomasses" class="gotomasses" />
- <plugin acl="ldapmanager" class="ldif" />
</section>
<!-- Section to enable quick self service shortcuts for the logged in user -->
diff --git a/html/plugins/config/images/plugin.png b/html/plugins/config/images/plugin.png
new file mode 100644
index 0000000000000000000000000000000000000000..b636ff0e63d6eafa5864387d44848a632cf7561c
GIT binary patch
literal 4804
zcmV;#5<BgQP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000t;Nkl<Zc$~$W
zX^dsZb(p_%s_uR7b@%J;>7MTC=~<iW47VYN6h%o?Ac&Ie2r?`sa;zZ8A_2*d1Q3!R
z`4Qwtf&fa82>BHxfPPp&qS!$U+mRECu_eW{V#yLgQsm4~!&ykqaQ5!$eR=)fy|>QE
zkNbKXQV@(FaRCQ)?z>gzRMlDQ+$Zd66Hol@Pd4{G@T(IKefGp)!-m{l>NmpwzvkPR
z2y}YBdH3Bvy|Q`t+#f8Q|F17v)h%|97Jz}tCx(xI;-7!>!>6D4D=$1XB8Mj;d8W7v
zsyL3gZVh*@NpJP=KHNXxclmkacRxE~I3NhPyH}OV+)~B=dVPf-zIy&Am%j7&|88&f
z`kUJu&}>LfeBnR+?%(<RhraNsr`q0#n{G*@%b=@BpA;@TQjq>JZS^}l>$A>7>6th#
zh&f)SNHP_Xz2omWNUzV|Yuv#d5ejd}CPpT&Tr&B0zkTMNGr#${PrH>@0K)!9fBmoi
z@@K#F&%W^dJ|B#$GBV&YKHBuP^-Zm$DK5C6>WI|f?x^ncBIdY=>u|Ft2ZjsZHz?X3
z4AO3iw_E5)tCBnxUL?`VR7~9YK$=^URdo<|^T~mA9cUo!0eqklCCTX6g&P~~jXSUY
zZ=kCOPyfBY@rfsg=$7tgiL$I%T3W&^kz8<Bl0l*mrhEFzK_xNO-e9~f#27ILGsE5L
z9$~PVad5bxoo`|;RD1x<E!?4UA-Pjl1>Ma}dfhI)GVzyAwHdqrQ=b7&e&s7)mN+^*
zcyhQEyfS2QbI{6iiDXDOYa0#@0&b*j%My|sBH{^)S}`@aA<aCus;Y=tF0EF}$|Q6P
zmytoSURlxYbR-0|@u5UoU6-YzZQB~PMRN;xH+R8^a(AO)4O^igN;fqu&qNMSAKrH%
z3_O7ITFe5ufm8{z*wivjBS9><s5rQ}p{hIfW(KP6X5#30W0fpxSW%Wb)E;4Re$K96
zyQ*VTC%87-v*#Wi)DQyAJhSDMHN|0UAlXLQ)lF;Frrf8wP2W^q98Ydt8P$#qW63SK
zsV1k@3<0MNM0KD_P#L5I$-&%7E|goUW4j>LB2G!k=+MfbEDM^gL7I7FdU~3hH*YbR
z_jvNbCT6vUiwMKRLsTh&D8q5B&!<mwn}_c3+~)11s$O52wyj?QQFkbkds(@Z$*oLS
znMBHDmJBORq%gB;3%r(AWk^dp24cyP;lZZ4ySclZJbBX2oqfX^SrFT45>;$)aL9_H
zkY+R!>seV*(=@Cyv%*YDGb^lKN0rQ~Bvz)a^?B{>`b`}uE0>~jFOzExc$q}YgqF!Y
zCDn2p%(s5eyrWfF>QJlU-+g6Wuih?Hz>gk1s>{pEIyX1x+HXO{zxV2f-dRN5%mJ0u
z>GRm4shSdAB+-=6VtXB?rMZ`tX|HtIy@7~3MdgS(CPo0%1dWckAfm`Fmu(12tzvjZ
zStUY@%uGi{+5rbrN<91Qvn(tuFflQ~){)H|jEuG;-8HCE!cwB_$35-yuzujdjbwm1
zRT5H_uu8CG*sdK!cPI*XQ5O}p3_*j5reKl;5f`-YA^L6t+{{(VqBIR9Rh8tvgDrE1
ze)?f!V`Geuk4s8vYp&dPFgHZFwp2+~l~z=NLLAxhbX)Yz%|yVGSaP!jsS>HG$}HU@
z0T(DL7fQD%NfSbJHFZ}MRNOr6@<L)(2R64(ku+o#8yg*Kw}%wK-K}q6045@J2zEC_
zw5lpPosJ2nn`M(i0nG3|52-zpxRXrGD%8y=D>o}pOOEZ{fSJ=P9fDyJP;)GEf`h0d
zXx~!$>vzG$DHFWcarUp?;?m_SeEQQbpknMkogJA8s!9lfg~e5hqM)ow*3%(Mcf@3e
zhY5(|Zn%M&lPagI97|3r9ow~oxW1YA<Dahh6A!gzdQvUc{#VQ~QAL6a2`dvUZx{<}
zNtQcqYnv|FX0Ydn-zIM~<+Y!_Vb4DE6z)m-Qh++gF|Tz?mRCD==FDqM>>ro;HMLG`
z;^u%0N%qb`ph{v1OXgHXlB#k`W!kGk0^GP;$o$5d4UhD6a;(ANV6;4s>NvS<SWzVH
zmPRKv>3Pe7qV8s8V@BUzxxgb69lP+>IdylQKK-P{pz7|pyQ!*zaCdRp{`mXfS4#!&
zUAbbb2S2YPBTy%8Vu)!|dIWWIM|&yKOVQk1t#Yb_Rb|pt_Eo5#TgELB2NlZ7xw~pC
zbrZ+hb38Xa&(ZxtGY_~s%NvO^x0<}UdW0TLM2xGAPtctE9~>Kp3vZp{%6nIN?8HMH
zI50_`=PWNT^Y+#2T)*-TSr+N6Z*aDEipA?K4zE|tOa#W_D))`7Fg7S;QE_)Vy~KM<
zIagOk=#_y~IaNWeO1r(#Hs*Z?gYnUcclp%g0nsLoFgiR)w^t&v$!8u_9+|tqf4_2^
zRU5;#!CQ@Ap*Qy(4iB!QI6wXAtJ@J+RZvj`<L<&Tmw1lV<|C*$Hx^6oj~96E^f00U
zTp4KPlvTpL$K!|K;NWe3bafv~MT3-_vamgg_|`SWT@gp@BM08KPd%YhC9#QvN9~!X
zPsw-R9J4rlzny&a39BTR{rj5sh5O!?25W}7p}D*>^hJBM_ffliH<yK_HQQKUvCWND
zSy@@J8}mIoyErAU=U=k5=1CJbal=lx-?9%KFKqViq6`g>*?spPwb$Mq6dIFu<mikg
zg0u&sJ%4P@)Vk6u+=|M5j}g}@gotC~jb;7V0|lK;v5S{3>Y+o^fY`Cgr~|pv%ma@<
zdcw}XbxB9tl|4OjS^sS1NklNkbhGs!S6UC)HQQ9N1h^4YQ?mh*8GT>rU?Z}i&m7*Q
z(}_HG>a-0HHq^}7KN@VH8TH)R*Ew_coPF|zU(#k-^6>bq{p7uAEvvnrPV38@fCx|S
zzeN@UQ`3hy@!)ZO?bp7@8*iNBb06Es!STF*4Kq$Y`~cm;xPPomTbH))YJ#H}9$Hv7
z)Q3StBSPABrxP9=xI!KSQ`3hT8*TznmWgLi4s!k7H~Ed<_$FWa^}oj9=}CG;;>c)0
z&N@XYdpCeUP&}x}ePgTU?soQSCO^D(!hZkTzh__l>R09W{@b@rL=1Pke7z_C=-=P5
z(UG>aa<%<o-h!&c;8uf5RJR&r2M;@AR8<bO7R}x5+_i@N%Wutzikpbog^L&EYhU}C
zef{hI#^zRn{M+ANw1I(^<xylbU$d0l&9{%DcB3JPL={stty1EX&y3mgmFWJF$crz&
zXy?zL*R7K~Hr23y`Zp(aZGOX&nMQR2?Bw&<FUAE^+2+ObPl}m~0vtJV#J=&3Z)mgG
z;y^I_%3mJU_2mu9G8vw<G6&hoY$6C*5Moq%J)<m2q85yd4B|ke(ctN)pWe>t^UOIo
zo^j_|hq5d&AjUsm;Uzf~#SX9b@IbA`K%VC`8V%f?EDGbp%G|9^KYG{K)!mtyia=C6
z3oh4J+g6r^UB59aNS(?9l2Y1E>OrJen%$Y5m$gpM)|s@ZNEEjk^cUh;K<*U#`n={$
zRb_`h+qk<+udM9G%{#Wbz9IA7wz<`{ik%GrF;mGi{Oaa$-R$=C(!~qDy3y4Tg1Y;5
zPTy~S?#-WRRc`vNjUlb_am|8wjH)&KVmu4@oII@EUZIyRzNM=hT@NAD#P{;^b3c1a
zyPIqJ)(!WiZd-Ae-RYJh5CddU=<0qhE$&0T<WGO_5;tzm5<;wlkt#)H{P^Wpx%u7|
z);7A_&{JeV2;u~hKKx=lic{p1yt}r44=+(A#`r#7>l<Azc1}`O&U)9dT`Cj>$bxtt
zMY4$9^e4#{&&UHK3--#(KjKW@kdfgLD~f`ZwN-*3YhAO8_MB+mwt&@UxkXl^$hMV*
zI<y0|>#$u3o7vrg4-r;h=J?>eyz=so>`dNZWOzi1qOdJqs~xkm8>b--NuHHf6-b|C
ze**$p6v={EBZ|gMn9ZKC&CV@7sBbe|b*$UnRClMB0t+@}i}^`)9kAS8K`}4|6%AZ{
z>Fd^8dRL`(D&}q~`7jTD?q3_86lZ%pz{22jY!=sS(k|<8)uG$nG<Vk`1?H*)Hs=p%
z${J)|8c{ThN}qPU0Y}K9kY{zDMIlBg;t{Tg!(?fNC<#MIjR7nSpg_Rz{=FskaaE<<
zT;YX}f0)M}e;jb$yZRpg@wa{lPn%>}j*D!M2M9nJk8;xwGh3|^yu?JPVv901(PZRh
zg;at>p^SCfuvY>>Jc}ZE6w9KZeRYx;(R@O@zGe_HFc-&7Q1QM)+rm{r1wq96r6eh<
z$`%&xQm)TSYkb<I?>l^#GZaM7V8n6yRbGp3Xq6<1SaQXqi<?*@%I@{=s8Al&vM8EG
zA*xu2s<RjVh@!hu=P)9)CuZ1p?6iry)@sn#lRhpgsEVzxt?9!2JPx+FxTu?*O}y$@
z7Eo1T_gtuJ(rb4v=+cd!VPMpbh{LBoZxybZ1adJo(JIOw6;g4?G9`~vg9<To@+@%s
z%(r=LY>6i(R+*?SaO?b^kO#<u&`>8+A=6!W5JX^oV}pgoMHUwqSzTSlF`_zIChwb@
zsnCeR()HIFD}KfklPf$vvCP$<e2W<RYMs?<+v?w^LX9Y%XMGjQoe+bBAQnR8$<t3s
zmgRQ#>=|Bu>orI{$?}HPA!JJpYFui|l%m(OPNxGPy<X20h(RP*tUkQmb3sH!MeO*@
z439m2O3d7T^SAyBz4f~?Ff?Y#1$7aUSe1+DuCO1e-KgYIERUiw1cHiX8S3ubzIDf9
z7Ik)ZmW_>70+nT<sUMW*hzbZcKCxeq9XkeKWzkbdh>B&QR<pfx>q1IUba82!+qZ66
zGSjuSHBzx|Ss2%VfQyk-%P4#DmM9`*S#88w6pPW(=#m97!MSz&rl<y6m|s8zqKagJ
zpDO{}WwhP4sRL60GCx0WxD$g&3}X6oBoKqz(&8dFZr&7gw^SLKB3Z!dLWPJVu`Gz}
z`q*->1YBbbgrF7!iU<cLrz~cfE-fu0%#y|WBtKXJu<yVzJ9PX3ow;uYz?N5*wK+Ii
zOCUp)50HRjg6rt$J`Nr{Xl8XSAPZty6tyIXi4jH1sCzz6MUgt2%z}^wB?du)*9M7m
z<mh4Y*kJzd9Qb)+5MrS3$G41W3$OUdulxgw^>e)T>MMu_u3o>z@yDJg=oZa;=Ynco
zz8oLh$B`pPFf$}j&xul(8{HxGGv9k{AZop+7$7QWP=XpWkA94UQ->HBZ1UdC8w`&f
zAWFTEI-GA8;CA7OyDMGpUcJWh!X1`Z)@U||>cbIGy>~8%I0p_t!1Pqb(W6Hx%YyN#
z8G<@dzygRV9%}EkJ9Uo$LGY+Z3~J@(DtV(Rnhn^g=fB9G{NVSc*@$-a`Ycn2A0UWH
z5Vx%w>9!f}=(M!PA2eI)vOL$5B5T?4!!xwoZHekuyTCo;0p$M2K4P~oevifPe_tGI
z;_wN?O`>9ny1-@ui@Nvf5#8NYkQl_4uDzyHLyO#gd)C@BFX-sRVLC&P+n@dTySlc#
z$jl?pkcD7@ejxMu<Ex2m<1S*YMpKW^Jj~?ew3)d!nk@#0Ml6V^xa}FgHD9dKeByE5
z_{sO|`jzuKvTur3Yrs}!FKV@Vg~HpmZ~AFf5zKe=FLn!?EsAu%h+u2)uv{bt8p_J;
zH`#ySC=&;c@}ZA^j;bnY5AP$-b5uZg*`eNJ&mkzWJxY6M1ZOMo)IkoBz2kSy9~v6w
z(bFGi=Alz$%>i1?2F1dUnH+6%`SR<mH}>O=L#(W<6r{2MJkDSKga7&N{eSDD)00V7
zdzq~--y&w2jLn=f!5C<^q;+V<`ZaJwMDS#6^|c1=#qm1lk=<o;m-<`SJ>z#hXECyW
z|CIRtDRZFQ?8v1nS8Qo`kXEZDmdvi+E@b)U%h#ctN2CnB<!f)t^k@J2q49zCv6&N^
z4Nl0&fk%9D`XR+#1Y8A`e(?pzadcNN|CjilXJH2qA@k4})|KT&@#axy=wW^7>_WQu
zhyVC@Q?dHeQ%^m0O8`di`}D7#_{_ih&(A+HHgw|H0F7Kc1Q8KIv@U+{oYuAr`FU>W
z&x_a3zVpsOy)I3fCDAIu<r^LU;rT^7`<;LCM@#Sg;kSSnfz>UG*2eIWk01Q-Kl~RH
zN1i=BH90oeYGqr0a@e)@|F_NWd2*mvBxdK9y0cebzH$52|L}wE(&d+c?*Vi7u1SGu
zv~`-0-v=_p-c$MuYVKIsC3S8A?*JEo<*m2xJJhdy`OCqf31lDi{x6_;{Wlir0lja2
e^P77F^?v{grC~b4VZE~e0000<MNUMnLSTY+D~Kcj
literal 0
HcmV?d00001
diff --git a/include/class_config.inc b/include/class_config.inc
index 936858925..4d966d2cd 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -1309,9 +1309,19 @@ class config {
if (!empty($acl)) {
$attrs['ACL'] = $acl;
}
+ if ($section == "personal") {
+ $attrs['ACL'] = 'users/'.$class.':self';
+ }
$this->data['MENU'][$section][] = $attrs;
}
}
+ $this->data['SECTIONS']["personal"] = array('name' => _('My account'), 'priority' => 20);
+ if (!isset($this->data['MENU']["personal"])) {
+ $this->data['MENU']["personal"] = array();
+ }
+ foreach ($this->data['TABS']['USERTABS'] as $tab) {
+ $this->data['MENU']["personal"][] = array('CLASS' => $tab['CLASS'], 'ACL' => 'users/'.$tab['CLASS'].':self');
+ }
usort($this->data['SECTIONS'],
function ($a, $b)
{
diff --git a/plugins/config/class_configInLdap.inc b/plugins/config/class_configInLdap.inc
index b57d16e1d..e9aad08f9 100644
--- a/plugins/config/class_configInLdap.inc
+++ b/plugins/config/class_configInLdap.inc
@@ -56,11 +56,13 @@ class configInLdap extends simplePlugin
return array(
"plShortName" => _("Configuration"),
"plDescription" => _("FusionDirectory configuration"),
+ "plIcon" => "plugins/config/images/plugin.png",
"plSelfModify" => FALSE,
"plPriority" => 1,
"plCategory" => array("configuration"),
"plObjectType" => array("configuration" => array("name" => _("FusionDirectory configuration"),
"filter" => "objectClass=fusionDirectoryConf")),
+ "plSection" => array("addons" => array("name" => _("Addons"), "priority" => 10)),
"plProvidedAcls" => parent::generatePlProvidedAcls(self::getAttributesInfo())
);
diff --git a/plugins/personal/password/class_password.inc b/plugins/personal/password/class_password.inc
index 235b00009..fc6f25718 100644
--- a/plugins/personal/password/class_password.inc
+++ b/plugins/personal/password/class_password.inc
@@ -199,16 +199,15 @@ class password extends plugin
static function plInfo()
{
- return (array(
- "plDescription" => _("User password"),
- "plSelfModify" => TRUE,
- "plDepends" => array("user"),
- "plPriority" => 10,
- "plCategory" => array("users"),
- "plOptions" => array(),
-
- "plProvidedAcls" => array())
- );
+ return array(
+ "plDescription" => _("User password"),
+ "plSelfModify" => TRUE,
+ "plDepends" => array("user"),
+ "plPriority" => 10,
+ "plCategory" => array("users"),
+
+ "plProvidedAcls" => array()
+ );
}
}
--
GitLab