[Patch]LiveUser
| From: | Jean-Marc Fontaine | Date: | Wed, 09 Apr 2003 19:37:14 +0000 |
| Subject: | [Patch]LiveUser | ||
| Groups: | php.pear.general | ||
| Request: | Send a blank email to pear-general+get-4747@lists.php.net to get a copy of this message | ||
Hello,
as a contribution to help LiveUser development, I am posting a patch
proposal.
This fixes a little bug in the LoginManager::_readConfigFilePHP() method
when the config file was already included by replacing "include" by
"include_once"
I also added a readConfigArray() in order to avoid using a configuration
file. I added this beacuse I think it may be convenient in many cases, or at
least in my case ;-)
Let me know what you think of this.
Regards
Jean-Marc
begin 666 Diff.txt
M+2TM($QO9VEN36%N86=E<BYP:' ),C P,RTP-"TP-B Q.3HT-3HT,RXP,# P
M,# P,# @*S R,# **RLK($QO9VEN36%N86=E<BYN97<),C P,RTP-"TP.2 R
M,3HR-SHU-"XP,# P,# P,# @*S R,# *0$ @+3(S+#$R("LR,RPQ,R! 0 H@
M+RHJ#0H@("H@17)R;W(@<F5L871E9"!C;VYS=&%N=',@9&5F:6YI=&EO;@T*
M(" J+PT*+61E9FEN92@G3$E6155315)?15)23U(G+" @(" @(" @(" @(" @
M(" @(" @+3$I.PT*+61E9FEN92@G3$E6155315)?3D]47U-54%!/4E1%1"<L
M(" @(" @(" @(" @+3(I.PT*+61E9FEN92@G3$E6155315)?0T].1DE'7TY/
M5%]&3U5.1"<L(" @(" @(" @+3,I.PT*+61E9FEN92@G3$E6155315)?0T].
M1DE'7U5.2TY/5TY?5%E012<L(" @(" @+30I.PT*+61E9FEN92@G3$E61553
M15)?0T].1DE'7U!(4%]-25-324Y'7T%24D%9)RP@+34I.PT*+61E9FEN92@G
M3$E6155315)?34E34TE.1U]$15!3)RP@(" @(" @(" @(" @+38I.PT**V1E
M9FEN92@G3$E6155315)?15)23U(G+" @(" @(" @(" @(" @(" @("
@("TQ
M*3L-"BMD969I;F4H)TQ)5D554T527TY/5%]355!03U)4140G+" @(" @(" @
M(" @(" M,BD[#0HK9&5F:6YE*"=,259%55-%4E]#3TY&24=?3D]47T9/54Y$
M)RP@(" @(" @(" @+3,I.PT**V1E9FEN92@G3$E6155315)?0T].1DE'7U5.
M2TY/5TY?5%E012<L(" @(" @("TT*3L-"BMD969I;F4H)TQ)5D554T527T-/
M3D9)1U]02%!?34E34TE.1U]!4E)!62<L(" M-2D[#0HK9&5F:6YE*"=,259%
M55-%4E]-25-324Y'7T1%4%,G+" @(" @(" @(" @(" @+38I.PT**V1E9FEN
M92@G3$E6155315)?0T].1DE'7T%24D%97TY/5%]!3E]!4E)!62<L("TW*3L-
M"B -"B O*BH-"B @*B!#;&%S<R!,;V=I;DUA;F%G97(@+2!,;V=I;B!H86YD
M;&EN9R!C;&%S<PT*0$ @+3(W,2PQ-R K,C<R+#$Y($! "B @(" @+RHJ#0H@
M(" @(" J($QO9VEN36%N86=E<CHZ3&]G:6Y-86YA9V5R*"D-"B @(" @("H-
M"BT@(" @("H@0VQA<W,@8V]N<W1R=6-T;W(N($]P=&EO;F%L;'DL(&$@=F%L
M:60@9FEL97!A=&@@=&\@86X@6$U,(&-O;F9I9W5R871I;VX-"BT@(" @("H@
M9FEL92!C86X@8F4@<&%S<V5D+@T**R @(" @*B!#;&%S<R!C;VYS=')U8W1O
M<BX@3W!T:6]N86QL>2P@82!V86QI9"!F:6QE<&%T:"!T;R!A;B!834P@;W(@
M4$A0(&-O;F9I9W5R871I;VX@9FEL90T**R @(" @*B!O<B!A(&-O;F9I9W5R
M871I;VX@87)R87D@8V%N(&)E('!A<W-E9"X-"B @(" @("H-"BT@("
@("H@
M0'!A<F%M("!S=')I;F<@(" D8V]N9FEG1FEL92!4:&4@8V]N9FEG(&9I;&4@
M=&\@8V]N9FEG=7)E('-E=F5R86P@;W!T:6]N<RX-"BL@(" @("H@0'!A<F%M
M("!S=')I;F<@(" D8V]N9FEG1FEL92!4:&4@8V]N9FEG(&9I;&4@;W(@=&AE
M(&-O;F9I9R!A<G)A>2!T;R!C;VYF:6=U<F4@<V5V97)A;"!O<'1I;VYS+@T*
M(" @(" @*B! <&%R86T@(&UI>&5D(" @("1O<'1I;VYS("
@($]P=&EO;G,@
M9F]R('1H92!F:6QE(&EM<&]R="X-"B @("
@("H@0'!A<F%M("!S=')I;F<@
M(" D='EP92 @("
@("!&:6QE('1Y<&4@;V8@=&AE(&=I=F5N(&9I;&4N#0H@
M(" @(" J($!A8V-E<W,@<'5B;&EC#0H@(" @(" J+PT*("
@("!F=6YC=&EO
M;B!,;V=I;DUA;F%G97(H)&-O;F9I9T9I;&4@/2 G)RP@)&]P=&EO;G,@/2!F
M86QS92P@)'1Y<&4@/2 G)RD-"B @(" @>PT*+2 @(" @("
@:68@*"1C;VYF
M:6=&:6QE("$]("<G*2![#0HK(" @(" @("!I9B H:7-?87)R87DH)&-O;F9I
M9T9I;&4I*2![#0HK(" @(" @(" @(" @)'1H:7,M/G)E861#;VYF:6=!<G)A
M>2@D8V]N9FEG1FEL92D[#0HK(" @(" @("!](&5L<V4@:68@*"1C;VYF:6=&
M:6QE("$]("<G*2![#0H@(" @(" @(" @("
@)'1H:7,M/G)E861#;VYF:6=&
M:6QE*"1C;VYF:6=&:6QE+" D;W!T:6]N<RP@)'1Y<&4I.PT*(" @("
@(" @
M?0T*(" @("!]#0I 0" M-C4S+#<@*S8U-BPW($! "B @(" @("HO#0H@(" @
M(&9U;F-T:6]N(%]R96%D0V]N9FEG1FEL95!(4"@D8V]N9FEG1FEL92P@)&%R
M<F%Y3F%M92 ]("<G*0T*(" @("![#0HM(" @(" @("! :6YC;'5D92
D8V]N
M9FEG1FEL93L-"BL@(" @(" @($!I;F-L=61E7V]N8V4@)&-O;F9I9T9I;&4[
M#0H@(" @(" @(" -"B @(" @("
@(&EF("@D87)R87E.86UE(#T]("<G*2R87DH*0T**R @(" @*@T**R @(" @
M*B!296%D<R!A(&-O;F9I9W5R871I;VX@87)R87D@<W!E8VEF:65D(&EN("1C
M;VYF:6=!<G)A>0T**R @(" @*B!A;F0@<V5T<R!T:&4@:6YS=&%N8V4@=F%R
M<R!T;R!T:&4@=F%L=65S(&9O=6YD+@T**R @(" @*@T**R @(" @*B! <&%R
M86T@('-T<FEN9R @("1C;VYF:6=!<G)A>0T**R @(" @*B! <F5T=7)N(&)O
M;VQE86X-"BL@(" @("H@0&%C8V5S<R!P=6)L:6,-"BL@("
@("HO#0HK(" @
M(&9U;F-T:6]N(')E861#;VYF:6=!<G)A>2@D8V]N9FEG07)R87DI#0HK(" @
M('L-"BL@(" @(" @(&EF("AI<U]A<G)A>2@D8V]N9FEG07)R87DI*2![#0HK
M(" @(" @(" @(" @9F]R96%C:"
H)&-O;F9I9T%R<F%Y(&%S("1K97D@/3X@
M)'9A;'5E*2![#0HK(" @(" @(" @(" @("
@("1T:&ES+3XD:V5Y(#T@)'9A
M;'5E.PT**R @(" @(" @(" @('T-"BL@(" @(" @("
@("!R971U<FX@=')U
M93L-"BL@(" @(" @('T-"BL-"BL@(" @("
@(')E='5R;B!014%2.CIR86ES
M945R<F]R* T**R @(" @(" @(" @($QI=F55<V5R.CIE<G)O<DUE<W-A9V4H
M3$E6155315)?0T].1DE'7T%24D%97TY/5%]!3E]!4E)!62DL#0HK(" @(" @
M(" @(" @3$E6155315)?0T].1DE'7T%24D%97TY/5%]!3E]!4E)!60T**R @
M(" @(" @*3L-"BL@(" @?2 @(" @#0H@#0H@(" @("\J*@T*(" @("
@*B!,
M;V=I;DUA;F%G97(Z.G-E=$%P<&QI8V%T:6]N*"D-"D! ("TQ,#(Q+#$T("LQ
M,#0Y+#$T($! "B @(" @("H@0VAE8VMS('1H92!G:79E;B!F:6QE(&%N9"!R
M971U<FYS(&%N(&]B:F5C="!O9B!T:&4@3&]G:6Y-86YA9V5R+@T*(" @(" @
M*@T*(" @(" @*B! 86-C97-S('!U8FQI8PT*+2 @(" @*B! <&%R86T@('-T
M<FEN9R @("1C;VYF:6=&:6QE(%1H92!C;VYF:6<@9FEL92!T;R!C;VYF:6=U
M<F4@<V5V97)A;"!O<'1I;VYS+@T**R @(" @*B! <&%R86T@('-T<FEN9R @
M("1C;VYF:6=&:6QE(%1H92!C;VYF:6<@9FEL92!O<B!C;VYF:6<@87)R87D@
M=&\@8V]N9FEG=7)E('-E=F5R86P@;W!T:6]N<RX-"B @(" @("H@0'!A<F%M
M("!M:7AE9" @(" D;W!T:6]N<R
@("!/<'1I;VYS(&9O<B!T:&4@9FEL92!I
M;7!O<G0N#0H@(" @(" J($!P87)A;2 @<W1R:6YG(" @)'1Y<&4@("
@(" @
M1FEL92!T>7!E(&]F('1H92!G:79E;B!F:6QE+@T*(" @(" @*B! <F5T=7)N
M(&]B:F5C=" @(%)E='5R;G,@86X@;V)J96-T+@T*(" @(" @*B\-"B @(" @
M9G5N8W1I;VX@)F-R96%T92@D8V]N9FEG1FEL92 ]("<G+" D;W!T:6]N<R ]
M(&9A;'-E+" D='EP92 ]("<G*0T*(" @("![#0HM(" @("
@("!I9B H(6ES
M7V9I;&4H)&-O;F9I9T9I;&4I*2![#0HK(" @(" @("!I9B H*"%I<U]F:6QE
M*"1C;VYF:6=&:6QE*2D@)B8@*"%I<U]A<G)A>2@D8V]N9FEG1FEL92DI*2![
M#0H@(" @(" @(" @(" @<F5T=7)N(%!%05(Z.G)A:7-E17)R;W(H#0H@(" @
M(" @(" @(" @(" @($QI=F55<V5R.CIE<G)O<DUE<W-A9V4H3$E6155315)?
M0T].1DE'7TY/5%]&3U5.1"DL#0H@(" @(" @(" @(" @(" @($Q)5D554T52
M7T-/3D9)1U].3U1?1D]53D0-"D! ("TQ,#4S+#$R("LQ,#@Q+#$S($! "B @
M(" @(" @('-T871I8R D97)R;W)-97-S86=E<SL-"B @(" @("
@(&EF("@A
M:7-S970H)&5R<F]R365S<V%G97,I*2![#0H@(" @(" @(" @(" @)&5R<F]R
M365S<V%G97,@/2!A<G)A>2@-"BT@(" @(" @(" @(" @(" @3$E6155315)?
M15)23U(@(" @(" @(" @(" @(" @("
@(#T^("=5;FMN;W=N(&5R<F]R)RP-
M"BT@(" @(" @(" @(" @(" @3$E6155315)?3D]47U-54%!/4E1%1" @("
@
M(" @(" @(#T^("=&96%T=7)E(&YO="!S=7!P;W)T960G+ T*+2 @(" @(" @
M(" @(" @("!,259%55-%4E]#3TY&24=?3D]47T9/54Y$(" @(" @(" @/3X@
M)T-O;F9I9R!F:6QE(&YO="!F;W5N9"<L#0HM(" @(" @(" @(" @("
@($Q)
M5D554T527T-/3D9)1U]53DM.3U=.7U194$4@(" @(" ]/B G26YV86QI9"!C
M;VYF:6=U<F%T:6]N('1Y<&4G+ T*+2 @(" @(" @(" @("
@("!,259%55-%
M4E]-25-324Y'7T1%4%,@(" @(" @(" @(" @/3X@)TUI<W-I;F<@<&%C:V%G
M92!D97!E9&5N8VEE<R<L#0HM(" @(" @(" @(" @(" @($Q)5D554T527T-/
M3D9)1U]02%!?34E34TE.1U]!4E)!62 ]/B G5&AE(&-O;F9I9R!A<G)A>2!H
M87,@;F]T(&)E96X@9F]U;F0G#0HK(" @(" @(" @(" @(" @($Q)5D554T52
M7T524D]2(" @(" @(" @(" @(" @(" @(" @/3X@)U5N:VYO=VX@97)R;W(G
M+ T**R @(" @(" @(" @(" @("!,259%55-%4E].3U1?4U504$]25$5$(" @
M(" @(" @(" @(#T^("=&96%T=7)E(&YO="!S=7!P;W)T960G+ T**R @(" @
M(" @(" @(" @("!,259%55-%4E]#3TY&24=?3D]47T9/54Y$(" @(" @(" @
M(#T^("=#;VYF:6<@9FEL92!N;W0@9F]U;F0G+ T**R @(" @(" @(" @(" @
M("!,259%55-%4E]#3TY&24=?54Y+3D]73E]465!%(" @(" @(#T^("=);G9A
M;&ED(&-O;F9I9W5R871I;VX@='EP92<L#0HK(" @(" @(" @(" @("
@($Q)
M5D554T527TU)4U-)3D=?1$504R @(" @(" @(" @(" @/3X@)TUI<W-I;F<@
M<&%C:V%G92!D97!E9&5N8VEE<R<L#0HK(" @(" @(" @(" @("
@($Q)5D55
M4T527T-/3D9)1U]02%!?34E34TE.1U]!4E)!62 @/3X@)U1H92!C;VYF:6<@
M87)R87D@:&%S(&YO="!B965N(&9O=6YD)RP-"BL@(" @(" @(" @("
@(" @
M3$E6155315)?0T].1DE'7T%24D%97TY/5%]!3E]!4E)!62 ]/B G5&AE(&-O
M;F9I9R!A<G)A>2!I<R!N;W0@86X@87)R87DG#0H@(" @(" @(" @(" @*3L-
0"B @(" @(" @('T-"B -"@``
`
end