From c57d61fe4ba323ae429c5df61acd0a97f4ef9ea4 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Tue, 8 Feb 2011 14:46:29 +0100 Subject: [PATCH 1/1] Initial import Signed-off-by: Antonio Ospite --- LICENSE.txt | 274 ++++++++++++++++++++++++++++++++++ README.txt | 14 ++ TODO.txt | 12 ++ images/Commons-emblem-notice.png | Bin 0 -> 1286 bytes images/Commons-emblem-success.png | Bin 0 -> 1277 bytes images/convert.sh | 19 +++ images/svg/Commons-emblem-notice.svg | 124 +++++++++++++++ images/svg/Commons-emblem-success.svg | 1 + ipv6_greeter.admin.inc | 37 +++++ ipv6_greeter.css | 23 +++ ipv6_greeter.info | 4 + ipv6_greeter.module | 94 ++++++++++++ 12 files changed, 602 insertions(+) create mode 100644 LICENSE.txt create mode 100644 README.txt create mode 100644 TODO.txt create mode 100644 images/Commons-emblem-notice.png create mode 100644 images/Commons-emblem-success.png create mode 100755 images/convert.sh create mode 100644 images/svg/Commons-emblem-notice.svg create mode 100644 images/svg/Commons-emblem-success.svg create mode 100644 ipv6_greeter.admin.inc create mode 100644 ipv6_greeter.css create mode 100644 ipv6_greeter.info create mode 100644 ipv6_greeter.module diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..2c095c8 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,274 @@ +GNU GENERAL PUBLIC LICENSE + + Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, +Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute +verbatim copies of this license document, but changing it is not allowed. + + Preamble + +The licenses for most software are designed to take away your freedom to +share and change it. By contrast, the GNU General Public License is +intended to guarantee your freedom to share and change free software--to +make sure the software is free for all its users. This General Public License +applies to most of the Free Software Foundation's software and to any other +program whose authors commit to using it. (Some other Free Software +Foundation software is covered by the GNU Library General Public License +instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the +freedom to distribute copies of free software (and charge for this service if +you wish), that you receive source code or can get it if you want it, that you +can change the software or use pieces of it in new free programs; and that +you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to +deny you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of the +software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for +a fee, you must give the recipients all the rights that you have. You must make +sure that they, too, receive or can get the source code. And you must show +them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) +offer you this license which gives you legal permission to copy, distribute +and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If the +software is modified by someone else and passed on, we want its recipients +to know that what they have is not the original, so that any problems +introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We +wish to avoid the danger that redistributors of a free program will individually +obtain patent licenses, in effect making the program proprietary. To prevent +this, we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND + MODIFICATION + +0. This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms +of this General Public License. The "Program", below, refers to any such +program or work, and a "work based on the Program" means either the +Program or any derivative work under copyright law: that is to say, a work +containing the Program or a portion of it, either verbatim or with +modifications and/or translated into another language. (Hereinafter, translation +is included without limitation in the term "modification".) Each licensee is +addressed as "you". + +Activities other than copying, distribution and modification are not covered +by this License; they are outside its scope. The act of running the Program is +not restricted, and the output from the Program is covered only if its contents +constitute a work based on the Program (independent of having been made +by running the Program). Whether that is true depends on what the Program +does. + +1. You may copy and distribute verbatim copies of the Program's source +code as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this License +and to the absence of any warranty; and give any other recipients of the +Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you +may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, +thus forming a work based on the Program, and copy and distribute such +modifications or work under the terms of Section 1 above, provided that you +also meet all of these conditions: + +a) You must cause the modified files to carry prominent notices stating that +you changed the files and the date of any change. + +b) You must cause any work that you distribute or publish, that in whole or in +part contains or is derived from the Program or any part thereof, to be +licensed as a whole at no charge to all third parties under the terms of this +License. + +c) If the modified program normally reads commands interactively when run, +you must cause it, when started running for such interactive use in the most +ordinary way, to print or display an announcement including an appropriate +copyright notice and a notice that there is no warranty (or else, saying that +you provide a warranty) and that users may redistribute the program under +these conditions, and telling the user how to view a copy of this License. +(Exception: if the Program itself is interactive but does not normally print such +an announcement, your work based on the Program is not required to print +an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be +reasonably considered independent and separate works in themselves, then +this License, and its terms, do not apply to those sections when you distribute +them as separate works. But when you distribute the same sections as part +of a whole which is a work based on the Program, the distribution of the +whole must be on the terms of this License, whose permissions for other +licensees extend to the entire whole, and thus to each and every part +regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to +work written entirely by you; rather, the intent is to exercise the right to +control the distribution of derivative or collective works based on the +Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of a +storage or distribution medium does not bring the other work under the scope +of this License. + +3. You may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of Sections 1 +and 2 above provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable source +code, which must be distributed under the terms of Sections 1 and 2 above +on a medium customarily used for software interchange; or, + +b) Accompany it with a written offer, valid for at least three years, to give +any third party, for a charge no more than your cost of physically performing +source distribution, a complete machine-readable copy of the corresponding +source code, to be distributed under the terms of Sections 1 and 2 above on +a medium customarily used for software interchange; or, + +c) Accompany it with the information you received as to the offer to distribute +corresponding source code. (This alternative is allowed only for +noncommercial distribution and only if you received the program in object +code or executable form with such an offer, in accord with Subsection b +above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source code +means all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation and +installation of the executable. However, as a special exception, the source +code distributed need not include anything that is normally distributed (in +either source or binary form) with the major components (compiler, kernel, +and so on) of the operating system on which the executable runs, unless that +component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to +copy from a designated place, then offering equivalent access to copy the +source code from the same place counts as distribution of the source code, +even though third parties are not compelled to copy the source along with the +object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as +expressly provided under this License. Any attempt otherwise to copy, +modify, sublicense or distribute the Program is void, and will automatically +terminate your rights under this License. However, parties who have received +copies, or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. +However, nothing else grants you permission to modify or distribute the +Program or its derivative works. These actions are prohibited by law if you +do not accept this License. Therefore, by modifying or distributing the +Program (or any work based on the Program), you indicate your acceptance +of this License to do so, and all its terms and conditions for copying, +distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the original +licensor to copy, distribute or modify the Program subject to these terms and +conditions. You may not impose any further restrictions on the recipients' +exercise of the rights granted herein. You are not responsible for enforcing +compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), conditions +are imposed on you (whether by court order, agreement or otherwise) that +contradict the conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as to satisfy +simultaneously your obligations under this License and any other pertinent +obligations, then as a consequence you may not distribute the Program at all. +For example, if a patent license would not permit royalty-free redistribution +of the Program by all those who receive copies directly or indirectly through +you, then the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and +the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or +other property right claims or to contest validity of any such claims; this +section has the sole purpose of protecting the integrity of the free software +distribution system, which is implemented by public license practices. Many +people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose +that choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original copyright +holder who places the Program under this License may add an explicit +geographical distribution limitation excluding those countries, so that +distribution is permitted only in or among countries not thus excluded. In such +case, this License incorporates the limitation as if written in the body of this +License. + +9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will be +similar in spirit to the present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies +a version number of this License which applies to it and "any later version", +you have the option of following the terms and conditions either of that +version or of any later version published by the Free Software Foundation. If +the Program does not specify a version number of this License, you may +choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software +Foundation, write to the Free Software Foundation; we sometimes make +exceptions for this. Our decision will be guided by the two goals of +preserving the free status of all derivatives of our free software and of +promoting the sharing and reuse of software generally. + + NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT +PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT +WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL +NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR +AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR +ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE +LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, +SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OR INABILITY TO USE THE +PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA +OR DATA BEING RENDERED INACCURATE OR LOSSES +SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE +PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN +IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF +THE POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..d73ecd0 --- /dev/null +++ b/README.txt @@ -0,0 +1,14 @@ +; $Id$ + +This module allows you to show a greeter block to the users accessing the site +over IPv6, or to inform users on IPv4 that they are not using IPv6 yet. + +This version of the module only works with Drupal 6.x. + +The icons used in the blocks are taken from: +http://commons.wikimedia.org/wiki/File:Commons-emblem-success.svg +http://commons.wikimedia.org/wiki/File:Commons-emblem-hand-orange.svg + + +Copyright (C) 2011 Antonio Ospite +http://ao2.it diff --git a/TODO.txt b/TODO.txt new file mode 100644 index 0000000..eff652e --- /dev/null +++ b/TODO.txt @@ -0,0 +1,12 @@ +; $Id$ + +Sort out how i18n should be done for block title, see the XXX comment in +ipv6_greeter.module at line 34. + +Make the greeting messages configurable, maybe with documentations about using +some predefined t() placeholders like !client_ip + +Use different icons? e.g: + http://blog.cocoia.com/2007/ipv6-unforeseen-consequences/ + http://ciphertex.com/print/node/190 + diff --git a/images/Commons-emblem-notice.png b/images/Commons-emblem-notice.png new file mode 100644 index 0000000000000000000000000000000000000000..9530a0573589e5545838e5973c735526bce9e760 GIT binary patch literal 1286 zcmV+h1^N1kP)_T#_ zP=B}i`T0O_tm^9OScbgq?d?T%uj}jU^78WZ^z`uX@aXC3;^N}=_V&cj+~wuv;Nak= zyVLIO?r4<8cACX%kiO^V=YpZeK5nXCjltjF-!x^Ur(K_-0000PbW%=J0RH~|DH`jR z0toB$yDttuK_L_VGyeYm`4^5o3#hNFc5`VT9{xd%MwTwhvPOTQwscjIoVqL=$5vH9 zKgumjQ)|W;y%wVqkp2&PT`d?ZZYmt={~OHmVoHmm#&)giZ>U;>Z}q*ZU`1VX6(J-e zgmMP^wc7huFEc96li7T^oFA9V{fr2ru2pMtFE=a|!^d?^d?=U4BM0`YoLq_OKa(}8 zD6Q+bnE5`4<8eL*v&YU1!^E}Z-E}^~Y~uJI{d|KB$P&nmf{1PXZi0pkhlPI6_3I)j zXXs-kJOISQo2eS9w1~qx%Q=8N8+N%|iaDC!`T2WR$5Je*?NFA>;xHzupNmABO#vX> z%$NI}|GwRlFb<_*yKl8D!Z4nt+uUElVKXNH7zcbm-=?!#lB9MQBNYZAndJbkJ-_!Q-{ssx;p3wN7@UYLw}A_l05rb|AUn!|_dj|7 zvMeWF%K-p;0l2B{d!RGwBZ0d9|Qs9LjYVZ^bM1f zL~h-#BejqMMb2XGR@9&;n27$twGdFoTU9U7eUZ6jp8~6u_ z(tdS}hSZLNgaF{k^-2Ta@^eGn0Cn>KJ?Jj2BE`-cn4Aw8`Mq&@li5lTC8~b+5^$U< ziX;%6IW%9DNl_5p8=wn>s;bH*&262D8%0$VT<%^>gMqG4r9v#4we=ZQB7StJcP8z( zM&B?@O`&eJs49h#r>pvjFpMGen%V6dEn;AFyQZp?(sZ!^SP31`pM*e z6&fJbxC6%Q>DtB9Jny3EJ(C~lbh;Dcn^j97V{U_NW{)QkVaDIfua{3W4g?+C^YaMN01BP}=I7=LkN`4?Gl|fKLZUva)T(^7d?A7%2+IJ+-N#1CK;z}( z;Naj2nE(m50QUCw36ucg;o%B}01Al!;pE{Jh!g7S>iYWn4W0$)=;-wH^bEoT3XK2= z*8t_^$)Ph7YAsGZANTQ1JlYFEK z6z7Te_QB)rBOzE4)E|nGaprk%pL&jX8KS={4APS%>FR-a^AhqK6R18*Jdf2ASdQ;I zR=^0)OR{eXRgk0E%=111=X^YF>dh-0oq!Y3Hw5I563{13eLkNzJYZ2fKqN^d3ol;) zMaq~#us<&ro6Rc^K^*-Lx91t4F_Gr0=Y{cnurKh2Tumjf>qATdT|HN zW^uhj~2lI6v%2@wE2&)t+;XwH%mK4p6B*395^a6fX+0IG^yKV^WPTdO4yAjHTi{dS~oThMav<~g~S)N6qt zP1BRhDuKIeR{VToeJz*iKFD+Z?f^aDP$xD3DW5$kc?Zav^Zal<$aNjxd+15{s_R5s zrK!VHw^5jf66B!YYD5R%KGuOE$Dyt}+ijZqCjQjN$T_w8G_`a+3_CYYp+*>n_6mSh zvr*g{*f3|N-fp)xAz?w4&eL7RS3;ci8cZ6O-Q#OPeWp%VaLECESan|^;g=D|p}lRx zLREOhYzSMHe%;t4jAL0Db-sACGK^4nn+Ec28z12U`8WCA)x$WfX!ji*frVkj#L*gH z){So>w_$2nH%=JFh9L{RhXcD6)ddJ_0nn`1jpnn{n&DOvgTDIm5f~{z08+TjqZ67N z7lv`Es4^0tfEPioc0lOJ>BzU138h{xl_c~Bor-$mVDKW*_ucMti4D_r)?DtmCX|1< z>?&CpPN##8#c0r^%nT;p z?cQZ749ER109f>gjHuorb{vBvtSgx+!{Hblp1K|}i}84JLvB&Q);MYPgQqEh2PcMr zP+68M7Bc1X@ppP&)f5PDnFznyZC7H+hwK{6RQ&fIbVr!ca57=iALKWNH^Y7$=ED)i npZ01|90BziqmlUE|8MyRLE_nctvf)}00000NkvXXu0mjfsl-T8 literal 0 HcmV?d00001 diff --git a/images/convert.sh b/images/convert.sh new file mode 100755 index 0000000..fbba83e --- /dev/null +++ b/images/convert.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +set -e +set -x + +SIZE="48x48" +COLORS=64 + +find svg -name "*.svg" | +while read file; +do + PNGFILE="$(basename "$file" .svg).png" + convert -background transparent -resize $SIZE "$file" "$PNGFILE" + + PNGINDEXFILE="$(basename "$file" .svg)-fs8.png" + rm -f "$PNGINDEXFILE" + pngquant $COLORS "$PNGFILE" + mv "$PNGINDEXFILE" "$PNGFILE" +done diff --git a/images/svg/Commons-emblem-notice.svg b/images/svg/Commons-emblem-notice.svg new file mode 100644 index 0000000..12ec797 --- /dev/null +++ b/images/svg/Commons-emblem-notice.svg @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/svg/Commons-emblem-success.svg b/images/svg/Commons-emblem-success.svg new file mode 100644 index 0000000..228c8d1 --- /dev/null +++ b/images/svg/Commons-emblem-success.svg @@ -0,0 +1 @@ +Success \ No newline at end of file diff --git a/ipv6_greeter.admin.inc b/ipv6_greeter.admin.inc new file mode 100644 index 0000000..1018dea --- /dev/null +++ b/ipv6_greeter.admin.inc @@ -0,0 +1,37 @@ + 'fieldset', + '#title' => t('General'), + ); + $form['ipv6_greeter_general_settings']['ipv6_greeter_blocktitle'] = array( + '#type' => 'textfield', + '#title' => t('Block title'), + '#description' => t('Title to show on top ofthe block, leave empty if you want no title'), + '#default_value' => variable_get('ipv6_greeter_blocktitle', 'IPv6 Greeter'), + ); + + $form['ipv6_greeter_general_settings']['ipv6_greeter_greetIPv4'] = array( + '#type' => 'checkbox', + '#title' => t('Greet IPv4 too'), + '#description' => t('Greet also IPv4 clients, showing them info about IPv6.'), + '#default_value' => variable_get('ipv6_greeter_greetIPv4', '1'), + ); + + return system_settings_form($form); +} diff --git a/ipv6_greeter.css b/ipv6_greeter.css new file mode 100644 index 0000000..dafde14 --- /dev/null +++ b/ipv6_greeter.css @@ -0,0 +1,23 @@ +/* $Id$ */ +.block-ipv6_greeter {} +.block-ipv6_greeter .content { + padding-top: .5em; + display: table; + position: static; +} +.block-ipv6_greeter .ipv6_greeter-ipv4-client, +.block-ipv6_greeter .ipv6_greeter-ipv6-client { + display: table-cell; + vertical-align: middle; + padding-left: 52px; + height: 48px; +} +.block-ipv6_greeter .ipv6_greeter-ipv4-client { + background: transparent url(images/Commons-emblem-notice.png) left center no-repeat; +} +.block-ipv6_greeter .ipv6_greeter-ipv6-client { + background: transparent url(images/Commons-emblem-success.png) left center no-repeat; +} +.block-ipv6_greeter .content p { + margin: 0; +} diff --git a/ipv6_greeter.info b/ipv6_greeter.info new file mode 100644 index 0000000..351d4f9 --- /dev/null +++ b/ipv6_greeter.info @@ -0,0 +1,4 @@ +; $Id$ +name = IPv6 Greeter +description = "Greet IPv6 clients, show info about IPv6 to IPv4 clients" +core = 6.x diff --git a/ipv6_greeter.module b/ipv6_greeter.module new file mode 100644 index 0000000..32bf580 --- /dev/null +++ b/ipv6_greeter.module @@ -0,0 +1,94 @@ + 'IPv6 Greeter', + 'description' => 'Setting for IPv6 Greeter', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('ipv6_greeter_admin_settings'), + 'access arguments' => array('administer IPv6 Greeter'), + 'file' => 'ipv6_greeter.admin.inc', + ); + + return $items; +} + +/** + * Internal function to generate code for ipv6_greeter block + * + * @return + * String containing HTML code for the block + */ +function _ipv6_greeter_create_content() { + + drupal_add_css((drupal_get_path('module', 'ipv6_greeter') .'/ipv6_greeter.css')); + + $client_ip = ip_address(); + + $is_client_ipv6 = filter_var($client_ip, FILTER_VALIDATE_IP, array("flags" => FILTER_FLAG_IPV6)); + if ($is_client_ipv6) { + $content = "

"; + $content .= t("You've got IPv6!
!client_ip", + array('!client_ip' => $client_ip)); + $content .= "

"; + } + else { + if (variable_get('ipv6_greeter_greetIPv4', '1') == '1') { + $ipv6 = l('IPv6', 'http://en.wikipedia.org/wiki/IPv6', + array( 'attributes' => array('title' => 'Wikipedia - IPv6')) + ); + $content = "

"; + $content .= t("You're not on $ipv6, yet!"); + $content .= "

"; + } + } + + return $content; +} -- 2.1.4