Bugzilla – Attachment 13955 Details for
Bug 8897
Optional GnuPG encryption of outgoing emails
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8897 [ENH] Followup: add Icons to indicate encryption
Bug-8897-ENH-Followup-add-Icons-to-indicate-encryp.patch (text/plain), 6.80 KB, created by
Mirko Tietgen
on 2012-12-08 01:08:52 UTC
(
hide
)
Description:
Bug 8897 [ENH] Followup: add Icons to indicate encryption
Filename:
MIME Type:
Creator:
Mirko Tietgen
Created:
2012-12-08 01:08:52 UTC
Size:
6.80 KB
patch
obsolete
>From f5d22a2ce1aff91e15941112c0d32c22d7853a34 Mon Sep 17 00:00:00 2001 >From: Mirko Tietgen <mirko@abunchofthings.net> >Date: Mon, 22 Oct 2012 15:08:53 +0200 >Subject: [PATCH] Bug 8897 [ENH] Followup: add Icons to indicate encryption > >Adds icons to opac-userupdate.pl email fields indicating whether a GnuPG key is available for the respective email address. >--- > .../opac-tmpl/prog/en/modules/opac-userupdate.tt | 6 +++--- > koha-tmpl/opac-tmpl/prog/images/gnupgno.png | Bin 0 -> 880 bytes > koha-tmpl/opac-tmpl/prog/images/gnupgyes.png | Bin 0 -> 913 bytes > opac/opac-userupdate.pl | 15 +++++++++++++++ > 4 files changed, 18 insertions(+), 3 deletions(-) > create mode 100644 koha-tmpl/opac-tmpl/prog/images/gnupgno.png > create mode 100644 koha-tmpl/opac-tmpl/prog/images/gnupgyes.png > >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt >index 320b30b..eba72fb 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt >@@ -43,8 +43,8 @@ > <li><label for="mobile">Secondary phone:</label> <input id="mobile" type="text" value="[% BORROWER_INF.mobile %]" name="mobile" /></li> > <li><label for="phonepro">Other phone:</label> <input id="phonepro" type="text" value="[% BORROWER_INF.phonepro %]" name="phonepro" /></li> > <li><label for="fax">Fax:</label> <input id="fax" type="text" value="[% BORROWER_INF.fax %]" name="fax" /></li> >-<li><label for="emailaddress">Primary email:</label> <input id="emailaddress" type="text" value="[% BORROWER_INF.email %]" name="emailaddress" /></li> >-<li><label for="emailpro">Secondary email:</label> <input id="emailpro" type="text" value="[% BORROWER_INF.emailpro %]" name="emailpro" /></li> >+<li><label for="emailaddress">Primary email:</label> <input id="emailaddress" type="text" value="[% BORROWER_INF.email %]" name="emailaddress" /> <img src="/opac-tmpl/prog/images/gnupg[% GnuPGemail %].png" align="absbottom"></li> >+<li><label for="emailpro">Secondary email:</label> <input id="emailpro" type="text" value="[% BORROWER_INF.emailpro %]" name="emailpro" /> <img src="/opac-tmpl/prog/images/gnupg[% GnuPGemailpro %].png" align="absbottom"></li> > </ol> > </fieldset> > >@@ -65,7 +65,7 @@ > <li><label for="B_zipcode">Zip code:</label> <input type="text" id="B_zipcode" value="[% BORROWER_INF.B_zipcode %]" name="B_zipcode" /></li> > <li><label for="B_country">Country:</label> <input type="text" id="B_country" value="[% BORROWER_INF.B_country %]" name="B_country" /></li> > <li><label for="B_phone">Phone:</label> <input type="text" id="B_phone" value="[% BORROWER_INF.B_phone %]" name="B_phone" /></li> >-<li><label for="B_email">Email:</label> <input type="text" id="B_email" value="[% BORROWER_INF.B_email %]" name="B_email" /></li> >+<li><label for="B_email">Email:</label> <input type="text" id="B_email" value="[% BORROWER_INF.B_email %]" name="B_email" /> <img src="/opac-tmpl/prog/images/gnupg[% GnuPGB_email %].png" align="absbottom"</li> > </ol> > </fieldset> > <fieldset class="brief"> >diff --git a/koha-tmpl/opac-tmpl/prog/images/gnupgno.png b/koha-tmpl/opac-tmpl/prog/images/gnupgno.png >new file mode 100644 >index 0000000000000000000000000000000000000000..995e3d69a2a3ee640672cc4cba86e5f3c1871e54 >GIT binary patch >literal 880 >zcmV-$1CRWPP)<h;3K|Lk000e1NJLTq0015U000>X1^@s6CN-WK0009wNkl<ZNXNyN >zy-O=i6o-E^`;~}bmJkhuZ8Te@Q?T-*u(A<iVIg)FT3V=uAc+5gjg3XX#zsW#>?}>t >zgcNEtK@>Lxl9d&VkWJi~TgWaqzW2tPM0iiNJA3v#bH3&b;hb}HA)Ip%LU46;g-j-c >z$Hzx7#vqC!G)=?E$Owjqhdn)4NVnihrGnkvU8t&xsi`T*vW#lAinq5nl*?u0^La4F >zu)MsCU@-VI;8LlCot+)b&dx#<MI0U;ei|hNgb=u<2_bMC2P-Qp7#JAn9LzZfV+@;{ >zn~2BbxV*fCVHn_?LseDu_V%J$t-`V_P)eKr-QM2*+*qd`A0HpXG)+)S@$m2fS(dT1 >zwB&i@Mr3bq5A}N8TN@o6#mvkMXs2PmxVS)HUmpsE0vKahUtdRme}9usI2^|6>M9sx >z;GBbVj$|?k0G)xKpPxY~MLwSgAp{c>6Y%+bO;zjWwx_2DV`F39J7WyRVzD!@X__E} >z;Qjp_oO9^9-cmmrje3PfDg8`QCt$~MJP!asmgScEe!suzoiWyVj=Por4J`hI5x1{f >zeg9f?WPg93=W;o3;a}U@t<drDaZFE7x9_ogynQwLx1Dp&5eNhjkH-;>Mm=5IwxK9W >zccFG12a+Tq6bd064nxy43=R%LRaH<*AqYZK2ybp~kWQzuu&~fRm@x)j*D*IY2cOU9 >z8UND={Qddl<OHcy3b9zM{ZMnxv9`7bRaL*us|z#?1BpZeoO5h!Y#^OZw-4Uh+JYoW >zEeE}OVx6C#Bb&`45{Y1OaS@S71ZQVwFio>9FljUzTohY(m2KOo)oO4Y2a2M=@ArG- >z?)3B&$z&3-SPb*?^Z)MgcTfOO6veApHv%s&FGwU3uq^AZUC?$_f4v{MVp$easT8iS >zuTd_S5ekK%X&MZ}_!%%E1oe6yPft%M7K^A<DtLW;1*H_hU=Wj&lNcHrLZMK=(b3U= >zZW&!2nUW+y*Y!V+JlnQ$aBzV8`}>ZdEx}(yU8~h_dwYv)HjBHvI|zc%QEol(@A=H- >za>!&dD3wb1`1k-J1cD&Iwrw;T4M>s%N+|+?z_&B^JNX5YM|l|HH;#?~0000<MNUMn >GLSTYz;fU@4 > >literal 0 >HcmV?d00001 > >diff --git a/koha-tmpl/opac-tmpl/prog/images/gnupgyes.png b/koha-tmpl/opac-tmpl/prog/images/gnupgyes.png >new file mode 100644 >index 0000000000000000000000000000000000000000..69f05372e7dc573662f7afd559255e44b98ea84d >GIT binary patch >literal 913 >zcmV;C18)3@P)<h;3K|Lk000e1NJLTq000vJ000>X1^@s6)5{gA000A6Nkl<ZILob- >zOK4nG7{`C#ea<-PWNg|b+IG@dU1$PI4J8|eQX8@pA#|y&QiSMAP;}`^a4Yo@5L>9a >zQHT$OXsoN0S_)R8W1BQhI@+X@(PW%QX6D|x_qdoluVyB0`fcvxobx~b@BjbKcSI?r >zXbPniBElz$Ea(2nGq+l#;(=udqy0874n=w4(Ova<%^`P#UE6dx^7&sJjG4TBWH%90 >zNEJO+^B#!}hwqa`D!$_4iG4g0GdqDPeoZ?(aW=_^<9&p5IQc`mI;05*pcJU!+x3}$ >zKF)BD)e5GR!u7#^Z;7dAdinVG96zs@z=MI9Nq<=5PSNL9#s#C1ny#Sq${@Och%}hJ >zd?C$3#>Ehry<H+|2y+wr7~a#^`D(h%(_gNVt2C6E9NNX1qkF3f)P7F=lHowaU^ZC< >zPmw$|z)(-CCXes2SUwpCFGyFx`}5iQxCU_PP6-T+nLoEcgEvNEblci?w?ya(>AZG0 >zRz(uPQ(Q@v8(@nYE(oj_J@8>H9%iRF9uI?G6Hd61aT;K5%}^0giioN02o|%os<S~< >zd|EZT7jaL)3|}c)&p<T;&sQB6-95i%lRW$Ns`_fB7`P+Vr!S2eZP9|9JjLsWW4!xR >zPnDTSZDFulN$2F10#7jzHTme+UXI7ZXhHd89Ur6ZwvNKGH6H6W8Sb?i?YB9)Kg?j% >zz|aI!lX`~%m|iMyE|F^j^Auz8Fz3g6>9%w%UD^<9w4K`f<b^aJ{FY_np$G;7_==TN >zaR#F1j&6xa9prMV%-HlAzEZ58KFHZb4nqgFCI<-{S_hdLY!)^h-npFNv+FsY><jVZ >za}P4oXY=OVKP+szNYV9G$dDZw<sF|*$EV^cx-5;|wuT<)_Ucb*&dg_-I26J7KOlfE >zOQXxuT9__oT*jx@xS4gU%@W$VN!$Jou#&AXHUBSPEEQNxl{wUFG5SD=OF`E#ItiV3 >zeJ-w*xUyd6+J?)mTm@a=;h4!=BQcI02s4{3^3rS?0_V3~C@lpl?Ip-MJ}16QF|)E& >zZ{rh#_qAtMZ%0j$Df@hLv%sg<^UN$4z|`uD>Ic19pKq57oKNJq`nN;TQ|JPgCS+Zo >nt%@RKRI7h~_x5_c-`4mKPOWlY`*)Bs00000NkvXXu0mjftv$3n > >literal 0 >HcmV?d00001 > >diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl >index 3b90498..41d7e66 100755 >--- a/opac/opac-userupdate.pl >+++ b/opac/opac-userupdate.pl >@@ -33,6 +33,7 @@ use C4::Dates qw/format_date/; > use C4::Members; > use C4::Members::Attributes; > use C4::Branch; >+use C4::GnuPG; > > my $query = new CGI; > >@@ -180,9 +181,23 @@ if (C4::Context->preference('OPACpatronimages')) { > my @bordat; > $bordat[0] = $borr; > >+my @gnupgmail = ('email', 'emailpro', 'B_email'); >+for(my $i = 0; $i <= $#gnupgmail; $i++) { >+ if (C4::GnuPG->does_exist($borr->{$gnupgmail[$i]}) == 1) { >+ $gnupgmail[$i] = 'yes'; >+ } >+ else { >+ $gnupgmail[$i] = 'no'; >+ } >+} >+ > $template->param( > BORROWER_INFO => \@bordat, > userupdateview => 1, >+ GnuPGemail => $gnupgmail[0], >+ GnuPGemailpro => $gnupgmail[1], >+ GnuPGB_email => $gnupgmail[2], >+ GnuPGmail => \@gnupgmail, > ); > > output_html_with_http_headers $query, $cookie, $template->output; >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8897
:
12763
|
12991
|
12992
|
12993
|
13954
|
13955
|
19820
|
19823
|
19835
|
19836
|
19840
|
19872
|
21235
|
27296
|
46640