Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1359) +++ branches/2.8.x/CHANGELOG (revision 1360) @@ -11,7 +11,10 @@ ! = Update/Change ------------------------------------- 2.8.2 ------------------------------------- -28 Dec-2010 Build 1358 Dietmar Woellbrink (Luisehahne) +28 Dec-2010 Build 1360 Dietmar Woellbrink (Luisehahne) +! show_menu2 display Title-attribute fixed +! tooltip added, change modul version to 4.9.5 +28 Dec-2010 Build 1359 Dietmar Woellbrink (Luisehahne) ! upgrade FCKeditor to Version 2.6.6 28 Dec-2010 Build 1358 Dietmar Woellbrink (Luisehahne) ! validation fixes in pages backend theme Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1359) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1360) @@ -52,6 +52,6 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.2.RC2'); -if(!defined('REVISION')) define('REVISION', '1359'); +if(!defined('REVISION')) define('REVISION', '1360'); ?> \ No newline at end of file Index: branches/2.8.x/wb/modules/show_menu2/uninstall.php =================================================================== --- branches/2.8.x/wb/modules/show_menu2/uninstall.php (nonexistent) +++ branches/2.8.x/wb/modules/show_menu2/uninstall.php (revision 1360) @@ -0,0 +1,23 @@ + \ No newline at end of file Property changes on: branches/2.8.x/wb/modules/show_menu2/uninstall.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Revision Id HeadURL \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2.8.x/wb/modules/show_menu2/LICENCE.txt =================================================================== --- branches/2.8.x/wb/modules/show_menu2/LICENCE.txt (revision 1359) +++ branches/2.8.x/wb/modules/show_menu2/LICENCE.txt (revision 1360) @@ -1,278 +1,278 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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. + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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. Index: branches/2.8.x/wb/modules/show_menu2/info.php =================================================================== --- branches/2.8.x/wb/modules/show_menu2/info.php (revision 1359) +++ branches/2.8.x/wb/modules/show_menu2/info.php (revision 1360) @@ -5,11 +5,11 @@ * @package show_menu2 * @author WebsiteBaker Project * @copyright 2004-2009, Ryan Djurovich - * @copyright 2009-2011, Website Baker Org. e.V. + * @copyright 2009-2010, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html - * @platform WebsiteBaker 2.8.x - * @requirements PHP 5.2.2 and higher + * @platform WebsiteBaker 2.7.0 + * @requirements PHP 4.4.9 and higher * @version $Id$ * @filesource $HeadURL$ * @lastmodified $Date$ @@ -19,7 +19,7 @@ $module_directory = 'show_menu2'; $module_name = 'show_menu2'; $module_function = 'snippet'; -$module_version = '4.9.3'; +$module_version = '4.9.5'; $module_platform = '2.7 | 2.8.2'; $module_author = 'Brodie Thiesfield'; $module_license = 'GNU General Public License'; Index: branches/2.8.x/wb/modules/show_menu2/README.de.txt =================================================================== --- branches/2.8.x/wb/modules/show_menu2/README.de.txt (revision 1359) +++ branches/2.8.x/wb/modules/show_menu2/README.de.txt (revision 1360) @@ -412,7 +412,8 @@ selbst für die XHTML-Konformität zuständig. SM2_NO_TITLE Unterdrückt die Ausgabe des Inhaltes des Title-Attributes - bei [a] oder [ac] formatierten links. + bei [a] oder [ac] formatierten links. Im XHTML-Strikt Modus + wird 'title' mit einen   ausgegeben. Für diesen Parameter gibt es auch einen erweiterten Modus, bei dem die Optionen als assoziatives Array übergeben werden. Näheres dazu im Abschnitt ERWEITERTE @@ -505,6 +506,7 @@ [page_title] text des Seitentitel (HTML entity escaped ausser das SM2_NOESCAPE Flag ist gesetzt) [page_icon] die URL zu einer seitenbezogenen Bilddatei (ab WB2.9.0) +[tooltip] Tooltip-Text, der normal im title-Attribut der Links ausgegeben wird [url] die URL der Seiten für den tag [target] das Seitenziel für den tag [page_id] die Page ID des aktuellen Menüpunktes. Index: branches/2.8.x/wb/modules/show_menu2/languages/NL.php =================================================================== --- branches/2.8.x/wb/modules/show_menu2/languages/NL.php (revision 1359) +++ branches/2.8.x/wb/modules/show_menu2/languages/NL.php (revision 1360) @@ -1,32 +1,32 @@ - show_menu2 () in Website Baker. Gedetailleerde informatie is beschikbaar op http://code.jellycan.com/show_menu2/ of in de README .'; - -?> \ No newline at end of file + show_menu2 () in Website Baker. Gedetailleerde informatie is beschikbaar op http://code.jellycan.com/show_menu2/ of in de README .'; + +?> Index: branches/2.8.x/wb/modules/show_menu2/languages/NO.php =================================================================== --- branches/2.8.x/wb/modules/show_menu2/languages/NO.php (revision 1359) +++ branches/2.8.x/wb/modules/show_menu2/languages/NO.php (revision 1360) @@ -1,32 +1,32 @@ -http://code.jellycan.com/show_menu2/ , for mer WB spesifikke detaljer se readme filen.'; - -?> \ No newline at end of file +http://code.jellycan.com/show_menu2/ , for mer WB spesifikke detaljer se readme filen.'; + +?> Index: branches/2.8.x/wb/modules/show_menu2/languages/DA.php =================================================================== --- branches/2.8.x/wb/modules/show_menu2/languages/DA.php (revision 1359) +++ branches/2.8.x/wb/modules/show_menu2/languages/DA.php (revision 1360) @@ -1,32 +1,32 @@ -show_menu2() i Website Baker. Der findes detaljeret information på http://code.jellycan.com/show_menu2/ eller i readmefilen.'; - -?> +show_menu2() i Website Baker. Der findes detaljeret information på http://code.jellycan.com/show_menu2/ eller i readmefilen.'; + +?> Index: branches/2.8.x/wb/modules/show_menu2/languages/FR.php =================================================================== --- branches/2.8.x/wb/modules/show_menu2/languages/FR.php (revision 1359) +++ branches/2.8.x/wb/modules/show_menu2/languages/FR.php (revision 1360) @@ -1,32 +1,32 @@ - show_menu2 () dans Website Baker. Une information détaillée est disponible sur http://code.jellycan.com/show_menu2/ ou dans le fichier README .'; - -?> \ No newline at end of file + show_menu2 () dans Website Baker. Une information détaillée est disponible sur http://code.jellycan.com/show_menu2/ ou dans le fichier README .'; + +?> Index: branches/2.8.x/wb/modules/show_menu2/languages/index.php =================================================================== --- branches/2.8.x/wb/modules/show_menu2/languages/index.php (revision 1359) +++ branches/2.8.x/wb/modules/show_menu2/languages/index.php (revision 1360) @@ -1,25 +1,25 @@ - \ No newline at end of file Index: branches/2.8.x/wb/modules/show_menu2/languages/DE.php =================================================================== --- branches/2.8.x/wb/modules/show_menu2/languages/DE.php (revision 1359) +++ branches/2.8.x/wb/modules/show_menu2/languages/DE.php (revision 1360) @@ -29,4 +29,4 @@ // Deutsche Modulbeschreibung $module_description = 'Dieses Modul integriert die erweiterte Menüfunktion show_menu2() in Website Baker. Detailierte Informationen gibt es auf http://code.jellycan.com/show_menu2/ oder in der readme Datei.'; -?> \ No newline at end of file +?> Index: branches/2.8.x/wb/modules/show_menu2/include.php =================================================================== --- branches/2.8.x/wb/modules/show_menu2/include.php (revision 1359) +++ branches/2.8.x/wb/modules/show_menu2/include.php (revision 1360) @@ -206,7 +206,7 @@ return preg_replace( '@\[('. 'a|ac|/a|li|/li|ul|/ul|menu_title|menu_icon_0|menu_icon_1|'. - 'page_title|page_icon|url|target|page_id|'. + 'page_title|page_icon|url|target|page_id|tooltip|'. 'parent|level|sib|sibCount|class|description|keywords|'. SM2_CONDITIONAL. ')\]@e', @@ -223,11 +223,14 @@ case 'ac': $retval = 'flags & SM2_XHTML_STRICT)) - { + if(($this->flags & SM2_XHTML_STRICT)) { + $retval .= ' title="'.(($this->flags & SM2_NO_TITLE) ? ' ' : $this->page['tooltip']).'"'; + } + else { $retval .= ' target="'.$this->page['target'].'"'; + $retval .= ($this->flags & SM2_NO_TITLE) ? '' : ' title="'.$this->page['tooltip'].'"'; } - $retval .= ' title="'.(($this->flags & SM2_NO_TITLE) ? ' ' : $this->page['page_title']).'">'; + $retval .= '>'; break; case '/a': $retval = ''; break; @@ -534,7 +537,7 @@ $fields .= ',`viewing_users`'; } if(version_compare(WB_VERSION, '2.9.0', '>=')) { - $fields .= ',`menu_icon_0`,`menu_icon_1`,`page_icon`'; + $fields .= ',`menu_icon_0`,`menu_icon_1`,`page_icon`,`tooltip`'; } if ($flags & SM2_ALLINFO) { $fields = '*'; @@ -570,7 +573,7 @@ continue; } } - + if(!isset($page['tooltip'])) { $page['tooltip'] = $page['page_title']; } // ensure that we have an array entry in the table to add this to $idx = $page['parent']; if (!array_key_exists($idx, $rgParent)) { Index: branches/2.8.x/wb/modules/show_menu2/legacy.php =================================================================== --- branches/2.8.x/wb/modules/show_menu2/legacy.php (revision 1359) +++ branches/2.8.x/wb/modules/show_menu2/legacy.php (revision 1360) @@ -1,190 +1,190 @@ - within your template's html code. - * You don't normally need anymore than the first four arguments. - * Usual calls would be (inside php code!) - * show_menu(1,0,-1,false); - displays the complete page tree - * show_menu(1,1,1); - show only first sub level - * show_menu(1,1,-1); - show an expanding/collapsing menu tree starting at level 1 - * Have fun experimenting! - * - * Full list of arguments: - * 1. $menu_number: With activitated "multiple menu" feature - * you can choose which menu will be displayed - * default: 1 - * 2. $start_level: The depth level of the root of the displayed - * menu tree. Defaults to '0', which is the top level. - * '1' will show all pages starting from the first sub level. - * 3. $recurse: Gives the maximum number of levels to be displayed. Default - * is '-1' which means 'all'. - * 4. $collapse: Specifies, whether the menu tree shall be - * expandable/collapsible (if set to 'true') - * or complete (all pages being displayed) if set to 'false' - * 5. $item_template: Gives the possibility to specify the html code that is - * displayed before displaying sub-pages - * 6. $item_footer: The html code to appear after sub-pages were displayed. - * 7. $menu_header: The html code to appear before the entire menu code and each - * sub tree. - * 8. $menu_footer: The html code to appear after the entire menu code and each - * sub tree. - * 9. $default_class: The (CSS) class of every menu item except the currently viewed page - * 10. $current_class: The class of the currently viewed page - * 11. $parent: (used internally) The page_id of the menu's root node, defaults is '0' (root level) - */ - -class SM2_ShowMenuFormatter -{ - var $output; - var $itemTemplate; - var $itemFooter; - var $menuHeader; - var $menuFooter; - var $defaultClass; - var $currentClass; - - function output($aString) { - if ($this->flags & SM2_BUFFER) { - $this->output .= $aString; - } - else { - echo $aString; - } - } - function initialize() { $this->output = ''; } - function startList($aPage, $aUrl) { - echo $this->menuHeader; - } - function startItem($aPage, $aUrl, $aCurrSib, $aSibCount) { - // determine the class string to use - $thisClass = $this->defaultClass; - if ($aPage['page_id'] == PAGE_ID) { - $thisClass = $this->currentClass; - } - - // format and display this item - $item = str_replace( - array( - '[a]','[/a]','[menu_title]','[page_title]','[url]', - '[target]','[class]' - ), - array( - "", '', - $aPage['menu_title'], $aPage['page_title'], $aUrl, - $aPage['target'], $thisClass - ), - $this->itemTemplate); - echo $item; - } - function finishItem() { - echo $this->itemFooter; - } - function finishList() { - echo $this->menuFooter; - } - function finalize() { } - function getOutput() { - return $this->output; - } -} - -function show_menu( - $aMenu = 1, - $aStartLevel = 0, - $aRecurse = -1, - $aCollapse = true, - $aItemTemplate = '
  • [a][menu_title][/a]', - $aItemFooter = '
    • ', - $aMenuHeader = '', - $aDefaultClass = ' class="menu_default"', - $aCurrentClass = ' class="menu_current"', - $aParent = 0 - ) -{ - static $formatter; - if (!isset($formatter)) { - $formatter = new SM2_ShowMenuFormatter; - } - - $formatter->itemTemplate = $aItemTemplate; - $formatter->itemFooter = $aItemFooter; - $formatter->menuHeader = $aMenuHeader; - $formatter->menuFooter = $aMenuFooter; - $formatter->defaultClass = $aDefaultClass; - $formatter->currentClass = $aCurrentClass; - - $start = SM2_ROOT + $aStartLevel; - if ($aParent != 0) { - $start = $aParent; - } - - $maxLevel = 0; - if ($aRecurse == 0) { - return; - } - if ($aRecurse < 0) { - $maxLevel = SM2_ALL; - } - else { - $maxLevel = SM2_START + $aRecurse - 1; - } - - $flags = $aCollapse ? SM2_TRIM : SM2_ALL; - - // special case for default case - if ($aStartLevel == 0 && $aRecurse == -1 && $aCollapse) { - $maxLevel = SM2_CURR + 1; - } - - show_menu2($aMenu, $start, $maxLevel, $flags, $formatter); -} - -function page_menu( - $aParent = 0, - $menu_number = 1, - $item_template = '[a][menu_title][/a]', - $menu_header = '', - $default_class = ' class="menu_default"', - $current_class = ' class="menu_current"', - $recurse = LEVEL // page['level'] - ) -{ - show_menu($menu_number, 0, $recurse+2, true, $item_template, '', - $menu_header, $menu_footer, $default_class, $current_class, $aParent); -} - -?> \ No newline at end of file + within your template's html code. + * You don't normally need anymore than the first four arguments. + * Usual calls would be (inside php code!) + * show_menu(1,0,-1,false); - displays the complete page tree + * show_menu(1,1,1); - show only first sub level + * show_menu(1,1,-1); - show an expanding/collapsing menu tree starting at level 1 + * Have fun experimenting! + * + * Full list of arguments: + * 1. $menu_number: With activitated "multiple menu" feature + * you can choose which menu will be displayed + * default: 1 + * 2. $start_level: The depth level of the root of the displayed + * menu tree. Defaults to '0', which is the top level. + * '1' will show all pages starting from the first sub level. + * 3. $recurse: Gives the maximum number of levels to be displayed. Default + * is '-1' which means 'all'. + * 4. $collapse: Specifies, whether the menu tree shall be + * expandable/collapsible (if set to 'true') + * or complete (all pages being displayed) if set to 'false' + * 5. $item_template: Gives the possibility to specify the html code that is + * displayed before displaying sub-pages + * 6. $item_footer: The html code to appear after sub-pages were displayed. + * 7. $menu_header: The html code to appear before the entire menu code and each + * sub tree. + * 8. $menu_footer: The html code to appear after the entire menu code and each + * sub tree. + * 9. $default_class: The (CSS) class of every menu item except the currently viewed page + * 10. $current_class: The class of the currently viewed page + * 11. $parent: (used internally) The page_id of the menu's root node, defaults is '0' (root level) + */ + +class SM2_ShowMenuFormatter +{ + var $output; + var $itemTemplate; + var $itemFooter; + var $menuHeader; + var $menuFooter; + var $defaultClass; + var $currentClass; + + function output($aString) { + if ($this->flags & SM2_BUFFER) { + $this->output .= $aString; + } + else { + echo $aString; + } + } + function initialize() { $this->output = ''; } + function startList($aPage, $aUrl) { + echo $this->menuHeader; + } + function startItem($aPage, $aUrl, $aCurrSib, $aSibCount) { + // determine the class string to use + $thisClass = $this->defaultClass; + if ($aPage['page_id'] == PAGE_ID) { + $thisClass = $this->currentClass; + } + + // format and display this item + $item = str_replace( + array( + '[a]','[/a]','[menu_title]','[page_title]','[url]', + '[target]','[class]' + ), + array( + "", '', + $aPage['menu_title'], $aPage['page_title'], $aUrl, + $aPage['target'], $thisClass + ), + $this->itemTemplate); + echo $item; + } + function finishItem() { + echo $this->itemFooter; + } + function finishList() { + echo $this->menuFooter; + } + function finalize() { } + function getOutput() { + return $this->output; + } +} + +function show_menu( + $aMenu = 1, + $aStartLevel = 0, + $aRecurse = -1, + $aCollapse = true, + $aItemTemplate = '
  • [a][menu_title][/a]', + $aItemFooter = '
    • ', + $aMenuHeader = '', + $aDefaultClass = ' class="menu_default"', + $aCurrentClass = ' class="menu_current"', + $aParent = 0 + ) +{ + static $formatter; + if (!isset($formatter)) { + $formatter = new SM2_ShowMenuFormatter; + } + + $formatter->itemTemplate = $aItemTemplate; + $formatter->itemFooter = $aItemFooter; + $formatter->menuHeader = $aMenuHeader; + $formatter->menuFooter = $aMenuFooter; + $formatter->defaultClass = $aDefaultClass; + $formatter->currentClass = $aCurrentClass; + + $start = SM2_ROOT + $aStartLevel; + if ($aParent != 0) { + $start = $aParent; + } + + $maxLevel = 0; + if ($aRecurse == 0) { + return; + } + if ($aRecurse < 0) { + $maxLevel = SM2_ALL; + } + else { + $maxLevel = SM2_START + $aRecurse - 1; + } + + $flags = $aCollapse ? SM2_TRIM : SM2_ALL; + + // special case for default case + if ($aStartLevel == 0 && $aRecurse == -1 && $aCollapse) { + $maxLevel = SM2_CURR + 1; + } + + show_menu2($aMenu, $start, $maxLevel, $flags, $formatter); +} + +function page_menu( + $aParent = 0, + $menu_number = 1, + $item_template = '[a][menu_title][/a]', + $menu_header = '', + $default_class = ' class="menu_default"', + $current_class = ' class="menu_current"', + $recurse = LEVEL // page['level'] + ) +{ + show_menu($menu_number, 0, $recurse+2, true, $item_template, '', + $menu_header, $menu_footer, $default_class, $current_class, $aParent); +} + +?> Index: branches/2.8.x/wb/modules/show_menu2/README.en.txt =================================================================== --- branches/2.8.x/wb/modules/show_menu2/README.en.txt (revision 1359) +++ branches/2.8.x/wb/modules/show_menu2/README.en.txt (revision 1360) @@ -366,6 +366,12 @@ release 4.8, supply this flag to enable hidden pages to become visible when they are active. + SM2_XHTML_STRICT From all links, created by [a] or [ac], the 'target' - + attribute will be removed to preserve the XHTML-Compatibility + + SM2_NO_TITLE Supress the value of the 'title'-attributes on links which + are created by [a] or [ac] formatted links. + This parameter also has an extended mode where an associative array of options is supplied. See the EXTENDED OPTIONS section for details. Most users will NOT need to use this. @@ -443,7 +449,10 @@ [ul]